Merge lp:~sylvain-pineau/checkbox/1030857 into lp:checkbox

[Sylvain Pineau]

This MR first proposes a fix to bug 1030857 where light themes don't really like the dark banner of checkbox.
Basically every elements involved in drawing the area now have a transparent background, including the png file.

In order to restore what we could call a separator behind the 3 navigation buttons i've added 2 horizontal lines to the selection test tab and the Result tab (the run test tab already has a line around the widget)

Finally, while I was tweaking the .ui frontend file, I've fixed the following ui bugs:

- Remove the font color style of the "Please enter the e-mail address" msg (was hardcoded black, no theming respect)
- Remove the indentation of "Choose tests to run on your system"
- Set the min-height of QTabBar::tab to zero to avoid to see 3px of the top tabbar (yes, you can check, we really see the beginning of the selected bar !)

[Brendan Donegan (brendan-donegan)]

Myself and Daniel both had a look and we think it looks good. Approved and merged!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-31 15:25:22 +0000
+++ debian/changelog	2012-07-31 16:20:28 +0000
@@ -30,6 +30,9 @@
     performance test.
     scripts/block_device_resource: Add the maximum usb specification supported
     by both a block device and the corresponding root hub port.
+  * qt/frontend/qtfront.ui, qt/frontend/images/checkbox-qt-head.png: 
+    Add transparency properties to the main window header to keep the main theme
+    colors in the widget background (LP: #1030857)
 
   [Jeff Marcom]
   * Added timeout to job call for disk smart test.

=== modified file 'qt/frontend/images/checkbox-qt-head.png'
Binary files qt/frontend/images/checkbox-qt-head.png	2012-02-15 19:52:52 +0000 and qt/frontend/images/checkbox-qt-head.png	2012-07-31 16:20:28 +0000 differ
=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-07-27 10:44:14 +0000
+++ qt/frontend/qtfront.ui	2012-07-31 16:20:28 +0000
@@ -46,6 +46,9 @@
      <property name="tabShape">
       <enum>QTabWidget::Rounded</enum>
      </property>
+     <property name="styleSheet">
+      <string notr="true">QTabBar::tab {min-height: 0ex;}</string>
+     </property>     
      <property name="currentIndex">
       <number>1</number>
      </property>
@@ -113,7 +116,7 @@
               <item>
                <widget class="QWidget" name="welcomeTopText" native="true">
                 <property name="styleSheet">
-                 <string notr="true">background-color: #f0ebe2</string>
+                 <string notr="true">background: transparent;</string>
                 </property>
                 <widget class="QLabel" name="welcomeLabel">
                  <property name="geometry">
@@ -338,7 +341,7 @@
             </palette>
            </property>
            <property name="styleSheet">
-            <string notr="true">background: #494950;</string>
+            <string notr="true">background: transparent;</string>
            </property>
            <widget class="QLabel" name="progressLabel">
             <property name="geometry">
@@ -365,8 +368,7 @@
              <bool>false</bool>
             </property>
             <property name="styleSheet">
-             <string notr="true">color: &quot;white&quot;;
-background: transparent;</string>
+             <string notr="true">background: transparent;</string>
             </property>
             <property name="text">
              <string>10 tests completed out of 30 (30%)</string>
@@ -430,7 +432,7 @@
            </property>
            <property name="styleSheet">
             <string notr="true"> QTabWidget::pane#testsTab { /* The tab widget frame */
-     border-top: 15 solid #494950;
+     border-top: 15 solid transparent;
      position: absolute;
      top: -1.7em;
  }
@@ -677,6 +679,19 @@
               <string>Start testing</string>
              </property>
             </widget>
+            <widget class="Line" name="selectionSeparator">
+             <property name="geometry">
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>640</width>
+               <height>3</height>
+              </rect>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>            
            </widget>
            <widget class="QWidget" name="testing">
             <property name="enabled">
@@ -1070,8 +1085,8 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Please enter the e-mail address associated with your Launchpad account (if applicable)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;and click the Submit Results button to submit these test results to Ubuntu Friendly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=;&quot;&gt;Please enter the e-mail address associated with your Launchpad account (if applicable)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=;&quot;&gt;and click the Submit Results button to submit these test results to Ubuntu Friendly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="scaledContents">
               <bool>false</bool>
@@ -1167,6 +1182,19 @@
               <string>View results</string>
              </property>
             </widget>
+            <widget class="Line" name="submissionSeparator">
+             <property name="geometry">
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>640</width>
+               <height>3</height>
+              </rect>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
            </widget>
           </widget>
          </item>