Merge lp:~stefan-schwarzburg/qreator/touch-reorganized into lp:qreator/touch

[Schwarzburg]

This branch mainly reorganizes the files we use:

- a folder "qreator" for all high level pages and items (the scanner page would go in here, as well as dialogs). One file per main component
- a folder "qrcodes" for all qrcode types we support when creating qr codes. Each data type has a separate file.

Certain components now have their own file: qrcanvas, qrtoolbar

This branch also introduces tabs as the main navigation structure. It still uses a pagestack within the "create" tab.

I have tried to change as few additional things as possible, the only exception is the location of the global property "pageSpacing". When using different files for the individual components, the only properties accessable seem to be properties of root.

[David Planella (dpm)]

Looks good to me, thanks!

Before merging to trunk, I've gone ahead and did a few extra changes. Mostly they were to fix some indentations, but the main one is that I renamed file names such as CreatorPage to Creator, as I thought they should not be dependent on the base component, especially if we change the UI at some point and they're no longer pages. I left the *Canvas and *Toolbar ones unchanged, as I thought these are intrinsically associated with their component, and the name helps clarifying what they are.

Let me know if you're ok with this changes. If not, we can always discuss and revert.

You can see the actual changes doing:

    bzr qdiff -r 14.1.1..15

review: Approve

[Schwarzburg (stefan-schwarzburg)]

Your changes are perfect! Thanks for merging...

=== added directory 'qrcodes'
=== added file 'qrcodes/PageQrText.qml'
--- qrcodes/PageQrText.qml	1970-01-01 00:00:00 +0000
+++ qrcodes/PageQrText.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import QtQuick.LocalStorage 2.0
+
+import "../qreator"
+
+import "../js/qrcode.js" as Qreator
+
+Page {
+    id: pageQrText
+    title: i18n.tr("Text QR code")
+    visible: false
+    
+    Column {
+        anchors.centerIn: parent
+        spacing: root.pageSpacing
+	
+        TextArea {
+            id: textQrCodeText
+            placeholderText: i18n.tr("Type the text to encode")
+            autoSize: true
+            maximumLineCount: 5
+            width: units.gu(33)
+	    
+            onTextChanged: {qrcanvastext.requestQrCodePaint(text)}
+        }
+	
+        QrCodeCanvas {
+            id: qrcanvastext
+            width: units.gu(33)
+            height: units.gu(33)
+        }
+    }
+    tools: QrCodeToolBar{}    
+}
+

=== added file 'qrcodes/PageQrUrl.qml'
--- qrcodes/PageQrUrl.qml	1970-01-01 00:00:00 +0000
+++ qrcodes/PageQrUrl.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,35 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import QtQuick.LocalStorage 2.0
+
+import "../qreator"
+
+
+Page {
+    id: pageQrUrl
+    title: i18n.tr("URL QR code")
+    visible: false
+    
+    Column {
+        anchors.centerIn: parent
+        spacing: root.pageSpacing
+        
+        TextField {
+            id: textQrCodeUrl
+            width: units.gu(33)
+            placeholderText: i18n.tr("Type the URL to encode")
+            hasClearButton: true
+	    
+            onTextChanged: {qrcanvasurl.requestQrCodePaint(text)}
+        }
+	
+        QrCodeCanvas {
+            id: qrcanvasurl
+            width: units.gu(33)
+            height: units.gu(33)
+        }
+    }
+    tools: QrCodeToolBar{}    
+}

