Merge lp:~kissiel/checkbox/rework-dialogs-in-converged into lp:checkbox

[Maciej Kisielewski]

This MR introduces new way of showing dialogs in checkbox-converged.

With the incoming changes to ubuntuuitoolkit, current way of doing popups would not work.
Also it somewhat reduces the complexity and code footprint.

To test it, run a standard build of checkbox-converged and/or run autopilot.
All popups should work as they did previously.

59358d2 converged: use consistent naming in dialog i-faces
03ff6c0 converged: update to Popups 1.3
1bcd71f converged: add DialogMgr that replaces pure JS api
7361c2c converged: migrate to DialogMgr

[lp:~kissiel/checkbox/rework-dialogs-in-converged]

4446. By Maciej Kisielewski on 2016-07-21

checkbox-ng: use SECURE_ID_PATTERN from plainbox

Instead of defining it locally and using it.

Signed-off-by: Maciej Kisielewski <email address hidden>

4447. By Maciej Kisielewski on 2016-07-21

move launcher-related classes to plainbox

Reasons:
1) Launchers are designed to be shared between different *box front-ends. So
having them defined in checkbox-ng means any other front-end wanting to use
launchers would have to depend on checkbox-ng.
2) There is nothing in launchers that's related to checkbox-ng.
3) Launchers are kinds of PlainboxConfigs

Signed-off-by: Maciej Kisielewski <email address hidden>

4448. By Maciej Kisielewski on 2016-07-21

checkbox-ng:checkbox-cli: sort imports

Signed-off-by: Maciej Kisielewski <email address hidden>

4449. By Maciej Kisielewski on 2016-07-21

checkbox-ng: remove InvalidSecureIDError from checkbox-ng

And use the one from plainbox.

Signed-off-by: Maciej Kisielewski <email address hidden>

4450. By Maciej Kisielewski on 2016-07-21

converged: use consistent naming in dialog i-faces

Signed-off-by: Maciej Kisielewski <email address hidden>

4451. By Maciej Kisielewski on 2016-07-21

converged: update to Popups 1.3

Signed-off-by: Maciej Kisielewski <email address hidden>

4452. By Maciej Kisielewski on 2016-07-21

converged: add DialogMgr that replaces pure JS api

When creating components in plain JS (.js) the Component wasn't attached. Doing
the same in a function defined as a part of a QML components does that ok.

This patch is a first step to migrate to the latter.

Signed-off-by: Maciej Kisielewski <email address hidden>

4453. By Maciej Kisielewski on 2016-07-21

converged: migrate to DialogMgr

Signed-off-by: Maciej Kisielewski <email address hidden>

[Maciej Kisielewski (kissiel)]

It's been long enough for me to forget what I wrote there and be able to review it.

Still seems good.

Self-approving.

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/checkbox-touch.qml	2016-07-21 16:41:03 +0000
@@ -21,13 +21,10 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 import io.thp.pyotherside 1.4
 import "components"
-import "components/ErrorLogic.js" as ErrorLogic
-import "components/CbtDialogLogic.js" as CbtDialogLogic
-
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -154,7 +151,7 @@
 
         onError: {
             console.error("python error: " + traceback);
-            ErrorLogic.showError(mainView, "python error: " + traceback, Qt.quit);
+            dialogMgr.showError(mainView, "python error: " + traceback, Qt.quit);
         }
         onReceived: console.log("pyotherside.send: " + data)
     }
