Merge lp:~tiagosh/checkbox/nowelcometab into lp:checkbox

[Tiago Salem Herrmann]

This MR removes the welcome tab from the qt ui.

[Sylvain Pineau (sylvain-pineau)]

We now can remove the code related to the welcomeScreenRequested signal in qt_interface.py

review: Needs Fixing

[lp:~tiagosh/checkbox/nowelcometab]

1323. By Tiago Salem Herrmann on 2012-03-20

remove legacy code

1324. By Tiago Salem Herrmann on 2012-03-20

merge trunk

[Sylvain Pineau (sylvain-pineau)]

Thanks for the legacy code removal, approved.

review: Approve

=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-03-15 13:38:07 +0000
+++ checkbox_qt/qt_interface.py	2012-03-20 17:01:19 +0000
@@ -54,8 +54,6 @@
             except:
                 time.sleep(0.5)
         self.bus.add_signal_receiver(
-            self.onWelcomeScreenRequested, "welcomeScreenRequested")
-        self.bus.add_signal_receiver(
             self.onClosedFrontend, "closedFrontend")
         self.bus.add_signal_receiver(
             self.onReviewTestsClicked, "reviewTestsClicked")
@@ -65,9 +63,6 @@
     def onReviewTestsClicked(self):
         self.show_url(self.report_url)
 
-    def onWelcomeScreenRequested(self):
-        pass
-
     def onClosedFrontend(self):
         self.direction = KeyboardInterrupt
         self.loop.quit()
@@ -123,10 +118,6 @@
             self.direction = NEXT
             self.loop.quit()
 
-        def onWelcomeClicked():
-            self.direction = PREV
-            self.loop.quit()
-
         def buildBranch(options, baseIndex="1"):
             internalIndex = 1
             for test, state in options.iteritems():
