Merge lp:~kissiel/checkbox/error-reporting into lp:checkbox

[Maciej Kisielewski]

This MR introduces error popup in checkbox touch.
It also includes changes to main.qml to use those popups.

d5e1a41 checkbox-touch: make use of error popup in main.qml
5b7e4e3 checkbox-touch: add error dialog

[Sylvain Pineau (sylvain-pineau)]

Just a suggestion to replace the Dialog label by a Flickable, see below.

review: Needs Fixing

[Maciej Kisielewski (kissiel)]

> Just a suggestion to replace the Dialog label by a Flickable, see below.

As flickable is difficult to get working in dialogs I think it's good to land this one and file an improvement bug.

[Sylvain Pineau (sylvain-pineau)]

It's so useful for debugging. Let's land this version and iterate. thanks

review: Approve

=== added file 'checkbox-touch/components/ErrorDialog.qml'
--- checkbox-touch/components/ErrorDialog.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/ErrorDialog.qml	2014-11-11 05:56:24 +0000
@@ -0,0 +1,82 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2014 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.1
+import Ubuntu.Components.Popups 0.1
+
+/*! \brief Error message popup.
+    \inherits Item
+
+    This component is an error reporting dialog.
+    To use this component call showError() from ErrorLogic.js
+    Typical usage is:
+        import "components/ErrorLogic.js" as ErrorLogic
+        (...)
+        ErrorLogic.showError(mainView, "There was something wrong", Qt.quit)
+*/
+
+Item {
+    id: errorDialog
+    /*!
+        Gets signalled when user taps on the button
+     */
+    signal done()
+
+    property string buttonLabel: i18n.tr("Um, OK")
+
+    /*!
+      `dialog` alias helps use the component containing dialog
+    */
+    property alias dialog: dialogComponent
+
+    /*!
+      Text to display in the error dialog
+    */
+    property string errorMessage: i18n.tr("Error encountered")
+
+
+    Component {
+        id: dialogComponent
+
+        Dialog {
+            id: dlg
+            width: errorDialog.width
+            height: errorDialog.height
+            title: i18n.tr("Error encountered")
+
+            Label {
+                text: errorMessage
+                width: parent.width
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            }
+
+            Button {
+                id: button
+                text: errorDialog.buttonLabel
+                color: UbuntuColors.red
+                onClicked: {
+                    done();
+                    PopupUtils.close(dlg);
+                }
+            }
+        }
+    }
+}

=== added file 'checkbox-touch/components/ErrorLogic.js'
--- checkbox-touch/components/ErrorLogic.js	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/ErrorLogic.js	2014-11-11 05:56:24 +0000
@@ -0,0 +1,19 @@
+.import Ubuntu.Components.Popups 1.0 as Popups
+
+function showError(caller, errorMessage, continuation) {
+    // 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 = i18n.tr("Quit")
+        popup.done.connect(function() {
+            continuation();
+        });
+    }
+    Popups.PopupUtils.open(popup.dialog);
+}

=== modified file 'checkbox-touch/main.qml'
--- checkbox-touch/main.qml	2014-11-05 10:56:36 +0000
+++ checkbox-touch/main.qml	2014-11-11 05:56:24 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components 1.1
 import io.thp.pyotherside 1.2
 import "components"
+import "components/ErrorLogic.js" as ErrorLogic
 
 
 /*!
@@ -68,7 +69,10 @@
                 });
             });
         }
-        onError: console.error("python error: " + traceback)
+        onError: {
+            console.error("python error: " + traceback);
+            ErrorLogic.showError(mainView, "python error: " + traceback, Qt.quit);
+        }
         onReceived: console.log("pyotherside.send: " + data)
     }
 
@@ -124,6 +128,10 @@
         title: i18n.tr("Testplan Selection")
         onlyOneAllowed: true
         function setup(testplan_info_list) {
+            if (testplan_info_list.length<1) {
+                ErrorLogic.showError(mainView, "Test plan missing", Qt.quit);
+            }
+
             model.clear();
             for (var i=0; i<testplan_info_list.length; i++) {
                 var testplan_info = testplan_info_list[i];