@@ -334,7 +331,7 @@
 
         function setup(testplan_info_list) {
             if (testplan_info_list.length<1) {
-                ErrorLogic.showError(mainView, "Test plan missing", Qt.quit);
+                dialogMgr.showError(mainView, "Test plan missing", Qt.quit);
             }
 
             model.clear();
@@ -465,6 +462,9 @@
     PasswordDialog {
         id: passwordDialog
     }
+    DialogMgr {
+        id: dialogMgr
+    }
 
     CommandOutputPage {
         id: commandOutputPage
@@ -480,7 +480,7 @@
         if (pageComponent.status == Component.Error) {
             var msg = i18n.tr("Could not create component '%1'\n").arg(url) + pageComponent.errorString();
             console.error(msg);
-            ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
+            dialogMgr.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
         } else {
             var pageObject = pageComponent.createObject();
             if (test) {
@@ -502,7 +502,7 @@
                 }
             } else {
                 if (result.errors_encountered) {
-                    ErrorLogic.showError(mainView, i18n.tr("Could not resume session."),
+                    dialogMgr.showError(mainView, i18n.tr("Could not resume session."),
                                          gcAndStartSession(),
                                          i18n.tr("Start new session"));
                 } else {
@@ -537,7 +537,7 @@
                     };
                     passwordDialog.passwordEntered.connect(rememberContinuation);
                     passwordDialog.dialogCancelled.connect(cancelContinuation);
-                    PopupUtils.open(passwordDialog.dialogComponent);
+                    PopupUtils.open(passwordDialog.dialog);
                     return;
                 }
             }
@@ -599,7 +599,7 @@
             if (appSettings["launcher"]) {
                 app.exportResultsWithLauncherSettings(function(uri) {
                     var htmlReportUrl = uri;
-                    CbtDialogLogic.showDialog(mainView, i18n.tr("Reports have been saved to your Documents folder"),
+                    dialogMgr.showDialog(mainView, i18n.tr("Reports have been saved to your Documents folder"),
                                               [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View Report"), "color": UbuntuColors.green, "onClicked": function(uri) {
                                                   var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject();
                                                   webviewer.uri = htmlReportUrl;
@@ -610,7 +610,7 @@
                 app.exportResults('2013.com.canonical.plainbox::html', [], function(uri) {
                     var htmlReportUrl = uri;
                     app.exportResults('2013.com.canonical.plainbox::xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) {
-                        CbtDialogLogic.showDialog(mainView, i18n.tr("Reports have been saved to your Documents folder"),
+                        dialogMgr.showDialog(mainView, i18n.tr("Reports have been saved to your Documents folder"),
                                                   [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View Report"), "color": UbuntuColors.green, "onClicked": function(uri) {
                                                       var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject();
                                                       webviewer.uri = htmlReportUrl;
@@ -642,12 +642,12 @@
                         }
                     }
                     buttons.push({"text": i18n.tr("OK"), "color": UbuntuColors.green});
-                    CbtDialogLogic.showDialog(
+                    dialogMgr.showDialog(
                         resultsPage,
                         i18n.tr("Report has been submitted.\n" + s), buttons);
                 },
                 function(error) {
-                    ErrorLogic.showError(mainView,
+                    dialogMgr.showError(mainView,
                                          i18n.tr("Could not submit results. Reason:\n" + error),
                                          function(){},
                                          i18n.tr("OK"));
@@ -776,7 +776,7 @@
                     test["comments"] = comment;
                     completeTest(test);
                 });
-                PopupUtils.open(commentsDialog.dialogComponent);
+                PopupUtils.open(commentsDialog.dialog);
             } else {
                 completeTest(test);
             }
@@ -800,7 +800,7 @@
                 }
                 continuation();
             });
-            PopupUtils.open(dlg.dialogComponent);
+            PopupUtils.open(dlg.dialog);
             return; // inputForm gets precedence over input
         }
 
@@ -826,7 +826,7 @@
                     cancelContinuation();
                     return;
                 });
-                PopupUtils.open(dlg.dialogComponent);
+                PopupUtils.open(dlg.dialog);
                 return;
             }
             continuation();

=== modified file 'checkbox-touch/components/CbtDialog.qml'
--- checkbox-touch/components/CbtDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/CbtDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,19 +20,19 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 
 /*! \brief Common dialog popup.
     \inherits Item
 
     This component is a general purpose message+buttons dialog.
-    It should be used through API in CbtDialogLogic.js.
+    It should be used through DialogMgr object.
     By default every button in the dialog will close it.
 
     Typical usage:
-            CbtDialog.showDialog(main, i18n.tr("Operation succedded"));
-            CbtDialog.showDialog(main, i18n.tr("Do you want to proceed"), [
+            dialogMgr.showDialog(main, i18n.tr("Operation succedded"));
+            dialogMgr.showDialog(main, i18n.tr("Do you want to proceed"), [
                 {"text": i18n.tr("OK"), "color": "green", "onClicked": function() {console.log("Clicked OK");} },
                 {"text": i18n.tr("Cancel"), "color": "red", "onClicked": function() {console.log("Clicked cancel");} },
             ]);

=== removed file 'checkbox-touch/components/CbtDialogLogic.js'
--- checkbox-touch/components/CbtDialogLogic.js	2014-12-09 22:57:15 +0000
+++ checkbox-touch/components/CbtDialogLogic.js	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-.import Ubuntu.Components.Popups 1.0 as Popups
-
-function showDialog(caller, message, buttons) {
-    var p = Qt.createComponent(Qt.resolvedUrl("CbtDialog.qml")).createObject(caller);
-    p.buttons = buttons || [{ "text": i18n.tr("OK"), "color": "UbuntuColors.green"}];
-    p.label = message;
-    Popups.PopupUtils.open(p.dialog);
-}

=== modified file 'checkbox-touch/components/CheckboxTouchApplication.qml'
--- checkbox-touch/components/CheckboxTouchApplication.qml	2016-07-04 13:37:03 +0000
+++ checkbox-touch/components/CheckboxTouchApplication.qml	2016-07-21 16:41:03 +0000
@@ -21,8 +21,6 @@
  */
 
 import QtQuick 2.0
-import "ErrorLogic.js" as ErrorLogic
-
 
 PythonObjectRef {
     id: app
@@ -50,7 +48,7 @@
             sessionReady();
         }, function(error) {
             console.error("Unable to start session: " + error);
-            ErrorLogic.showError(mainView,
+            dialogMgr.showError(mainView,
                                  i18n.tr("Could not start a session. Reason:\n" + error),
                                  Qt.quit,
                                  i18n.tr("Quit"));
@@ -60,7 +58,7 @@
         request("resume_session", [rerunLastTest, outcome], function(result) {
             if (!result["session_id"]) {
                 pageStack.pop();
-                ErrorLogic.showError(mainView,
+                dialogMgr.showError(mainView,
                                      i18n.tr("Could not resume session"),
                                      function() {
                                          startSession();
@@ -243,7 +241,7 @@
 
         }, function(error) {
                 console.error("Unable to load providers: " + error);
-                ErrorLogic.showError(mainView, i18n.tr("No providers available!"), Qt.quit);
+                dialogMgr.showError(mainView, i18n.tr("No providers available!"), Qt.quit);
         });
     }
 }

=== modified file 'checkbox-touch/components/CommandOutputPage.qml'
--- checkbox-touch/components/CommandOutputPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/CommandOutputPage.qml	2016-07-21 16:41:03 +0000
@@ -25,7 +25,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 
 Page {

=== modified file 'checkbox-touch/components/CommentsDialog.qml'
--- checkbox-touch/components/CommentsDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/CommentsDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,7 +20,7 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 /*! \brief Comment addition dialog.
     \inherits Item
@@ -31,9 +31,9 @@
 Item {
     id: commentsDialog
     /*!
-      `dialogComponent` alias shortens the code that launches this dialog
+      `dialog` alias shortens the code that launches this dialog
      */
-    property alias dialogComponent: component
+    property alias dialog: component
 
     /*!
       Use this property to populate the textArea that the user will write in.

=== modified file 'checkbox-touch/components/ConfirmationDialog.qml'
--- checkbox-touch/components/ConfirmationDialog.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/ConfirmationDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,7 +20,7 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 /*! \brief Skip-confirmation dialog.
     \inherits Item

=== removed file 'checkbox-touch/components/ConfirmationLogic.js'
--- checkbox-touch/components/ConfirmationLogic.js	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/ConfirmationLogic.js	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-.import Ubuntu.Components.Popups 1.0 as Popups
-
-.import QtQuick 2.0 as QtQuick
-
-function confirmRequest(caller, options, continuation) {
-    // if the question was answered before and user selected to
-    // remember their selection - 'returning' true
-    if (mainView.appSettings[options.question]) {
-        continuation(true);
-        return;
-    }
-    var component = Qt.createComponent(Qt.resolvedUrl("ConfirmationDialog.qml"));
-    if (component.status == QtQuick.Component.Error) {
-        var msg = i18n.tr("could not create ConfirmationDialog component\n'") + component.errorString();
-        console.error(msg);
-        ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
-    }
-    var popup = component.createObject(caller);
-
-    popup.withRemember = options.remember;
-    popup.question = options.question;
-    popup.answer.connect(function(result, remember) {
-        mainView.appSettings[options.question] = remember;
-        continuation(result);
-    });
-    Popups.PopupUtils.open(popup.dialog);
-}

=== added file 'checkbox-touch/components/DialogMgr.qml'
--- checkbox-touch/components/DialogMgr.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/DialogMgr.qml	2016-07-21 16:41:03 +0000
@@ -0,0 +1,68 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2016 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Item {
+    function showDialog(caller, message, buttons) {
+        var p = Qt.createComponent(Qt.resolvedUrl("CbtDialog.qml")).createObject(caller);
+        p.buttons = buttons || [{ "text": i18n.tr("OK"), "color": "UbuntuColors.green"}];
+        p.label = message;
+        PopupUtils.open(p.dialog);
+    }
+
+    function confirmRequest(caller, options, continuation) {
+        // if the question was answered before and user selected to
+        // remember their selection - 'returning' true
+        if (mainView.appSettings[options.question]) {
+            continuation(true);
+            return;
+        }
+        var p = Qt.createComponent(Qt.resolvedUrl("ConfirmationDialog.qml")).createObject(caller);
+        p.withRemember = options.remember;
+        p.question = options.question;
+        p.answer.connect(function(result, remember) {
+            mainView.appSettings[options.question] = remember;
+            continuation(result);
+        });
+        PopupUtils.open(p.dialog);
+    }
+
+    function showError(caller, errorMessage, continuation, finalLabel) {
+        // stackDepth keeps track of how many popups are stacked on the screen
+        // we need this so continuation is called only if the last (the bottom one) popup
+        // is closed
+        showError.stackDepth = ++showError.stackDepth || 1;
+        var p = Qt.createComponent(Qt.resolvedUrl("ErrorDialog.qml")).createObject(caller);
+        p.errorMessage = errorMessage;
+        if (showError.stackDepth > 1) {
+            p.buttonLabel = i18n.tr("Continue")
+        } else {
+            p.buttonLabel = finalLabel || i18n.tr("Quit")
+            p.done.connect(function() {
+                continuation();
+            });
+        }
+        PopupUtils.open(p.dialog);
+    }
+
+}

=== modified file 'checkbox-touch/components/ErrorDialog.qml'
--- checkbox-touch/components/ErrorDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/ErrorDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,17 +20,16 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 /*! \brief Error message popup.
     \inherits Item
 
     This component is an error reporting dialog.
-    To use this component call showError() from ErrorLogic.js
+
+    To use this component call showError() from DialogMgr object.
     Typical usage is:
-        import "components/ErrorLogic.js" as ErrorLogic
-        (...)
-        ErrorLogic.showError(mainView, "There was something wrong", Qt.quit)
+        dialogMgr.showError(mainView, "There was something wrong", Qt.quit)
 */
 
 Item {

=== removed file 'checkbox-touch/components/ErrorLogic.js'
--- checkbox-touch/components/ErrorLogic.js	2014-11-27 18:33:02 +0000
+++ checkbox-touch/components/ErrorLogic.js	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-.import Ubuntu.Components.Popups 1.0 as Popups
-
-function showError(caller, errorMessage, continuation, finalLabel) {
-    // stackDepth keeps track of how many popups are stacked on the screen
-    // we need this so continuation is called only if the last (the bottom one) popup
-    // is closed
-    showError.stackDepth = ++showError.stackDepth || 1;
-    var popup = Qt.createComponent(Qt.resolvedUrl("ErrorDialog.qml")).createObject(caller);
-    popup.errorMessage = errorMessage;
-    if (showError.stackDepth > 1) {
-        popup.buttonLabel = i18n.tr("Continue")
-    } else {
-        popup.buttonLabel = finalLabel || i18n.tr("Quit")
-        popup.done.connect(function() {
-            continuation();
-        });
-    }
-    Popups.PopupUtils.open(popup.dialog);
-}

=== modified file 'checkbox-touch/components/InputDialog.qml'
--- checkbox-touch/components/InputDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/InputDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,7 +20,7 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 /*! \brief Simple input dialog.
     \inherits Item
@@ -30,9 +30,9 @@
 
     /*!
       This alias aids the process of popping up the dialog.
-      Usage: PopupUtils.open(inputDialog.dialogComponent);
+      Usage: PopupUtils.open(inputDialog.dialog);
      */
-    property alias dialogComponent: component
+    property alias dialog: component
 
     property string prompt: ""
 

=== modified file 'checkbox-touch/components/InteractIntroPage.qml'
--- checkbox-touch/components/InteractIntroPage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/InteractIntroPage.qml	2016-07-21 16:41:03 +0000
@@ -28,7 +28,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 import "actions"
 

=== modified file 'checkbox-touch/components/ManualIntroPage.qml'
--- checkbox-touch/components/ManualIntroPage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/ManualIntroPage.qml	2016-07-21 16:41:03 +0000
@@ -28,7 +28,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import "actions"
 
 Page {

=== modified file 'checkbox-touch/components/PasswordDialog.qml'
--- checkbox-touch/components/PasswordDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/PasswordDialog.qml	2016-07-21 16:41:03 +0000
@@ -20,7 +20,7 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 /*! \brief Password prompt dialog.
     \inherits Item
@@ -32,9 +32,9 @@
 
     /*!
       This alias aids the process of popping up the dialog.
-      Usage: PopupUtils.open(passwordDialog.dialogComponent);
+      Usage: PopupUtils.open(passwordDialog.dialog);
      */
-    property alias dialogComponent: component
+    property alias dialog: component
 
     signal passwordEntered(string password)
     signal dialogCancelled

=== modified file 'checkbox-touch/components/QmlConfinedPage.qml'
--- checkbox-touch/components/QmlConfinedPage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/QmlConfinedPage.qml	2016-07-21 16:41:03 +0000
@@ -24,7 +24,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 import Ubuntu.Content 1.1
 import "actions"

=== modified file 'checkbox-touch/components/QmlNativePage.qml'
--- checkbox-touch/components/QmlNativePage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/QmlNativePage.qml	2016-07-21 16:41:03 +0000
@@ -24,7 +24,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 import "actions"
 

=== modified file 'checkbox-touch/components/ResumeSessionPage.qml'
--- checkbox-touch/components/ResumeSessionPage.qml	2016-07-04 13:37:03 +0000
+++ checkbox-touch/components/ResumeSessionPage.qml	2016-07-21 16:41:03 +0000
@@ -28,7 +28,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
-import "CbtDialogLogic.js" as CbtDialog
 
 Page {
     id: root
@@ -124,7 +123,7 @@
             }
             onLatchedClicked: {
                 columnLayout.latchGroup();
-                CbtDialog.showDialog(root, i18n.tr('What to do with the last job?'), [
+                dialogMgr.showDialog(root, i18n.tr('What to do with the last job?'), [
                     {
                         'text': i18n.tr('Pass'),
                         'objectName': 'passBtn',

=== modified file 'checkbox-touch/components/TestPageBody.qml'
--- checkbox-touch/components/TestPageBody.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/TestPageBody.qml	2016-07-21 16:41:03 +0000
@@ -26,7 +26,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 ColumnLayout {
     /* this property is the text to be shown in the top label */

=== modified file 'checkbox-touch/components/TestVerificationPage.qml'
--- checkbox-touch/components/TestVerificationPage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/TestVerificationPage.qml	2016-07-21 16:41:03 +0000
@@ -28,7 +28,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import "actions"
 
 Page {

=== modified file 'checkbox-touch/components/UserInteractSummaryPage.qml'
--- checkbox-touch/components/UserInteractSummaryPage.qml	2016-07-11 12:39:35 +0000
+++ checkbox-touch/components/UserInteractSummaryPage.qml	2016-07-21 16:41:03 +0000
@@ -27,7 +27,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import QtQuick.Layouts 1.1
 import "actions"
 

=== modified file 'checkbox-touch/components/actions/AddCommentAction.qml'
--- checkbox-touch/components/actions/AddCommentAction.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/actions/AddCommentAction.qml	2016-07-21 16:41:03 +0000
@@ -23,7 +23,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 
 Action {
     id: addCommentAction
@@ -34,6 +34,6 @@
         commentsDialog.commentAdded.connect(function(comment) {
             test["comments"] = comment;
         });
-        PopupUtils.open(commentsDialog.dialogComponent);
+        PopupUtils.open(commentsDialog.dialog);
     }
 }

=== modified file 'checkbox-touch/components/actions/SkipAction.qml'
--- checkbox-touch/components/actions/SkipAction.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/actions/SkipAction.qml	2016-07-21 16:41:03 +0000
@@ -23,8 +23,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 0.1
-import "../ConfirmationLogic.js" as ConfirmationLogic
+import Ubuntu.Components.Popups 1.3
 
 Action {
     id: skipAction
@@ -36,7 +35,7 @@
             question : i18n.tr("Do you really want to skip this test?"),
             remember : true,
         }
-        ConfirmationLogic.confirmRequest(mainView,
+        dialogMgr.confirmRequest(mainView,
             confirmationOptions, function(res) {
                 var currentTest = test;
                 if (res) {
@@ -48,7 +47,7 @@
                         testDone(currentTest);
                     };
                     commentsDialog.commentAdded.connect(handler);
-                    PopupUtils.open(commentsDialog.dialogComponent);
+                    PopupUtils.open(commentsDialog.dialog);
                 }
         });
     }