@@ -161,8 +152,7 @@
 
         self.qtiface.showTree(text, indexedOptions)
         self.wait_on_signals(
-            startTestsClicked=onStartTestsClicked,
-            welcomeClicked=onWelcomeClicked)
+            startTestsClicked=onStartTestsClicked)
 
         return buildDict(self.qtiface.getTestsToRun())
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 16:26:50 +0000
+++ debian/changelog	2012-03-20 17:01:19 +0000
@@ -14,6 +14,8 @@
     for each test under the "Run" tab. (LP: #959452)
   * checkbox/user_interface.py: Avoid using fork() + call() to run a web
     browser. Use Popen instead.(LP: #956307)
+  * qt/frontend/qtfront.ui, qt/frontend/qtfront.cpp, qt/frontend/qtfront.h:
+    Removed welcome tab (LP: #957090)
 
   [Jeff Lane]
   * Reset default checkbox log level to INFO from DEBUG to make logs less

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-03-20 16:15:18 +0000
+++ qt/frontend/qtfront.cpp	2012-03-20 17:01:19 +0000
@@ -40,7 +40,7 @@
     m_model(0),
     m_statusModel(new QStandardItemModel()),
     m_currentTextComment(new QTextEdit()),
-    m_currentTab(1),
+    m_currentTab(0),
     m_skipTestMessage(false)
 {
     m_mainWindow = (QWidget*)new CustomQWidget();
@@ -51,7 +51,6 @@
     tmpQTW->tabBar()->setVisible(false);
     tmpQTW = (CustomQTabWidget*) ui->radioTestTab;
     tmpQTW->tabBar()->setVisible(false);
-    connect(ui->testsTab, SIGNAL(currentChanged(int)), this, SLOT(onTabChanged(int)));
     ui->radioTestTab->setVisible(false);
     ui->nextPrevButtons->setVisible(false);
     ui->treeView->verticalScrollBar()->setTracking(true);
@@ -154,8 +153,8 @@
     m_skipTestMessage = false; 
     ui->radioTestTab->setVisible(false);
     ui->nextPrevButtons->setVisible(false);
-    ui->testsTab->setCurrentIndex(1);
-    ui->tabWidget->setCurrentIndex(0);
+    ui->testsTab->setCurrentIndex(0);
+    ui->tabWidget->setCurrentIndex(1);
     m_model->deleteLater();
     ui->treeView->setModel(0);
     m_model = 0;
@@ -183,30 +182,6 @@
     updateTestStatus(STATUS_UNTESTED);
 }
 
-void QtFront::onTabChanged(int index)
-{
-    // check if the user asked to go back to the welcome screen
-    if (index == 0) {
-        if (currentState != TREE) {
-            QMessageBox::StandardButton button = QMessageBox::question(ui->tabWidget, "Are you sure?", 
-                    "This action will invalidate your tests, do you want to proceed?", 
-                    QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
-            if(button == QMessageBox::Yes) {
-                emit welcomeScreenRequested();
-            } else {
-                // user aborted, go back to the previous tab
-                ui->testsTab->setCurrentIndex(m_currentTab);
-            }
-            return;
-        } else {
-            currentState = WELCOME;
-            emit welcomeClicked();
-        }
-        return;
-    }
-    m_currentTab = index;
-}
-
 void QtFront::onFullTestsClicked()
 {
     ui->tabWidget->setCurrentIndex(1);
@@ -279,7 +254,7 @@
     Q_UNUSED(text)
     currentState = SUBMISSION;
     // Email address requested, so move to the results screen and hide the "run" screen contents
-    ui->testsTab->setCurrentIndex(3);
+    ui->testsTab->setCurrentIndex(2);
     ui->radioTestTab->setVisible(false);
     ui->nextPrevButtons->setVisible(false);
 
@@ -304,7 +279,7 @@
 
     ui->stepsFrame->setFixedHeight(0);
     ui->stepsFrame->update();
-    ui->testsTab->setCurrentIndex(2);
+    ui->testsTab->setCurrentIndex(1);
     QStringList stepsList = steps.trimmed().split("\n");
 
     QRegExp r("[0-9]+\\. (.*)");
@@ -441,7 +416,7 @@
 {
     Q_UNUSED(text);
     currentState = TREE;
-    ui->testsTab->setCurrentIndex(1);
+    ui->testsTab->setCurrentIndex(0);
     ui->radioTestTab->setVisible(false);
     ui->nextPrevButtons->setVisible(false);
 

=== modified file 'qt/frontend/qtfront.h'
--- qt/frontend/qtfront.h	2012-03-15 13:38:07 +0000
+++ qt/frontend/qtfront.h	2012-03-20 17:01:19 +0000
@@ -65,7 +65,6 @@
     void onNoTestClicked();
     void onReviewTestsClicked();
 
-    void onTabChanged(int index);
     void onJobItemChanged(QModelIndex index);
     void onJobItemChanged(QStandardItem *item, QString job, QModelIndex baseIndex);
     void updateTestStatus(QStandardItem *item, QString status);
@@ -82,10 +81,6 @@
     void previousTestClicked();
     void submitTestsClicked();
     void reviewTestsClicked();
-    // when the user clicks welcome during the tests
-    void welcomeScreenRequested();
-    // when the user clicks welcome from the tests selection tree
-    void welcomeClicked();
     void closedFrontend();
 
 private:

=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-03-15 17:17:17 +0000
+++ qt/frontend/qtfront.ui	2012-03-20 17:01:19 +0000
@@ -457,18 +457,8 @@
             <enum>QTabWidget::Rounded</enum>
            </property>
            <property name="currentIndex">
-            <number>1</number>
+            <number>0</number>
            </property>
-           <widget class="QWidget" name="welcome">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <attribute name="title">
-             <string> Welcome </string>
-            </attribute>
-           </widget>
            <widget class="QWidget" name="testSelection">
             <property name="font">
              <font>
@@ -822,8 +812,8 @@
                                <rect>
                                 <x>0</x>
                                 <y>0</y>
-                                <width>500</width>
-                                <height>189</height>
+                                <width>100</width>
+                                <height>30</height>
                                </rect>
                               </property>
                               <layout class="QVBoxLayout" name="verticalLayout_4">