Merge lp:~ibelieve/ubuntu-filemanager-app/sidebar into lp:ubuntu-filemanager-app

[Michael Spencer]

Added a sidebar for desktop/tablet mode

Added a sidebar for desktop/tablet mode that makes going to bookmarked places easy (like in Nautilus).

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

PASSED: Continuous integration, rev:56
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/20/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/18

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

review: Approve (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/sidebar]

57. By Michael Spencer on 2013-08-06

Merged in advanced-options branch

58. By Michael Spencer on 2013-08-06

Fixed visibility of actions in the folder actions popover

59. By Michael Spencer on 2013-08-06

Added initial Suru theme and some hacks to make it work by Victor Thompson

60. By Michael Spencer on 2013-08-06

Improved file action selection popover

61. By Michael Spencer on 2013-08-06

Fixed how the action selection popover worked

62. By Michael Spencer on 2013-08-06

Fixed action popovers

63. By Michael Spencer on 2013-08-06

Improved autopilot tests to work with the sidebar

64. By Michael Spencer on 2013-08-07

Fixed pep8 and pyflakes errors and worked on fixing autopilot tests

65. By Michael Spencer on 2013-08-09

Completely fixed all autopilot tests

Unmerged revisions

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-07-26 20:37:32 +0000
+++ FolderListPage.qml	2013-08-06 15:29:35 +0000
@@ -330,17 +330,30 @@
         }
 
         ToolbarButton {
-            text: i18n.tr("Settings")
+            text: i18n.tr("Options")
             iconSource: "icons/settings.png"
 
             onTriggered: {
                 print(text)
 
-                PopupUtils.open(Qt.resolvedUrl("SettingsPopover.qml"), caller)
-            }
-        }
-
-        ToolbarButton {
+                PopupUtils.open(Qt.resolvedUrl("OptionsPopover.qml"), caller)
+            }
+        }
+
+        ToolbarButton {
+            visible: wideAspect
+            objectName: "goTo"
+            text: i18n.tr("Go To")
+            iconSource: "icons/location.png"
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), caller)
+            }
+        }
+
+        ToolbarButton {
+            visible: !wideAspect
             objectName: "places"
             text: i18n.tr("Places")
             iconSource: "icons/location.png"
@@ -350,45 +363,120 @@
                 PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), caller)
             }
         }
