Merge lp:~sylvain-pineau/cdts/fix-1258326 into lp:cdts

[Sylvain Pineau]

this MR adds a new Qt signal to properly close the Manual Interaction Dialog once a job result is available for a user-interact job.

[Brendan Donegan (brendan-donegan)]

I don't particularly see the need for the logging statement. It's harmless of course, but we should be consistent in our use of logging, and at the moment we're not so let's not add any more until we figure out a better logging scheme.

review: Needs Information

[lp:~sylvain-pineau/cdts/fix-1258326]

2330. By Sylvain Pineau on 2013-12-10

qml:ManualInteractionDialog: close the popup onCloseManualInteractionDialog

[Sylvain Pineau (sylvain-pineau)]

removed!

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

review: Approve

[Brendan Donegan (brendan-donegan)]

+1

review: Approve

=== modified file 'plainbox-gui/canonical-driver-test-suite/qml/ManualInteractionDialog.qml'
--- plainbox-gui/canonical-driver-test-suite/qml/ManualInteractionDialog.qml	2013-09-10 07:25:03 +0000
+++ plainbox-gui/canonical-driver-test-suite/qml/ManualInteractionDialog.qml	2013-12-10 14:02:17 +0000
@@ -263,5 +263,8 @@
                 skipcheck.checked = false; // we didnt skip it
             }
         }
+        onCloseManualInteractionDialog: {
+            PopupUtils.close(dialog)
+        }
     }
 }

=== modified file 'plainbox-gui/gui-engine/gui-engine.cpp'
--- plainbox-gui/gui-engine/gui-engine.cpp	2013-11-04 22:12:02 +0000
+++ plainbox-gui/gui-engine/gui-engine.cpp	2013-12-10 14:02:17 +0000
@@ -2255,6 +2255,11 @@
     // How did this job turn out?
     const int outcome = GetOutcomeFromJobResultPath(result);
 
+    if (m_running_manual_job) {
+        m_running_manual_job = false;
+        emit closeManualInteractionDialog();
+    }
+
     // Update the GUI so it knows what the job outcome was
     emit updateGuiEndJob(m_run_list.at(m_current_job_index).path(), \
             m_current_job_index, \

=== modified file 'plainbox-gui/gui-engine/gui-engine.h'
--- plainbox-gui/gui-engine/gui-engine.h	2013-09-24 20:39:22 +0000
+++ plainbox-gui/gui-engine/gui-engine.h	2013-12-10 14:02:17 +0000
@@ -231,6 +231,8 @@
 
         void updateManualInteractionDialog(const int outcome, bool show_test);
 
+        void closeManualInteractionDialog(void);
+
 private:
         // Helper function when generating the desired local and real jobs
         QList<QDBusObjectPath> GenerateDesiredJobList(QList<QDBusObjectPath> job_list);