Merge lp:~nik90/checkbox/clean-qml-code into lp:~zyga/checkbox/touch-app

[Nekhelesh Ramananthan]

Made some small improvements to the QML Code.

Made some small improvements to the QML Code.

[Zygmunt Krynicki (zyga)]

Hi

I've merged your changes in locally. Due to the way we work I cannot just bzr merge it directly as I want to preserve the logical flow of patches in the target branch.

Thank you for your time and for improving checkbox :-)

I have only one question:

92 - WelcomePage {
93 - id: welcomePage
94 - visible: false
95 + Component.onCompleted: {
96 + push(Qt.resolvedUrl("components/WelcomePage.qml"))
97 }
98 - Component.onCompleted: push(welcomePage)

Why is that better? I realize it's going to push a new component each time, right? (and only once we actually click on the start testing button)

[Nekhelesh Ramananthan (nik90)]

I do that personally for several reasons,

1. It makes your main.qml file simple and precise.

2. Dynamic loading of components. Since welcomePage is in a separate file, it gets loaded only when you push it into the pagestack. Once you pop it (when moving to the next page), it gets unloaded from memory automatically.

This doesn't happen if you instantiate the welcomePage object in the main.qml file like it was done before.

[Zygmunt Krynicki (zyga)]

Thanks.

I'll mark this merge request as merged now :-)

=== modified file 'checkbox-touch/components/WelcomePage.qml'
--- checkbox-touch/components/WelcomePage.qml	2014-08-15 14:30:38 +0000
+++ checkbox-touch/components/WelcomePage.qml	2014-08-15 15:45:49 +0000
@@ -23,42 +23,43 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
 
-
 Page {
+    id: welcomePage
+
     signal startTestingTriggered();
 
     title: i18n.tr("System Testing")
-    anchors.bottomMargin: units.gu(1)
-    Column {
-        anchors.margins: units.gu(1)
-        spacing: units.gu(1)
-        id: column1
+    visible: false
+
+    Label {
+        id: welcomeText
+
         anchors {
-            fill: parent
-        }
-        Text {
-            id: welcomeText
-            text: i18n.tr("Welcome text")
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            width: parent.width
-            height: parent.height
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            font.pixelSize: units.gu(4)
-        }
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: startTestButton.top
+        }
+
+        text: i18n.tr("Welcome text")
+        font.pixelSize: units.gu(4)
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
     }
+
     Button {
+        id: startTestButton
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+
         color: UbuntuColors.green
         text: i18n.tr("Start Testing")
-        /* This is just to add some spacing around the button. I'm not sure if
-         * that's *the* way to do it though */
-        anchors.right: parent.right
-        anchors.rightMargin: units.gu(2)
-        anchors.left: parent.left
-        anchors.leftMargin: units.gu(2)
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: units.gu(1)
-        transformOrigin: Item.Center
         onClicked: startTestingTriggered();
     }
 }
 
=== modified file 'checkbox-touch/main.qml'
--- checkbox-touch/main.qml	2014-08-15 14:30:38 +0000
+++ checkbox-touch/main.qml	2014-08-15 15:45:49 +0000
@@ -44,6 +44,8 @@
     width: units.gu(100)
     height: units.gu(75)
 
+    useDeprecatedToolbar: false
+
     // High-level object representing the full checkbox testing stack
     CheckboxStack {
         onStackReady: {
@@ -55,10 +57,8 @@
 
     PageStack {
         id: pageStack
-        WelcomePage {
-            id: welcomePage
-            visible: false
+        Component.onCompleted: {
+            push(Qt.resolvedUrl("components/WelcomePage.qml"))
         }
-        Component.onCompleted: push(welcomePage)
     }
 }
 
=== modified file 'checkbox-touch/manifest.json'
--- checkbox-touch/manifest.json	2014-08-12 19:01:04 +0000
+++ checkbox-touch/manifest.json	2014-08-15 15:45:49 +0000
@@ -12,4 +12,4 @@
     "name": "com.canonical.certification.checkbox-touch",
     "title": "Checkbox Touch",
     "version": "0.2"
-}
+}
 \ No newline at end of file