Merge lp:~robert-ancell/ubuntu-netwalk/modern-ui into lp:ubuntu-netwalk

[Robert Ancell]

Update to modern UI as the current UI didn't seem to render properly on current phones.

[Filippo Scognamiglio (flscogna)]

Thank you very much Robert. This has been on my TODO list for a very long time and I'm extremely glad someone took care of it. Cheers!

review: Approve

=== modified file 'manifest.json'
--- manifest.json	2014-03-06 10:08:44 +0000
+++ manifest.json	2015-06-03 03:58:13 +0000
@@ -1,6 +1,6 @@
 {
 "description": "Ubuntu NetWalk app",
-"framework": "ubuntu-sdk-13.10",
+"framework": "ubuntu-sdk-14.10",
 "architecture": "armhf",
 "hooks": {
 "ubuntu-netwalk": {

=== modified file 'qml/UbuntuNetwalk.qml'
--- qml/UbuntuNetwalk.qml	2014-02-09 21:40:05 +0000
+++ qml/UbuntuNetwalk.qml	2015-06-03 03:58:13 +0000
@@ -1,7 +1,6 @@
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.1
 
 import "components"
 
@@ -16,6 +15,7 @@
     // Note! applicationName needs to match the .desktop filename
     applicationName: "com.ubuntu.developer.flscogna.ubuntu-netwalk"
     automaticOrientation: true
+    useDeprecatedToolbar: false
     
     width: units.gu(100)
     height: units.gu(75)
@@ -23,109 +23,109 @@
     headerColor: "#444444";
     backgroundColor: "#333333";
     footerColor: "#333333";
-
-    Page {
-        id: gamepage
-        title: i18n.tr("UbuntuNetWalk")
-
-        AboutDialog{id: aboutdialog}
-        SettingsDialog{id: settingsdialog}
-        HighScoresDialog{id: highscoredialog}
-
-        tools: ToolbarItems {
-            ToolbarButton{
-                objectName: "about"
-                text: i18n.tr("About")
-                iconSource: Qt.resolvedUrl("imgs/png/star.png")
-
-                onTriggered: PopupUtils.open(aboutdialog, gamepage)
-            }
-
-            ToolbarButton{
-                objectName: "highscores"
-                text: i18n.tr("HighScores")
-                iconSource: Qt.resolvedUrl("imgs/png/star.png")
-
-                onTriggered: {
-                    PopupUtils.open(highscoredialog, gamepage)
-                }
-            }
-
-            ToolbarButton{
-                objectName: "settings"
-                text: i18n.tr("Settings")
-
-                iconSource: Qt.resolvedUrl("imgs/png/edit.png");
-
-                onTriggered: {
-                    PopupUtils.open(settingsdialog, gamepage);
-                }
-            }
-
-            ToolbarButton{
-                objectName: "action"
-
-                iconSource: Qt.resolvedUrl("imgs/png/reload.png")
-                text: i18n.tr("New Game")
-
-                onTriggered: {
-                    var params = settingsmanager.getDifficultyParams();
-                    logic.newGame(params[0],params[1],params[2],params[3]);
-                }
-            }
-        }
-
-        Timer{
-            interval: 100
-            onTriggered: logic.time += 0.1
-            running: logic.gameState === logic.GAME_RUNNING
-            repeat: true
-        }
-
-        SettingsManager{
-            id: settingsmanager
-        }
-
-        Rectangle{
-            id: maincontainer
-            color: "#191919";
-
-            clip: true
-
-            anchors.fill: parent
-
-            DropdownMenu{
-                id: dropdownmenu
+    
+    PageStack {
+        id: page_stack
+        Component.onCompleted: push (gamepage)
+
+        Page {
+            id: gamepage
+            title: i18n.tr("UbuntuNetWalk")
+
+            head.actions:
+            [
+                Action {
+                    text: i18n.tr("Settings")
+                    iconName: "settings"
+                    onTriggered: page_stack.push (settings_page)
+                },
+                Action {
+                    text: i18n.tr("New Game")
+                    iconName: "reload"
+                    onTriggered: {
+                        var params = settingsmanager.getDifficultyParams();
+                        logic.newGame(params[0],params[1],params[2],params[3]);
+                    }
+                },
+                Action {
+                    text: i18n.tr("HighScores")
+                    iconSource: Qt.resolvedUrl("imgs/png/star.png")
+                    onTriggered: page_stack.push (high_scores_page)
+                },
+                Action {
+                    text: i18n.tr("About")
+                    iconName: "info"
+                    onTriggered: page_stack.push (about_page)
+                }
+            ]
+
+            Timer{
+                interval: 100
+                onTriggered: logic.time += 0.1
+                running: logic.gameState === logic.GAME_RUNNING
+                repeat: true
+            }
+
+            SettingsManager{
+                id: settingsmanager
+            }
+
+            Rectangle{
+                id: maincontainer
+                color: "#191919";
+
+                clip: true
+
+                anchors.fill: parent
+
+                DropdownMenu{
+                    id: dropdownmenu
+                    anchors{
+                        top: parent.top
+                        bottom: statsbar.bottom
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    z: 5
+                }
+
+                TopBar{
+                    id: statsbar
+                }
+
                 anchors{
+                    bottom: parent.bottom
                     top: parent.top
-                    bottom: statsbar.bottom
                     left: parent.left
                     right: parent.right
-                }
-
-                z: 5
-            }
-
-            TopBar{
-                id: statsbar
-            }
-
-            anchors{
-                bottom: parent.bottom
-                top: parent.top
-                left: parent.left
-                right: parent.right
-                margins: units.gu(1)
-            }
-
-            GameView {
-                id: mainview
-                objectName: "mainview"
-
-                anchors.fill: parent
-                anchors.topMargin: statsbar.height
-                visible: true
-            }
+                    margins: units.gu(1)
+                }
+
+                GameView {
+                    id: mainview
+                    objectName: "mainview"
+
+                    anchors.fill: parent
+                    anchors.topMargin: statsbar.height
+                    visible: true
+                }
+            }
+        }
+
+        HighScoresPage {
+            id: high_scores_page
+            visible: false
+        }
+
+        SettingsPage {
+            id: settings_page
+            visible: false
+        }
+
+        AboutPage {
+            id: about_page
+            visible: false
         }
     }
 

=== removed file 'qml/components/AboutDialog.qml'
--- qml/components/AboutDialog.qml	2014-01-25 10:48:17 +0000
+++ qml/components/AboutDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-
-Component {
-    id: aboutdialog
-
-    Dialog {
-        id: aboutdialogue
-        title: i18n.tr("About")
-        text: i18n.tr("The remake of the popular game Netwalk optimized for Ubuntu Touch! \n\n Filippo Scognamiglio ([e-mail])")
-
-        Image{
-            width: 128
-            height: 128
-            fillMode: Image.PreserveAspectFit
-            source: "../imgs/png/ubuntuNetwalkicon.png"
-        }
-
-        Rectangle{
-            opacity: 0
-            height: units.gu(2)
-        }
-
-        Button {
-            text: i18n.tr("Close")
-            onClicked: PopupUtils.close(aboutdialogue)
-        }
-    }
-}

=== added file 'qml/components/AboutPage.qml'
--- qml/components/AboutPage.qml	1970-01-01 00:00:00 +0000
+++ qml/components/AboutPage.qml	2015-06-03 03:58:13 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    title: i18n.tr("About")
+
+    Label {
+        anchors.fill: parent
+        anchors.margins: units.gu (2)
+        text: i18n.tr("The remake of the popular game Netwalk optimized for Ubuntu Touch! \n\n Filippo Scognamiglio ([e-mail])")
+    }
+}

=== modified file 'qml/components/DropdownMenu.qml'
--- qml/components/DropdownMenu.qml	2014-02-09 22:41:32 +0000
+++ qml/components/DropdownMenu.qml	2015-06-03 03:58:13 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 UbuntuShape {
     id: dropdownmenu

=== modified file 'qml/components/GameView.qml'
--- qml/components/GameView.qml	2014-03-05 22:42:41 +0000
+++ qml/components/GameView.qml	2015-06-03 03:58:13 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: gameview

=== removed file 'qml/components/HighScoresDialog.qml'
--- qml/components/HighScoresDialog.qml	2014-01-25 10:48:17 +0000
+++ qml/components/HighScoresDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Component {
-    id: highscoredialog
-
-    Dialog {
-        id: highscoredialogue
-        title: i18n.tr("HighScores")
-
-        ListModel{
-            id: highscoremodel
-
-            function appendAll(array){
-                for(var i = 0; i<array.length; i++){
-                    highscoremodel.append(array[i]);
-                }
-            }
-        }
-
-        OptionSelector {
-            id: difficultyselector
-            text: i18n.tr("Difficulty")
-            model: settingsmanager.difficulty_strings
-
-            selectedIndex: settingsmanager.difficulty_index
-
-            function loadModel(difficulty){
-                highscoremodel.clear();
-                highscoremodel.appendAll(settingsmanager.highscores[difficulty]);
-            }
-
-            onSelectedIndexChanged: loadModel(selectedIndex)
-            Component.onCompleted: loadModel(selectedIndex);
-        }
-
-
-        Text{
-            Label{
-                color: "white"
-                anchors.left: parent.left
-                text: highscoremodel.count !== 0 ? i18n.tr("Name") : i18n.tr("No scores")
-                font.bold: true
-            }
-            Label{
-                color: "white"
-                font.bold: true
-                anchors.right: parent.right
-                text: highscoremodel.count !== 0 ? i18n.tr("Time") + "  (" + i18n.tr("Moves") + ")" : ""
-            }
-        }
-
-        //Divider
-        Rectangle{
-            height: units.gu(0.5)
-            opacity: 0
-        }
-
-        Repeater{
-            model: highscoremodel
-
-            delegate: Text{
-                Label{
-                    anchors.left: parent.left
-                    text: name
-                    color: "white"
-                }
-                Label{
-                    anchors.right: parent.right
-                    color: "white"
-                    font.bold: true
-                    text: time.toFixed(1) + "  ("+ moves + ")";
-                }
-            }
-        }
-
-        //Divider
-        Rectangle{
-            height: units.gu(0.5)
-            opacity: 0
-        }
-
-        Button {
-            text: i18n.tr("Close")
-            onClicked: PopupUtils.close(highscoredialogue)
-        }
-    }
-}

=== added file 'qml/components/HighScoresPage.qml'
--- qml/components/HighScoresPage.qml	1970-01-01 00:00:00 +0000
+++ qml/components/HighScoresPage.qml	2015-06-03 03:58:13 +0000
@@ -0,0 +1,69 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    title: i18n.tr("HighScores")
+
+    ListModel{        
+        id: highscoremodel        
+
+        function appendAll(array){        
+            for(var i = 0; i<array.length; i++){        
+                highscoremodel.append(array[i]);        
+            }        
+        }        
+    }        
+
+    Column{
+        anchors.fill: parent
+        anchors.margins: units.gu (2)
+        spacing: units.gu (2)
+
+        OptionSelector {
+            id: difficultyselector
+            text: i18n.tr("Difficulty")
+            model: settingsmanager.difficulty_strings
+
+            selectedIndex: settingsmanager.difficulty_index
+
+            function loadModel(difficulty){
+                highscoremodel.clear();
+                highscoremodel.appendAll(settingsmanager.highscores[difficulty]);
+            }
+
+            onSelectedIndexChanged: loadModel(selectedIndex)
+            Component.onCompleted: loadModel(selectedIndex);
+        }
+
+        Label{        
+            color: "white"        
+            anchors.left: parent.left        
+            text: highscoremodel.count !== 0 ? i18n.tr("Name") : i18n.tr("No scores")        
+            font.bold: true        
+        }        
+        Label{        
+            color: "white"        
+            font.bold: true        
+            anchors.right: parent.right        
+            text: highscoremodel.count !== 0 ? i18n.tr("Time") + "  (" + i18n.tr("Moves") + ")" : ""        
+        }        
+
+        Repeater{
+            model: highscoremodel
+
+            delegate: Text{
+                Label{
+                    anchors.left: parent.left
+                    text: name
+                    color: "white"
+                }
+                Label{
+                    anchors.right: parent.right
+                    color: "white"
+                    font.bold: true
+                    text: time.toFixed(1) + "  ("+ moves + ")";
+                }
+            }
+        }
+    }
+}

=== removed file 'qml/components/SettingsDialog.qml'
--- qml/components/SettingsDialog.qml	2014-02-19 20:31:25 +0000
+++ qml/components/SettingsDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Component {
-    id: settingsdialog
-
-    Dialog {
-        id: settingsdialogue
-        title: i18n.tr("Settings")
-
-        property int initialIndex;
-
-        Item{
-            height: childrenRect.height
-            Label{
-                text: i18n.tr("Glowing wires")
-            }
-            Switch{
-                id: glowingchecker
-                anchors.right: parent.right
-                checked: settingsmanager.glowing
-                onCheckedChanged: settingsmanager.glowing = checked;
-            }
-        }
-
-        Item{
-            height: childrenRect.height
-            Label{
-                text: i18n.tr("Rotations")
-            }
-            Switch{
-                id: rotationchecker
-                anchors.right: parent.right
-                checked: settingsmanager.rotation
-                onCheckedChanged: settingsmanager.rotation = checked;
-            }
-        }
-
-        OptionSelector {
-            id: difficultyselector
-            text: i18n.tr("Difficulty")
-            model: settingsmanager.difficulty_strings
-            selectedIndex: settingsmanager.difficulty_index
-
-            Component.onCompleted: settingsdialogue.initialIndex = selectedIndex;
-        }
-
-        Button {
-            text: i18n.tr("Close")
-            onClicked: {
-                if(difficultyselector.selectedIndex !== settingsdialogue.initialIndex){
-                    settingsmanager.difficulty_index = difficultyselector.selectedIndex;
-
-                    var params = settingsmanager.getDifficultyParams();
-                    logic.newGame(params[0], params[1], params[2], params[3]);
-                }
-
-                PopupUtils.close(settingsdialogue);
-            }
-        }
-    }
-}

=== added file 'qml/components/SettingsPage.qml'
--- qml/components/SettingsPage.qml	1970-01-01 00:00:00 +0000
+++ qml/components/SettingsPage.qml	2015-06-03 03:58:13 +0000
@@ -0,0 +1,44 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    title: i18n.tr("Settings")
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: units.gu (2)
+        spacing: units.gu (2)
+
+        Row{
+            spacing: units.gu (2)
+            Label{
+                text: i18n.tr("Glowing wires")
+            }
+            Switch{
+                checked: settingsmanager.glowing
+                onCheckedChanged: settingsmanager.glowing = checked;
+            }
+        }
+
+        Row{
+            spacing: units.gu (2)
+            Label{
+                text: i18n.tr("Rotations")
+            }
+            Switch{
+                checked: settingsmanager.rotation
+                onCheckedChanged: settingsmanager.rotation = checked;
+            }
+        }
+
+        OptionSelector {
+            text: i18n.tr("Difficulty")
+            model: settingsmanager.difficulty_strings
+            onDelegateClicked: {
+                settingsmanager.difficulty_index = index;
+                var params = settingsmanager.getDifficultyParams();
+                logic.newGame(params[0], params[1], params[2], params[3]);
+            }
+        }
+    }
+}

=== modified file 'qml/components/TopBar.qml'
--- qml/components/TopBar.qml	2013-09-15 17:31:59 +0000
+++ qml/components/TopBar.qml	2015-06-03 03:58:13 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Rectangle{
     id: statsbar

=== removed file 'qml/imgs/png/edit.png'
Binary files qml/imgs/png/edit.png	2013-09-15 17:31:59 +0000 and qml/imgs/png/edit.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/imgs/png/reload.png'
Binary files qml/imgs/png/reload.png	2013-09-15 17:31:59 +0000 and qml/imgs/png/reload.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/imgs/png/ubuntuNetwalkicon.png'
Binary files qml/imgs/png/ubuntuNetwalkicon.png	2013-09-15 17:31:59 +0000 and qml/imgs/png/ubuntuNetwalkicon.png	1970-01-01 00:00:00 +0000 differ