Merge lp:~nik90/unav/use-loader into lp:unav

[Nekhelesh Ramananthan]

- Moved actionBarRow into a Loader
- Simplified bindings in actionButtonRow and zoomSplashColumn
- Updated framework to 15.04.3 (available in stable images)

- Moved actionBarRow into a Loader
- Simplified bindings in actionButtonRow and zoomSplashColumn
- Updated framework to 15.04.3 (available in stable images)

[costales (costales)]

Hi :) Is OK for you Joerg? :)

[JkB (joergberroth)]

yes

Am 2016-03-31 um 19:22 schrieb costales:
> Hi :) Is OK for you Joerg? :)
>

=== modified file 'manifest.json'
--- manifest.json	2016-03-28 17:31:47 +0000
+++ manifest.json	2016-03-31 16:31:46 +0000
@@ -1,7 +1,7 @@
 {
 	"architecture": "all",
 	"description": "turn-by-turn GPS Navigation",
-	"framework": "ubuntu-sdk-15.04",
+	"framework": "ubuntu-sdk-15.04.3",
 	"hooks": {
 		"navigator": {
 			"apparmor": "app-armor.json",
 
=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-03-28 19:31:48 +0000
+++ qml/Main.qml	2016-03-31 16:31:46 +0000
@@ -395,45 +395,48 @@
                 }
             }
 
-            Row {
-                id: actionButtonRow
-
+            Loader {
+                id: actionButtonRowLoader
+                sourceComponent: !header.visible ? actionButtonRowComponent : undefined
                 anchors { right: parent.right; top: parent.top; margins: units.gu(1) }
-
-                ActionIcon {
-                    icon.name: "send"
-                    visible: !header.visible
-                    enabled: navigationPage.buttonsEnabled
-                    onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
-                }
-
-                ActionIcon {
-                    icon.source: mainPageStack.center_onpos ? (mainPageStack.center_onpos === 1 ? "../nav/img/header/center_onpos.svg"
-                                                                                                : "../nav/img/header/center_onpos_light.svg")
-                                                            : navigationPage.buttonsEnabled ? "../nav/img/header/gps_off.svg"
-                                                                                            : "../nav/img/header/gps_off_light.svg"
-                    visible: !header.visible
-                    enabled: navigationPage.buttonsEnabled && mainPageStack.center_onpos !== 2
-                    onClicked: {
-                        mainPageStack.center_onpos = 2;
-                        goThereActionPopover.hide();
-                        mainPageStack.executeJavaScript("center_pos()");
-                    }
-                }
-
-                ActionIcon {
-                    icon.source: navigationPage.buttonsEnabled ? "../nav/img/header/fullscreen.svg"
-                                                               : "../nav/img/header/fullscreen_light.svg"
-                    visible: !header.visible
-                    enabled: navigationPage.buttonsEnabled
-                    onClicked: navApp.settings.headerVisible = !navApp.settings.headerVisible;
-                }
-
-                ActionIcon {
-                    icon.name: "settings"
-                    visible: !header.visible
-                    enabled: navigationPage.buttonsEnabled
-                    onClicked: mainPageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+            }
+
+            Component {
+                id: actionButtonRowComponent
+                Row {
+                    id: actionButtonRow
+
+                    opacity: navigationPage.buttonsEnabled ? 1.0 : 0.3
+
+                    ActionIcon {
+                        icon.name: "send"
+                        enabled: navigationPage.buttonsEnabled
+                        onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                    }
+
+                    ActionIcon {
+                        icon.source: mainPageStack.center_onpos ? (mainPageStack.center_onpos === 1 ? "../nav/img/header/center_onpos.svg"
+                                                                                                    : "../nav/img/header/center_onpos_light.svg")
+                                                                : "../nav/img/header/gps_off.svg"
+                        enabled: navigationPage.buttonsEnabled && mainPageStack.center_onpos !== 2
+                        onClicked: {
+                            mainPageStack.center_onpos = 2;
+                            goThereActionPopover.hide();
+                            mainPageStack.executeJavaScript("center_pos()");
+                        }
+                    }
+
+                    ActionIcon {
+                        icon.name: "view-restore"
+                        enabled: navigationPage.buttonsEnabled
+                        onClicked: navApp.settings.headerVisible = !navApp.settings.headerVisible;
+                    }
+
+                    ActionIcon {
+                        icon.name: "settings"
+                        enabled: navigationPage.buttonsEnabled
+                        onClicked: mainPageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+                    }
                 }
             }
 
@@ -447,17 +450,17 @@
                     verticalCenterOffset: units.gu(2)
                 }
 
+                visible: navigationPage.buttonsEnabled
+
                 ActionIcon {
                     icon.name: "zoom-in"
                     icon.width: units.gu(4)
-                    visible: navigationPage.buttonsEnabled
                     onClicked: mainPageStack.executeJavaScript("custom_zoom(1)")
                 }
 
                 ActionIcon {
                     icon.name: "zoom-out"
                     icon.width: units.gu(4)
-                    visible: navigationPage.buttonsEnabled
                     onClicked: mainPageStack.executeJavaScript("custom_zoom(-1)")
                 }
             }