Merge lp:~vthompson/ubuntu-filemanager-app/move-settings-page-to-toolbar into lp:ubuntu-filemanager-app

[Victor Thompson]

* Move Settings page to be accessible via the toolbar instead of being a separate tab

* Move Settings page to be accessible via the toolbar instead of being a separate tab.

[lp:~vthompson/ubuntu-filemanager-app/move-settings-page-to-toolbar]

97. By Victor Thompson on 2013-12-04

change View toolbar icon

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:96
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/92/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/334
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/42

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/92/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/94/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/336
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/44

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/94/rebuild

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

It looks OK to me.

review: Approve

[Michael Spencer (ibelieve)]

Let's not approve this yet, as I'd like to discuss this with Victor (see the bug report) before merging. I'm okay with the merge request if a better solution doesn't present itself, though.

review: Needs Information

[Victor Thompson (vthompson)]

What if we remove the toolbar icon in phone mode and instead just have a HUD action? Then in wide mode we could display the icon. This would mean that the icon will be used on the desktop, the icon or HUD for tablet, and just HUD for the phone.

[Michael Spencer (ibelieve)]

Yes, I like that very much! I haven't started adding support for the HUD yet in any of my apps that I work on, so I hadn't thought of that.

[lp:~vthompson/ubuntu-filemanager-app/move-settings-page-to-toolbar]

98. By Victor Thompson on 2013-12-07

Add HUD action to launch Settings page.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/97/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/356
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/47

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/97/rebuild

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

Shouldn't the Settings toolbar button be referencing the Settings action?

Otherwise, it looks good.

review: Needs Fixing

[Michael Spencer (ibelieve)]

Also, it looks like you accidentally deleted the Suru background colors.

review: Needs Fixing

[Victor Thompson (vthompson)]

I removed the Suru background colors that were previously commented out. Why would the Settings toolbar button reference the Settings HUD action? Both are called via an onTriggered signal which pushes to the pagestack. Could you explain what you are expecting a little bit more?

[Michael Spencer (ibelieve)]

Oh, sorry, I didn't notice that the lines you removed were commented out.

This is what I mean about the Settings button:

ToolbarButton {
    id: settingsButton
    objectName: "settings"
    visible: wideAspect
    action: settingsAction
}

[Michael Spencer (ibelieve)]

You'll also need to add

iconSource: getIcon("settings")

to the action.

[lp:~vthompson/ubuntu-filemanager-app/move-settings-page-to-toolbar]

99. By Victor Thompson on 2013-12-07

Call settingsAction from settingsButton

[Michael Spencer (ibelieve)]

Sorry to be picky, but I want the code to be very clean. You don't need the text property set on the toolbar button, since it gets it from the action and I don't want to worry about changing one and not changing the other (not that I can see it being changed).

review: Needs Fixing

[Victor Thompson (vthompson)]

Ok, that makes sense.

[lp:~vthompson/ubuntu-filemanager-app/move-settings-page-to-toolbar]

100. By Victor Thompson on 2013-12-07

Remove settingsButton text property

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/98/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/357
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/48

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/98/rebuild

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

Looks great, thank you!

review: Approve

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-11-23 15:42:58 +0000
+++ FolderListPage.qml	2013-12-07 18:51:20 +0000
@@ -368,7 +368,7 @@
 
         ToolbarButton {
             text: i18n.tr("View")
-            iconSource: getIcon("settings")
+            iconSource: getIcon("properties")
             id: optionsButton
 
             onTriggered: {
@@ -403,6 +403,13 @@
                 PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), placesButton)
             }
         }
+
+        ToolbarButton {
+            id: settingsButton
+            visible: wideAspect
+            objectName: "settings"
+            action: settingsAction
+        }
     }
 
     flickable: !wideAspect ? folderListView : null

=== modified file 'debian/control'
--- debian/control	2013-10-25 13:44:03 +0000
+++ debian/control	2013-12-07 18:51:20 +0000
@@ -15,7 +15,8 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-nemo-qml-plugin-folderlistmodel,
-         qtdeclarative5-u1db1.0
+         qtdeclarative5-u1db1.0,
+         qtdeclarative5-hud1.0
 Description: File Manager application
  Core File Manager application
 

=== added file 'icons/properties.png'
Binary files icons/properties.png	1970-01-01 00:00:00 +0000 and icons/properties.png	2013-12-07 18:51:20 +0000 differ
=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-10-10 16:47:27 +0000
+++ ubuntu-filemanager-app.qml	2013-12-07 18:51:20 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components 0.1
 import org.nemomobile.folderlistmodel 1.0
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.Unity.Action 1.0 as UnityActions
 import U1db 1.0 as U1db
 
 /*!
@@ -44,9 +45,15 @@
     backgroundColor: "#797979"
     footerColor: "#808080"
 
-//    headerColor: "#303030"
-//    backgroundColor: "#505050"
-//    footerColor: "#707070"
+    // HUD Actions
+    Action {
+        id: settingsAction
+        text: i18n.tr("Settings")
+        description: i18n.tr("Change app settings")
+        iconSource: getIcon("settings")
+        onTriggered: pageStack.push(settingsPage)
+    }
+    actions: [settingsAction]
 
     property var pageStack: pageStack
 
@@ -65,18 +72,11 @@
                     folder: homeFolder
                 }
             }
-
-            Tab {
-                title: page.title
-                page: SettingsPage {
-                    id: settingsPage
-                }
-            }
         }
 
         Component.onCompleted: {
             pageStack.push(tabs)
-            pageStack.push(Qt.resolvedUrl("FolderListPage.qml"))
+            pageStack.push(settingsPage)
             pageStack.pop()
         }
     }
@@ -113,6 +113,10 @@
         }
     }
 
+    SettingsPage {
+        id: settingsPage
+    }
+
     // Individual settings, used for bindings
     property bool showAdvancedFeatures: false