From 469dd8f75ba08bda1aa5450705f0b78afc1760f3 Mon Sep 17 00:00:00 2001
From: ezavod <ezavod@yahoo.de>
Date: Mon, 1 May 2017 11:05:41 +0200
Subject: [PATCH 1/3] refactor(ui): removed trailing whitespaces
Removed unnecessary whitespaces from end of lines of ui stylesheets.
---
ui/chatArea/chatArea.css | 2 +-
ui/emoticonWidget/emoticonWidget.css | 10 +++++-----
ui/friendList/friendList.css | 4 ++--
ui/settings/mainContent.css | 12 ++++++------
ui/statusButton/statusButton.css | 6 +++---
ui/window/statusPanel.css | 6 +++---
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ui/chatArea/chatArea.css b/ui/chatArea/chatArea.css
index 56f689b39..8a5b2c264 100644
--- a/ui/chatArea/chatArea.css
+++ b/ui/chatArea/chatArea.css
@@ -4,7 +4,7 @@ QTextEdit
color: black;
}
-QGraphicsView
+QGraphicsView
{
border: none;
}
diff --git a/ui/emoticonWidget/emoticonWidget.css b/ui/emoticonWidget/emoticonWidget.css
index 703cee370..13fed36f4 100644
--- a/ui/emoticonWidget/emoticonWidget.css
+++ b/ui/emoticonWidget/emoticonWidget.css
@@ -1,7 +1,7 @@
QPushButton
{
background-color: transparent;
- background-repeat: none;
+ background-repeat: none;
border: none;
width: 24px;
height: 24px;
@@ -13,22 +13,22 @@ QRadioButton::indicator
height: 10px;
}
-QRadioButton::indicator::unchecked
+QRadioButton::indicator::unchecked
{
image: url(:/ui/emoticonWidget/dot_page.svg);
}
-QRadioButton::indicator:unchecked:hover
+QRadioButton::indicator:unchecked:hover
{
image: url(:/ui/emoticonWidget/dot_page_hover.svg);
}
-QRadioButton::indicator:unchecked:pressed
+QRadioButton::indicator:unchecked:pressed
{
image: url(:/ui/emoticonWidget/dot_page_hover.svg);
}
-QRadioButton::indicator::checked
+QRadioButton::indicator::checked
{
image: url(:/ui/emoticonWidget/dot_page_current.svg);
}
diff --git a/ui/friendList/friendList.css b/ui/friendList/friendList.css
index a3465b63c..3d7972065 100644
--- a/ui/friendList/friendList.css
+++ b/ui/friendList/friendList.css
@@ -5,7 +5,7 @@ QScrollArea {
QScrollBar:vertical {
background: @themeMedium;
width: 16px;
- padding: 0px 3px 0px 3px;
+ padding: 0px 3px 0px 3px;
}
QScrollBar:handle:vertical {
@@ -26,7 +26,7 @@ QScrollBar:handle:vertical:pressed {
QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;}
QScrollBar:sub-line:vertical {height: 0px;subcontrol-position: top;subcontrol-origin: margin;}
-
+
QScrollBar:add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
diff --git a/ui/settings/mainContent.css b/ui/settings/mainContent.css
index ca3bf2828..e847ab740 100644
--- a/ui/settings/mainContent.css
+++ b/ui/settings/mainContent.css
@@ -26,7 +26,7 @@ QMessageBox
QCheckBox
{
background: white;
- color: black;
+ color: black;
}
QCheckBox:disabled
@@ -79,11 +79,11 @@ QTabBar
QScrollArea
{
background-color: white;
- background: transparent;
+ background: transparent;
}
-QScrollArea > QWidget > QWidget
-{
+QScrollArea > QWidget > QWidget
+{
background: transparent;
}
@@ -148,7 +148,7 @@ QScrollBar:QScrollBar::up-arrow:vertical
height: 10px;
background: white;
}
-
+
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
{
background: none;
@@ -208,7 +208,7 @@ QScrollBar:QScrollBar::up-arrow:horizontal
height: 10px;
background: white;
}
-
+
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
{
background: none;
diff --git a/ui/statusButton/statusButton.css b/ui/statusButton/statusButton.css
index ddb0653f2..0a149ff5a 100644
--- a/ui/statusButton/statusButton.css
+++ b/ui/statusButton/statusButton.css
@@ -8,13 +8,13 @@ QPushButton
height: 40px;
}
-QPushButton:default
+QPushButton:default
{
background-color: @themeMediumDark;
}
/*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
-QPushButton:hover
+QPushButton:hover
{
background-color: @themeMedium;
}
@@ -30,7 +30,7 @@ QPushButton:focus {
QPushButton::menu-indicator {image: none;}
-QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open
+QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open
{
image: url(":ui/statusButton/menu_indicator.svg");
subcontrol-origin: padding;
diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css
index cf2f869f6..5344a79a7 100644
--- a/ui/window/statusPanel.css
+++ b/ui/window/statusPanel.css
@@ -92,12 +92,12 @@ QListView {
}
/*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
-#statusPanel > #statusHead > #statusButton:hover
+#statusPanel > #statusHead > #statusButton:hover
{
background-color: @themeLight;
}
-#statusPanel > #statusHead > #statusButton:pressed
+#statusPanel > #statusHead > #statusButton:pressed
{
background-color: @themeMedium;
}
@@ -108,7 +108,7 @@ QListView {
#statusPanel > #statusHead > #statusButton::menu-indicator {image: none;}
-#statusPanel > #statusHead > #statusButton::menu-indicator:pressed, #statusPanel > #statusHead > #statusButton::menu-indicator:open
+#statusPanel > #statusHead > #statusButton::menu-indicator:pressed, #statusPanel > #statusHead > #statusButton::menu-indicator:open
{
image: url(":ui/statusButton/menu_indicator.png");
subcontrol-origin: padding;
From 77aa2e92520de1323a3ac8ef9a154d0fdf041c0b Mon Sep 17 00:00:00 2001
From: ezavod <ezavod@yahoo.de>
Date: Mon, 1 May 2017 11:11:23 +0200
Subject: [PATCH 2/3] feat(ui): grey out proxy settings if no proxy selected
This is a feature proposed in #2760.
Disabled port (QSpinBox) and address (QLineEdit) are greyed out if no proxy is selected.
---
ui/settings/mainContent.css | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ui/settings/mainContent.css b/ui/settings/mainContent.css
index e847ab740..f009a09ea 100644
--- a/ui/settings/mainContent.css
+++ b/ui/settings/mainContent.css
@@ -39,6 +39,11 @@ QSpinBox
background: white;
}
+QSpinBox:disabled
+{
+ background: lightGrey;
+}
+
QPushButton
{
background: white;
@@ -66,6 +71,11 @@ QLineEdit
background-color: white;
}
+QLineEdit:disabled
+{
+ background-color: lightGrey;
+}
+
QTabWidget
{
background-color: white;
From f35103e547b517106cb5048b43dfe6dece5fe8d8 Mon Sep 17 00:00:00 2001
From: ezavod <ezavod@yahoo.de>
Date: Mon, 1 May 2017 11:52:59 +0200
Subject: [PATCH 3/3] fix(ui): fixed typos of pseudo-states in stylesheets
Some pseudo-states were wrongly addressed with `::` instead of `:` in
stylesheets.
---
ui/emoticonWidget/emoticonWidget.css | 4 ++--
ui/loginScreen/loginScreen.css | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/emoticonWidget/emoticonWidget.css b/ui/emoticonWidget/emoticonWidget.css
index 13fed36f4..c24683f11 100644
--- a/ui/emoticonWidget/emoticonWidget.css
+++ b/ui/emoticonWidget/emoticonWidget.css
@@ -13,7 +13,7 @@ QRadioButton::indicator
height: 10px;
}
-QRadioButton::indicator::unchecked
+QRadioButton::indicator:unchecked
{
image: url(:/ui/emoticonWidget/dot_page.svg);
}
@@ -28,7 +28,7 @@ QRadioButton::indicator:unchecked:pressed
image: url(:/ui/emoticonWidget/dot_page_hover.svg);
}
-QRadioButton::indicator::checked
+QRadioButton::indicator:checked
{
image: url(:/ui/emoticonWidget/dot_page_current.svg);
}
diff --git a/ui/loginScreen/loginScreen.css b/ui/loginScreen/loginScreen.css
index a67052122..9bc063f9f 100644
--- a/ui/loginScreen/loginScreen.css
+++ b/ui/loginScreen/loginScreen.css
@@ -53,6 +53,6 @@ QLabel, QCheckBox, QProgressBar {
color: black;
}
-QCheckBox::disabled {
+QCheckBox:disabled {
color: gray;
}