-    }
-
-    Column {
-        anchors.centerIn: parent
-        Label {
-            text: i18n.tr("No files")
-            fontSize: "large"
-            visible: folderListView.count == 0 && !pageModel.awaitingResults
-        }
-        ActivityIndicator {
-            running: pageModel.awaitingResults
-            width: units.gu(8)
-            height: units.gu(8)
-        }
-    }
-
-    FolderListView {
-        id: folderListView
-
-        clip: true
-
-        folderListModel: pageModel
-        anchors.fill: parent
-        // IMPROVE: this should work (?), but it doesn't. Height is undefined. Anyway in previous
-        // SDK version the parent size was properly initialized. Now the size of toolbar is not taken into
-        // account and apparently you can't even query toolbar's height.
-        // anchors.bottomMargin: toolbar.height
-        // Now in newer SDK (raring 19.07.2013) locked&opened toolbar is taken into
-        // account in some fashion, but the extra space left to the bottom without this
-        // bottomMargin definition seems to be exactly what is the height of Header's gray
-        // separator bar. This ugly workaround seems to give correct height for view at least on desktop.
-        // Bug report on this:
-        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1202881
-        // This bug report also affects this, as if the toolbar is hidden by default
-        // then there is no problem:
-        // https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1198861
-        // Hard-code it for now. Not nice at all:
-        anchors.bottomMargin: units.gu(-2)
-    }
+
+        ToolbarButton {
+            text: i18n.tr("Settings")
+            iconSource: "icons/settings.png"
+            onTriggered: {
+                print(text)
+
+                showSettings()
+            }
+        }
+    }
+
+    flickable: !wideAspect ? folderListView : null
+
+    PlacesSidebar {
+        id: sidebar
+        objectName: "sidebar"
+
+        anchors {
+            top: parent.top
+            topMargin: units.gu(9.5)
+            bottom: parent.bottom
+            bottomMargin: units.gu(-2)
+        }
+
+        expanded: wideAspect
+    }
+
+    Item {
+        id: contents
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: sidebar.right
+            right: parent.right
+
+            // IMPROVE: this should work (?), but it doesn't. Height is undefined. Anyway in previous
+            // SDK version the parent size was properly initialized. Now the size of toolbar is not taken into
+            // account and apparently you can't even query toolbar's height.
+            // anchors.bottomMargin: toolbar.height
+            // Now in newer SDK (raring 19.07.2013) locked&opened toolbar is taken into
+            // account in some fashion, but the extra space left to the bottom without this
+            // bottomMargin definition seems to be exactly what is the height of Header's gray
+            // separator bar. This ugly workaround seems to give correct height for view at least on desktop.
+            // Bug report on this:
+            // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1202881
+            // This bug report also affects this, as if the toolbar is hidden by default
+            // then there is no problem:
+            // https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1198861
+            // Hard-code it for now. Not nice at all:
+            bottomMargin: units.gu(-2)
+        }
+
+        Column {
+            anchors.centerIn: parent
+            Label {
+                text: i18n.tr("No files")
+                fontSize: "large"
+                visible: folderListView.count == 0 && !pageModel.awaitingResults
+            }
+            ActivityIndicator {
+                running: pageModel.awaitingResults
+                width: units.gu(8)
+                height: units.gu(8)
+            }
+        }
+
+        FolderListView {
+            id: folderListView
+
+            clip: true
+
+            folderListModel: pageModel
+            anchors.fill: parent
+        }
+    }
+
+    states: [
+        State {
+            name: "wide"
+            when: wideAspect
+            PropertyChanges {
+                target: tools
+                locked: true
+                opened: true
+            }
+
+            PropertyChanges {
+                target: folderListView
+
+                anchors.top: contents.top
+                anchors.topMargin: units.gu(9.5)
+                topMargin: 0
+            }
+
+            PropertyChanges {
+                target: contents
+                anchors.top: root.top
+                anchors.topMargin: 0
+            }
+        },
+
+        //FIXME: This should automatically be calculated - is there a way to remove it?
+        State {
+            name: ""
+
+            PropertyChanges {
+                target: folderListView
+
+                topMargin: units.gu(9.5)
+            }
+        }
+
+    ]
 
     // Errors from model
     Connections {

=== added file 'GoToDialog.qml'
--- GoToDialog.qml	1970-01-01 00:00:00 +0000
+++ GoToDialog.qml	2013-08-06 15:29:35 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michael Spencer <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+
+    title: i18n.tr("Go To Location")
+
+    text: i18n.tr("Enter a location to go to:")
+
+    TextField {
+        id: locationField
+
+        inputMethodHints: Qt.ImhNoAutoUppercase
+
+        property bool valid: pathExists(text)
+
+        text: fileView.path
+
+        placeholderText: i18n.tr("Location...")
+
+        onAccepted: goButton.clicked()
+    }
+
+    Button {
+        id: goButton
+        objectName: "goButton"
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "green"//Qt.rgba(0,0.7,0,1)
+            }
+
+            GradientStop {
+                position: 1
+                color: Qt.rgba(0.3,0.7,0.3,1)
+            }
+        }
+
+        text: i18n.tr("Go")
+        enabled: locationField.acceptableInput && locationField.valid
+
+        onClicked: {
+            print("User switched to:", locationField.text)
+            goTo(locationField.text)
+            PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
+        onClicked: {
+            PopupUtils.close(root)
+        }
+    }
+}