=== added file 'qrcodes/PageQrWifi.qml'
--- qrcodes/PageQrWifi.qml	1970-01-01 00:00:00 +0000
+++ qrcodes/PageQrWifi.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,88 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import QtQuick.LocalStorage 2.0
+
+import "../qreator"
+
+
+Page {
+    id: pageQrWifi
+    title: i18n.tr("Wireless access QR code")
+    visible: false
+    
+    ListModel {
+        id: wifiSecurity
+        ListElement {
+            security: "WPA"
+            index: 0
+        }
+        ListElement {
+            security: "WEP"
+            index: 1
+        }
+        ListElement {
+            security: "No security"
+            index: 2
+        }
+    }
+    
+    Column {
+        anchors.centerIn: parent
+        spacing: units.gu(4)
+	
+        Column {
+            spacing: units.gu(2)
+	    
+            TextField {
+                id: textQrCodeSsid
+                placeholderText: i18n.tr("Type the wifi network's identifier")
+                hasClearButton: true
+                width: units.gu(33)
+		
+                onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
+            }
+	    
+            Button {
+                id: selectorSecurity
+                //property int currencyIndex: 0
+                //property  TextField input: inputFrom
+                //text: currencies.getCurrency(currencyIndex)
+                // open the popover
+                text: i18n.tr("Select security")
+                width: units.gu(33)
+                onClicked: PopupUtils.open(popoverWifiSecurity, selectorSecurity)
+                onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
+            }
+	    
+            Row {
+                spacing: units.gu(2)
+		
+                TextField {
+                    id: textQrCodePassword
+                    placeholderText: i18n.tr("Type the wifi network's password")
+                    hasClearButton: true
+                    echoMode: switchPassword.checked ? TextInput.Normal : TextInput.Password
+                    width: units.gu(33) - parent.spacing - switchPassword.width
+		    
+                    onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
+                }
+		
+                Switch {
+                    id: switchPassword
+                    checked: false
+		    
+                    //onClicked:
+                }
+            }
+        }
+	
+        QrCodeCanvas {
+            id: qrcanvaswifi
+            width: units.gu(33)
+            height: units.gu(33)
+        }
+    }
+    tools: QrCodeToolBar{}    
+}
\ No newline at end of file

=== added directory 'qreator'
=== modified file 'qreator-touch.qml'
--- qreator-touch.qml	2013-05-20 13:31:05 +0000
+++ qreator-touch.qml	2013-06-10 14:58:26 +0000
@@ -1,11 +1,14 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
 import QtGraphicalEffects 1.0
 
