Merge lp:~ibelieve/ubuntu-filemanager-app/advanced-options into lp:ubuntu-filemanager-app

[Michael Spencer]

Added settings sheet and advanced option to filter files

Adds a settings sheet and the ability to hide/show advanced features. This allows the app to have features that advanced/power users want, while still being simple for regular users.

This also adds an advanced option to filter the files by a regex, so for example, a user can only see JPGs by using the "*.jpg" regex.

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

FAILED: Continuous integration, rev:48
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mdspencer/ubuntu-filemanager-app/advanced-options/+merge/175440/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/6
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/6

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/advanced-options]

49. By Michael Spencer on 2013-08-06

Merged in changes from master branch

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

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

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

review: Approve

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

PASSED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/33/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/31

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

review: Approve (continuous-integration)

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-07-26 20:37:32 +0000
+++ FolderListPage.qml	2013-08-06 15:23:35 +0000
@@ -330,13 +330,13 @@
         }
 
         ToolbarButton {
-            text: i18n.tr("Settings")
+            text: i18n.tr("Options")
             iconSource: "icons/settings.png"
 
             onTriggered: {
                 print(text)
 
-                PopupUtils.open(Qt.resolvedUrl("SettingsPopover.qml"), caller)
+                PopupUtils.open(Qt.resolvedUrl("OptionsPopover.qml"), caller)
             }
         }
 
@@ -350,6 +350,16 @@
                 PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), caller)
             }
         }
+
+        ToolbarButton {
+            text: i18n.tr("Settings")
+            iconSource: "icons/settings.png"
+            onTriggered: {
+                print(text)
+
+                showSettings()
+            }
+        }
     }
 
     Column {
 
=== renamed file 'SettingsPopover.qml' => 'OptionsPopover.qml'
--- SettingsPopover.qml	2013-06-27 02:10:00 +0000
+++ OptionsPopover.qml	2013-08-06 15:23: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]
+                }
             }
         }
     }
 
=== added file 'SettingsSheet.qml'
--- SettingsSheet.qml	1970-01-01 00:00:00 +0000
+++ SettingsSheet.qml	2013-08-06 15:23: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 'Storage.qml'
--- Storage.qml	1970-01-01 00:00:00 +0000
+++ Storage.qml	2013-08-06 15:23: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:23: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,7 +31,7 @@
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "filemanager"
     applicationName: "ubuntu-filemanager-app"
-    
+
     width: units.gu(50)
     height: units.gu(75)
 
@@ -38,10 +39,65 @@
 
     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();
 }