=== renamed file 'SettingsPopover.qml' => 'OptionsPopover.qml'
--- SettingsPopover.qml	2013-06-27 02:10:00 +0000
+++ OptionsPopover.qml	2013-08-06 15:29:35 +0000
@@ -47,11 +47,11 @@
         }
 
         ValueSelector {
-            text: "Sort By"
+            text: i18n.tr("Sort By")
             selectedIndex: values.indexOf(fileView.sortingMethod)
             values: [
-                "Name",
-                "Date"
+                i18n.tr("Name"),
+                i18n.tr("Date")
             ]
 
             onSelectedIndexChanged: {
@@ -60,15 +60,39 @@
         }
 
         ValueSelector {
-            text: "Sort Order"
+            text: i18n.tr("Sort Order")
             selectedIndex: sortAccending ? 0 : 1
             values: [
-                "Ascending",
-                "Descending"
+                i18n.tr("Ascending"),
+                i18n.tr("Descending")
             ]
 
             onSelectedIndexChanged: {
-                fileView.sortAccending = (values[selectedIndex] === "Ascending")
+                fileView.sortAccending = (values[selectedIndex] === i18n.tr("Ascending"))
+            }
+        }
+
+        Standard {
+            visible: showAdvancedFeatures
+            text: i18n.tr("Filter")
+
+            TextField {
+                id: filterField
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    margins: units.gu(1)
+                }
+
+                inputMethodHints: Qt.ImhNoAutoUppercase
+
+                text: pageModel.nameFilters
+
+                onAccepted: goButton.clicked()
+                onTextChanged: {
+                    if (text !== pageModel.nameFilters)
+                        pageModel.nameFilters = [text]
+                }
             }
         }
     }

=== modified file 'PlacesPopover.qml'
--- PlacesPopover.qml	2013-07-08 22:23:29 +0000
+++ PlacesPopover.qml	2013-08-06 15:29:35 +0000
@@ -131,6 +131,8 @@
                     PopupUtils.close(root)
                     goTo(model.path)
                 }
+
+                selected: folder === path
             }
         }
     }

=== added file 'PlacesSidebar.qml'
--- PlacesSidebar.qml	1970-01-01 00:00:00 +0000
+++ PlacesSidebar.qml	2013-08-06 15:29:35 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michael Spencer <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+
+Sidebar {
+    id: root
+
+    width: units.gu(25)
+
+    ListModel {
+        id: places
+
+        ListElement {
+            path: "~"
+        }
+
+        ListElement {
+            path: "~/Documents"
+        }
+
+        ListElement {
+            path: "~/Downloads"
+        }
+
+        ListElement {
+            path: "~/Music"
+        }
+
+        ListElement {
+            path: "~/Pictures"
+        }
+
+        ListElement {
+            path: "~/Videos"
+        }
+
+        ListElement {
+            path: "/"
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        Header {
+            text: i18n.tr("Places")
+        }
+
+        Repeater {
+            id: placesList
+            objectName: "placesList"
+
+            model: places
+
+            delegate: Standard {
+                text: folderName(path)
+                icon: model.icon || fileIcon(model.path, true)
+
+                onClicked: {
+                    goTo(model.path)
+                }
+
+                height: units.gu(5)
+
+                selected: folder === path
+            }
+        }
+    }
+}

=== added file 'SettingsSheet.qml'
--- SettingsSheet.qml	1970-01-01 00:00:00 +0000
+++ SettingsSheet.qml	2013-08-06 15:29:35 +0000
@@ -0,0 +1,40 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+
+/*
+ * The Settings sheet holds global settings/preferences.
+ *
+ * TODO: Make sure this fits with the UI guidelines if
+ * they are updated to include About/Settings info.
+ */
+ComposerSheet {
+    id: root
+
+    title: i18n.tr("Settings")
+
+    contentsHeight: parent.height
+
+    Column {
+        anchors.fill: parent
+
+        Standard {
+            text: i18n.tr("Show Advanced Features")
+            control: CheckBox {
+                id: showAdvancedFeaturesCheckBox
+                checked: showAdvancedFeatures
+            }
+        }
+    }
+
+    onConfirmClicked: {
+        saveSetting("showAdvancedFeatures", showAdvancedFeaturesCheckBox.checked ? "true" : "false");
+
+        // ... Handling of other settings here ...
+
+        refreshSettings()
+
+        PopupUtils.close(root)
+    }
+}

=== added file 'Sidebar.qml'
--- Sidebar.qml	1970-01-01 00:00:00 +0000
+++ Sidebar.qml	2013-08-06 15:29:35 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michael Spencer <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Rectangle {
+    //color: "lightgray"
+
+    property bool expanded: true
+
+    Rectangle {
+        color: "lightgray"
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.right
+        }
+
+        width: 1
+    }
+
+    width: units.gu(35)
+
+
+    x: expanded ? 0 : -width
+
+    Behavior on x {
+        PropertyAnimation {
+            duration: 250
+        }
+    }
+
+    default property alias contents: contents.data
+
+    Item {
+        id: contents
+
+        anchors {
+            fill: parent
+            rightMargin: 1
+        }
+    }
+}

