Merge pull request #4356

ezavod (3):
      refactor(ui): removed trailing whitespaces
      feat(ui): grey out proxy settings if no proxy selected
      fix(ui): fixed typos of pseudo-states in stylesheets

ui/chatArea/chatArea.css

@@ -4,7 +4,7 @@ QTextEdit
     color: black;
 }
 
-QGraphicsView 
+QGraphicsView
 {
     border: none;
 }

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);
 }

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;
 }

ui/loginScreen/loginScreen.css

@@ -53,6 +53,6 @@ QLabel, QCheckBox, QProgressBar {
   color: black;
 }
 
-QCheckBox::disabled {
+QCheckBox:disabled {
   color: gray;
 }

ui/settings/mainContent.css

@@ -26,7 +26,7 @@ QMessageBox
 QCheckBox
 {
     background: white;
-    color: black;    
+    color: black;
 }
 
 QCheckBox:disabled
@@ -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;
@@ -79,11 +89,11 @@ QTabBar
 QScrollArea
 {
     background-color: white;
-    background: transparent; 
+    background: transparent;
 }
 
-QScrollArea > QWidget > QWidget 
-{ 
+QScrollArea > QWidget > QWidget
+{
     background: transparent;
 }
 
@@ -148,7 +158,7 @@ QScrollBar:QScrollBar::up-arrow:vertical
     height: 10px;
     background: white;
 }
- 
+
 QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
 {
     background: none;
@@ -208,7 +218,7 @@ QScrollBar:QScrollBar::up-arrow:horizontal
     height: 10px;
     background: white;
 }
- 
+
 QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
 {
     background: none;

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;

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;