Merge lp:~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling into lp:ubuntuone-control-panel

[Natalia Bidart]

- Isolate linux specific styling hacks to avoid weird side effects on windows
  (LP: #961229).

[lp:~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling]

299. By Natalia Bidart on 2012-03-27

- Isolate linux specific styling hacks to avoid weird side effects on windows
  (LP: #961229).

300. By Natalia Bidart on 2012-03-27

- Also fix tests :-).

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling]

301. By Natalia Bidart on 2012-03-27

Merged trunk in.

[Brian Curtin (brian.curtin)]

+1, IRL test on Windows looks fine.

review: Approve

=== modified file 'data/qt/linux.qss'
--- data/qt/linux.qss	2012-03-16 21:10:54 +0000
+++ data/qt/linux.qss	2012-03-27 14:35:22 +0000
@@ -1,2 +1,18 @@
 /* Styles specific to the linux platform */
 
+QPushButton:focus,
+GoToWebButton#help_button:focus,
+GoToWebButton#share_publish_button:focus {
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 100%;
+    padding-bottom: 100%;
+    /* end of hack */
+}
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    /* hack to make the mild-orange focused box dissapear */
+    padding-left: 1000px;
+    padding-right: 1000px;
+    /* end of hack */
+}

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-26 20:15:14 +0000
+++ data/qt/ubuntuone.qss	2012-03-27 14:35:22 +0000
@@ -81,10 +81,6 @@
     padding: 5px;
     padding-left: 19px;
     padding-right: 19px;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
 }
 
 QPushButton:disabled {
@@ -175,10 +171,6 @@
 
 GoToWebButton#help_button:focus {
     border: 2px solid #dd4814;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
     /* Compensate for border so text doesn't move */
     padding-left: 0px;
     padding-right: 13px;
@@ -199,10 +191,6 @@
 
 GoToWebButton#share_publish_button:focus {
     border: 2px solid #aea79f;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
     /* Compensate for border so text doesn't move */
     padding-left: 8px;
     padding-right: 23px;
@@ -269,10 +257,6 @@
 QTabBar::tab:hover,
 QTabBar::tab:focus {
     text-decoration: underline;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-left: 1000px;
-    padding-right: 1000px;
-    /* end of hack */
 }
 
 QGroupBox {

=== modified file 'data/qt/windows.qss'
--- data/qt/windows.qss	2012-03-15 01:25:08 +0000
+++ data/qt/windows.qss	2012-03-27 14:35:22 +0000
@@ -3,3 +3,14 @@
 QWidget {
     font-family: "Ubuntu";
 }
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+QPushButton#twitter_button:focus,
+QPushButton#facebook_button:focus {
+    padding: 0px;
+}

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-20 18:06:07 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-27 14:35:22 +0000
@@ -89,7 +89,7 @@
     source.main(app)
 
     data = []
-    for qss_name in (source.PLATFORM_QSS, ":/ubuntuone.qss"):
+    for qss_name in (":/ubuntuone.qss", source.PLATFORM_QSS):
         qss = QtCore.QResource(qss_name)
         data.append(unicode(qss.data()))
     app.setStyleSheet('\n'.join(data))

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-20 18:06:07 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-27 14:35:22 +0000
@@ -150,7 +150,7 @@
         """Ensure the platform style is loaded."""
         main.main([sys.argv[0]])
         data = []
-        for qss_name in (main.source.PLATFORM_QSS, ":/ubuntuone.qss"):
+        for qss_name in (":/ubuntuone.qss", main.source.PLATFORM_QSS):
             qss = QtCore.QResource(qss_name)
             data.append(unicode(qss.data()))
         self.assertEqual((('\n'.join(data),), {}), self.app.style)