=== added file 'Storage.qml'
--- Storage.qml	1970-01-01 00:00:00 +0000
+++ Storage.qml	2013-08-06 15:29:35 +0000
@@ -0,0 +1,58 @@
+import QtQuick.LocalStorage 2.0
+import QtQuick 2.0
+
+Item {
+    property var db: null
+
+    function openDB() {
+        if(db !== null) return;
+
+        db = LocalStorage.openDatabaseSync("ubuntu-filemanager-app", "", "Default Ubuntu file manager app", 100000);
+
+        if (db.version === "") {
+            db.changeVersion("", "0.1",
+                function(tx) {
+                    tx.executeSql('CREATE TABLE IF NOT EXISTS settings(key TEXT UNIQUE, value TEXT)');
+                    console.log('Database created');
+                });
+            // reopen database with new version number
+            db = LocalStorage.openDatabaseSync("ubuntu-filemanager-app", "", "Default Ubuntu file manager app", 100000);
+        }
+    }
+
+    function saveSetting(key, value) {
+        openDB();
+        db.transaction( function(tx){
+            tx.executeSql('INSERT OR REPLACE INTO settings VALUES(?, ?)', [key, value]);
+        });
+    }
+
+    function getSettings(callback) {
+        openDB();
+        var settings = {};
+        db.readTransaction(
+            function(tx){
+                var rs = tx.executeSql('SELECT key, value FROM Settings');
+                for(var i = 0; i < rs.rows.length; i++) {
+                    var row = rs.rows.item(i);
+                    settings[row.key] = row.value;
+                }
+                callback(settings);
+            }
+        );
+    }
+
+    function clearSetting(name) {
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Settings WHERE key = ?', [name]);
+        });
+    }
+
+    function clearDB() { // for dev purposes
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Settings WHERE 1');
+        });
+    }
+}

=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-06-27 16:46:45 +0000
+++ ubuntu-filemanager-app.qml	2013-08-06 15:29:35 +0000
@@ -18,6 +18,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import org.nemomobile.folderlistmodel 1.0
+import Ubuntu.Components.Popups 0.1
 
 /*!
     \brief MainView with Tabs element.
@@ -30,18 +31,73 @@
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "filemanager"
     applicationName: "ubuntu-filemanager-app"
-    
-    width: units.gu(50)
+
+    width: units.gu(100)
     height: units.gu(75)
 
     property alias filemanager: root
 
     property bool wideAspect: width >= units.gu(80)
 
+    // Default settings
+    property var settings: {"showAdvancedFeatures": false}
+
+    property bool needsRefreshSettings: true
+
+    // Individual settings, used for bindings
+    property bool showAdvancedFeatures: false
+
     FolderListPage {
         id: folderPage
         objectName: "folderPage"
 
         folder: homeFolder
     }
+
+    Component {
+        id: settingsSheet
+
+        SettingsSheet {
+            objectName: "settingsSheet"
+        }
+    }
+
+    Storage {
+        id: storage
+    }
+
+    function showSettings() {
+        PopupUtils.open(settingsSheet)
+    }
+
+    function reloadSettings() {
+        showAdvancedFeatures = settings["showAdvancedFeatures"] === "true" ? true : false
+        print("showAdvancedFeatures <=", showAdvancedFeatures)
+    }
+
+    function refreshSettings() {
+        if (needsRefreshSettings) {
+            storage.getSettings(function(storedSettings) {
+                for(var settingName in storedSettings) {
+                    print(settingName, "=", storedSettings[settingName])
+                    settings[settingName] = storedSettings[settingName]
+                }
+
+                reloadSettings()
+            })
+
+            needsRefreshSettings = false
+        }
+    }
+
+    function saveSetting(name, value) {
+        // Check if the setting was changed
+        if(settings[name] !== value) {
+            print(name, "=>", value)
+            storage.saveSetting(name, value)
+            needsRefreshSettings = true
+        }
+    }
+
+    Component.onCompleted: refreshSettings();
 }