Merge lp:~bladernr/checkbox/967457-remove-warning into lp:checkbox

[Jeff Lane ]

Per discussion with Ara, as a workaround for bug 967457, this branch converts submissionWarningLabel to submissionUbuntuFriendlyLabel and changes the label text to provide instructions on submitting results to Ubuntu Friendly.

I toyed initially on simply not displaying the label at all, and removing the label from the ui files and cpp file, but in doing that, the submission page looked pretty sparse and "unfriendly". This is a good compromise until we can add some bits in later that will show the warning message only when testing is incomplete.

Also, the warning message is a bit unnecessary before the end of testing because Sylvain Pineau's changes for bug #937715 make the submit and view buttons disabled until testing is complete anyway.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-09 19:16:06 +0000
+++ debian/changelog	2012-04-09 21:24:23 +0000
@@ -9,7 +9,13 @@
   * qt/frontend/qtfront.cpp: Submit/View results buttons are disabled until
     every selected test has been run (LP: #937715)
 
- -- Jeff Lane <[e-mail]>  Mon, 09 Apr 2012 15:15:01 -0400
+  [Jeff Lane]
+  * Converted submissionWarningLabel and text to submissionUbuntuFriendlyLabel
+    wtih instructional text for submitting results. This is a workaround for
+    the bug causing the warning to be displayed at all times rather than only
+    when testing is incomplete. (LP: #967457)
+
+ -- Jeff Lane <[e-mail]>  Mon, 09 Apr 2012 17:12:51 -0400
 
 checkbox (0.13.6) precise; urgency=low
 
 
=== modified file 'qt/checkbox-qt.ui'
--- qt/checkbox-qt.ui	2012-02-14 22:10:11 +0000
+++ qt/checkbox-qt.ui	2012-04-09 21:24:23 +0000
@@ -825,8 +825,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:#ff0000;&quot;&gt;Warning: Not all tests have been run yet.&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:#ff0000;&quot;&gt;You can send the results now, but the submission won't make it 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; color:#000000;&quot;&gt;Please enter the e-mail address associated with your Launchpad account &#40;if applicable&#41;&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>
              </property>
              <property name="scaledContents">
               <bool>false</bool>
 
=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-04-04 14:15:25 +0000
+++ qt/frontend/qtfront.cpp	2012-04-09 21:24:23 +0000
@@ -241,7 +241,7 @@
         m_mainWindow->show();
         ui->welcomeTextBox->setPlainText(text);
     } else if (currentState == SUBMISSION) {
-        ui->submissionWarningLabel->setText(text);
+        ui->submissionUbuntuFriendlyLabel->setText(text);
     }
 }
 
 
=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-03-20 16:57:40 +0000
+++ qt/frontend/qtfront.ui	2012-04-09 21:24:23 +0000
@@ -1010,7 +1010,7 @@
             <attribute name="title">
              <string> Results </string>
             </attribute>
-            <widget class="QLabel" name="submissionWarningLabel">
+            <widget class="QLabel" name="submissionUbuntuFriendlyLabel">
              <property name="geometry">
               <rect>
                <x>30</x>
@@ -1032,8 +1032,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:#ff0000;&quot;&gt;Warning: Not all tests have been run yet.&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:#ff0000;&quot;&gt;You can send the results now, but the submission won't make it 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; color:#000000;&quot;&gt;Please enter the e-mail address associated with your Launchpad account &#40;if applicable&#41;&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>
              </property>
              <property name="scaledContents">
               <bool>false</bool>