+import "qreator"
+
 MainView {
-    // We defint objectName for functional testing purposes
+    // We define objectName for functional testing purposes
     // (autopilot-qt5)
     objectName: "mainView"
     applicationName: "qreator-touch"
@@ -14,302 +17,31 @@
     width: units.gu(50)
     height: units.gu(75)
 
-    PageStack {
-        id: pageStack
-        property real pageSpacing: units.gu(6)
-
-        anchors {
-            fill: parent
-        }
-        
-        Component.onCompleted: push(pageRoot)
-
-        Page {
-            id: pageRoot
-            title: i18n.tr("QR code type")
-            visible: false
-
-            Column {
-                anchors.fill: parent
-                ListItem.Standard {
-                    id: itemQrText
-                    text: i18n.tr("Text")
-                    icon: Qt.resolvedUrl("img/text.png")
-                    onClicked: pageStack.push(pageQrText)
-                    progression: true
-                }
-                ListItem.Standard {
-                    id: itemQrUrl
-                    text: i18n.tr("URL")
-                    icon: Qt.resolvedUrl("img/url.png")
-                    onClicked: pageStack.push(pageQrUrl)
-                    progression: true
-                }
-                ListItem.Standard {
-                    id: itemQrWifi
-                    text: i18n.tr("Wifi")
-                    icon: Qt.resolvedUrl("img/wifi.png")
-                    onClicked: pageStack.push(pageQrWifi)
-                    progression: true
-                }
-            }
-
-            tools: ToolbarActions {
-                Action {
-                    text: i18n.tr("About")
-                    iconSource: Qt.resolvedUrl("img/about.png")
-                    onTriggered: pageStack.push(pageAbout)
-                }
-                Action {
-                    text: i18n.tr("History")
-                    iconSource: Qt.resolvedUrl("img/history.png")
-                    onTriggered: pageStack.push(pageHistory)
-                }
-                Action {
-                    text: i18n.tr("Settings")
-                    iconSource: Qt.resolvedUrl("img/settings.png")
-                    onTriggered: pageStack.push(pageSettings)
-                }
-            }
-        }
-
-        Page {
-            id: pageQrText
-            title: i18n.tr("Text QR code")
-            visible: false
-
-            Column {
-                anchors.centerIn: parent
-                spacing: pageStack.pageSpacing
-
-                TextArea {
-                     id: textQrCodeText
-                     placeholderText: i18n.tr("Type the text to encode")
-                     autoSize: true
-                     maximumLineCount: 5
-                     width: units.gu(33)
-
-                     onTextChanged: {qrcanvastext.requestQrCodePaint(text)}
-                 }
-
-                QrCodeCanvas {
-                        id: qrcanvastext
-                        width: units.gu(33)
-                        height: units.gu(33)
-                }
-            }
-
-        }
-
-        Page {
-            id: pageQrUrl
-            title: i18n.tr("URL QR code")
-            visible: false
-
-            Column {
-                anchors.centerIn: parent
-                spacing: pageStack.pageSpacing
-                    
-                TextField {
-                        id: textQrCodeUrl
-                        width: units.gu(33)
-                        placeholderText: i18n.tr("Type the URL to encode")
-                        hasClearButton: true
-
-                        onTextChanged: {qrcanvasurl.requestQrCodePaint(text)}
-                }
-
-                QrCodeCanvas {
-                        id: qrcanvasurl
-                        width: units.gu(33)
-                        height: units.gu(33)
-                }
-            }
-
-            //tools: Loader {sourceComponent: qrcodetoolbar}
-            //tools: qrcodetoolbar
-        }
-
-        Page {
-            id: pageQrWifi
-            title: i18n.tr("Wireless access QR code")
-            visible: false
-
-            ListModel {
-                id: wifiSecurity
-                ListElement {
-                    security: "WPA"
-                    index: 0
-                }
-                ListElement {
-                    security: "WEP"
-                    index: 1
-                }
-                ListElement {
-                    security: "No security"
-                    index: 2
-                }
-            }
-
-            Column {
-                anchors.centerIn: parent
-                spacing: units.gu(4)
-
-                Column {
-                    spacing: units.gu(2)
-
-                    TextField {
-                         id: textQrCodeSsid
-                         placeholderText: i18n.tr("Type the wifi network's identifier")
-                         hasClearButton: true
-                         width: units.gu(33)
-
-                         onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
-                    }
-
-                    Button {
-                        id: selectorSecurity
-                                    //property int currencyIndex: 0
-                                    //property  TextField input: inputFrom
-                                    //text: currencies.getCurrency(currencyIndex)
-                                    // open the popover
-                        text: i18n.tr("Select security")
-                        width: units.gu(33)
-                        onClicked: PopupUtils.open(popoverWifiSecurity, selectorSecurity)
-                        onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
-                    }
-
-                    Row {
-                        spacing: units.gu(2)
-
-                        TextField {
-                             id: textQrCodePassword
-                             placeholderText: i18n.tr("Type the wifi network's password")
-                             hasClearButton: true
-                             echoMode: switchPassword.checked ? TextInput.Normal : TextInput.Password
-                             width: units.gu(33) - parent.spacing - switchPassword.width
-
-                             onTextChanged: {qrcanvaswifi.requestQrCodePaint(text)}
-                        }
-
-                        Switch {
-                            id: switchPassword
-                            checked: false
-
-                            //onClicked:
-                        }
-                    }
-                }
-
-                QrCodeCanvas {
-                        id: qrcanvaswifi
-                        width: units.gu(33)
-                        height: units.gu(33)
-                }
-            }
-
-        }
-        
-        Page {
-            id: pageSettings
-            title: i18n.tr("Settings")
-            visible: false
-
-            Column {
-
-            }
-        }
- 
-        Page {
-            id: pageAbout
-            title: i18n.tr("About")
-            visible: false
-
-            Column {
-
-            }
-        }       
-
-        Page {
-            id: pageHistory
-            title: i18n.tr("History")
-            visible: false
-
-            Column {
-
-            }
-        }
-        
-    }
-
-    Component {
-        id: popoverWifiSecurity
-        Popover {
-            Column {
-                    anchors {
-                        top: parent.top
-                        left: parent.left
-                        right: parent.right
-                    }
-                    // Make sure the Popover doesn't flow off the screen
-                    height: units.gu(33) //getHeight()
-
-                    //units.gu(33) //wifiSecurity.count * wifiSecurity.get(0).height //units.gu(33)//root.height
-
-                    function getHeight () {
-                        var firstElement = wifiSecurity.get(0);
-                        console.log(firstElement.security);
-                        return wifiSecurity.count * firstElement.height;
-                    }
-
-
-                    // Header displaying title
-                    ListItem.Header {
-                        id: header
-                        text: i18n.tr("Select security")
-                    }
-                    // List of security modes
-                    ListView {
-                        clip: true
-                        width: parent.width
-                        height: parent.height - header.height
-                        model: wifiSecurity
-                        delegate: ListItem.Standard {
-                            text: security
-                            onClicked: {
-                                caller.text = security
-                                //caller.input.update()
-                                hide()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-    Component {
-        id: qrcodetoolbar
-        //Item {
-            ToolbarActions {
-                        Action {
-                            text: i18n.tr("Edit")
-                            iconSource: Qt.resolvedUrl("img/about.png")
-                            //onTriggered: pageStack.push(pageAbout)
-                        }
-                        Action {
-                            text: i18n.tr("Save")
-                            iconSource: Qt.resolvedUrl("img/history.png")
-                            //onTriggered: pageStack.push(pageHistory)
-                        }
-                        Action {
-                            text: i18n.tr("Share")
-                            iconSource: Qt.resolvedUrl("img/settings.png")
-                            //onTriggered: pageStack.push(pageSettings)
-                        }
-                    }
-        //}
-    }
-
+    property real pageSpacing: units.gu(6)
+
+    Tabs {
+        id: tabs
+        Tab {
+            objectName: "TabScanner"
+            title: i18n.tr("Scan")
+            page: ScannerPage {
+		id: scannerPage
+	    }
+	}
+	Tab {
+            objectName: "TabQreator"
+            title: i18n.tr("Create")	    
+            page: CreatorPage {
+		id: creatorPage
+	    }
+	}
+	Tab {
+	    objectName: "TabHistory"
+	    title: i18n.tr("History")
+	    page: HistoryPage {
+		id: historyPage
+	    }
+	}
+    }
 }
 

=== added file 'qreator/CreatorPage.qml'
--- qreator/CreatorPage.qml	1970-01-01 00:00:00 +0000
+++ qreator/CreatorPage.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,75 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import QtGraphicalEffects 1.0
+
+import "../qrcodes/"
+
+PageStack {
+    id: pageStack
+    
+    anchors {
+        fill: parent
+    }
+    
+    Component.onCompleted: push(pageRoot)
+
+    
+    // QR code datatypes
+    PageQrText {id: pageQrText}
+    PageQrUrl {id: pageQrUrl}
+    PageQrWifi {id: pageQrWifi}
+    
+
+    // Overview of possible datatypes
+    Page {
+	id: pageRoot
+	title: i18n.tr("QR code type")
+	visible: false
+	
+	
+	Column {
+	    anchors.fill: parent
+	    ListItem.Standard {
+		id: itemQrText
+		text: i18n.tr("Text")
+		icon: Qt.resolvedUrl("../img/text.png")
+		onClicked: pageStack.push(pageQrText)
+		progression: true
+	    }
+	    ListItem.Standard {
+		id: itemQrUrl
+		text: i18n.tr("URL")
+		icon: Qt.resolvedUrl("../img/url.png")
+		onClicked: pageStack.push(pageQrUrl)
+		progression: true
+	    }
+	    ListItem.Standard {
+		id: itemQrWifi
+		text: i18n.tr("Wifi")
+		icon: Qt.resolvedUrl("../img/wifi.png")
+		onClicked: pageStack.push(pageQrWifi)
+		progression: true
+	    }
+	}
+	
+	tools: ToolbarActions {
+	    Action {
+		text: i18n.tr("About")
+		iconSource: Qt.resolvedUrl("../img/about.png")
+		onTriggered: pageStack.push(pageAbout)
+	    }
+	    Action {
+		text: i18n.tr("History")
+		iconSource: Qt.resolvedUrl("../img/history.png")
+		onTriggered: pageStack.push(pageHistory)
+	    }
+	    Action {
+		text: i18n.tr("Settings")
+		iconSource: Qt.resolvedUrl("../img/settings.png")
+		onTriggered: pageStack.push(pageSettings)
+	    }
+	}
+    }
+}

=== added file 'qreator/HistoryPage.qml'
--- qreator/HistoryPage.qml	1970-01-01 00:00:00 +0000
+++ qreator/HistoryPage.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: pageRoot
+    title: i18n.tr("Scan")
+    visible: false
+    
+}

=== renamed file 'QrCodeCanvas.qml' => 'qreator/QrCodeCanvas.qml'
--- QrCodeCanvas.qml	2013-02-16 14:27:12 +0000
+++ qreator/QrCodeCanvas.qml	2013-06-10 14:58:26 +0000
@@ -1,7 +1,8 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 0.1
-import "js/qrcode.js" as QrCode
+
+import "../js/qrcode.js" as QrCode
 
 Item {
     id: container

=== added file 'qreator/QrCodeToolBar.qml'
--- qreator/QrCodeToolBar.qml	1970-01-01 00:00:00 +0000
+++ qreator/QrCodeToolBar.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import QtQuick.LocalStorage 2.0
+
+ToolbarActions {
+}
\ No newline at end of file

=== added file 'qreator/ScannerPage.qml'
--- qreator/ScannerPage.qml	1970-01-01 00:00:00 +0000
+++ qreator/ScannerPage.qml	2013-06-10 14:58:26 +0000
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import QtGraphicalEffects 1.0
+
+
+Page {
+    id: pageRoot
+    title: i18n.tr("Scan")
+    visible: false
+
+}