Merge lp:~ahayzen/music-app/move-to-use-settings into lp:music-app/remix

[Andrew Hayzen]

* Move to using Qt.labs.settings and remove settings.js

* Move to using Qt.labs.settings and remove settings.js

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

FAILED: Continuous integration, rev:691
http://91.189.93.70:8080/job/music-app-remix-ci/143/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1170
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/143

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/move-to-use-settings]

692. By Andrew Hayzen on 2014-10-22

* Fix for packaging

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

PASSED: Continuous integration, rev:692
http://91.189.93.70:8080/job/music-app-remix-ci/144/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1171
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/144

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/144/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'MusicArtists.qml'
--- MusicArtists.qml	2014-10-14 15:46:07 +0000
+++ MusicArtists.qml	2014-10-22 16:25:28 +0000
@@ -25,7 +25,6 @@
 import Ubuntu.Thumbnailer 0.1
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
-import "settings.js" as Settings
 import "meta-database.js" as Library
 import "playlists.js" as Playlists
 import "common"

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-22 14:53:42 +0000
+++ MusicNowPlaying.qml	2014-10-22 16:25:28 +0000
@@ -24,7 +24,6 @@
 import Ubuntu.Thumbnailer 0.1
 import "common"
 import "common/ListItemActions"
-import "settings.js" as Settings
 import "playlists.js" as Playlists
 
 MusicPage {

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2014-10-21 15:22:44 +0000
+++ MusicStart.qml	2014-10-22 16:25:28 +0000
@@ -25,7 +25,6 @@
 import Ubuntu.Thumbnailer 0.1
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
-import "settings.js" as Settings
 import "meta-database.js" as Library
 import "playlists.js" as Playlists
 import "common"

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-10-21 20:11:35 +0000
+++ MusicToolbar.qml	2014-10-22 16:25:28 +0000
@@ -23,7 +23,6 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import "common"
-import "settings.js" as Settings
 
 Item {
     anchors {

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-10-21 21:49:49 +0000
+++ MusicTracks.qml	2014-10-22 16:25:28 +0000
@@ -23,7 +23,6 @@
 import Ubuntu.Thumbnailer 0.1
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
-import "settings.js" as Settings
 import "playlists.js" as Playlists
 import "common"
 import "common/ListItemActions"

=== modified file 'Player.qml'
--- Player.qml	2014-10-01 20:41:29 +0000
+++ Player.qml	2014-10-22 16:25:28 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.3
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
-import "settings.js" as Settings
+import Qt.labs.settings 1.0
 
 /*
  * This file should *only* manage the media playing and the relevant settings
@@ -42,21 +42,19 @@
     property bool isPlaying: player.playbackState === MediaPlayer.PlayingState
     property alias playbackState: mediaPlayer.playbackState
     property alias position: mediaPlayer.position
-    property bool repeat: Settings.getSetting("repeat") === "1"
-    property bool shuffle: Settings.getSetting("shuffle") === "1"
+    property alias repeat: settings.repeat
+    property alias shuffle: settings.shuffle
     property alias source: mediaPlayer.source
     property alias volume: mediaPlayer.volume
 
     signal stopped()
 
-    onRepeatChanged: {
-        Settings.setSetting("repeat", repeat ? "1" : "0")
-        console.debug("Repeat:", Settings.getSetting("repeat") === "1")
-    }
+    Settings {
+        id: settings
+        category: "PlayerSettings"
 
-    onShuffleChanged: {
-        Settings.setSetting("shuffle", shuffle ? "1" : "0")
-        console.debug("Shuffle:", Settings.getSetting("shuffle") === "1")
+        property bool repeat: true
+        property bool shuffle: false
     }
 
     Connections {

=== modified file 'Style.qml'
--- Style.qml	2014-09-30 12:55:03 +0000
+++ Style.qml	2014-10-22 16:25:28 +0000
@@ -66,10 +66,6 @@
         property color headerColor: "#57365E";
     }
 
-    property QtObject musicSettings: QtObject {
-        property color labelColor: UbuntuColors.coolGrey;
-    }
-
     property QtObject nowPlaying: QtObject {
         property color backgroundColor: "#1d1d1d"
         property color foregroundColor: "#454545"

=== modified file 'debian/control'
--- debian/control	2014-09-08 13:24:22 +0000
+++ debian/control	2014-10-22 16:25:28 +0000
@@ -17,6 +17,7 @@
          gstreamer0.10-fluendo-mp3,
          gstreamer1.0-fluendo-mp3,
          qmlscene,
+         qml-module-qt-labs-settings,
          qtdeclarative5-ubuntu-content0.1,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-particles-plugin,
@@ -27,7 +28,6 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-usermetrics0.1,
          qtdeclarative5-window-plugin,
-         qtdeclarative5-xmllistmodel-plugin,
          thumbnailer-service,
          suru-icon-theme | ubuntu-mobile-icons,
          ${misc:Depends},

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-22 14:53:42 +0000
+++ music-app.qml	2014-10-22 16:25:28 +0000
@@ -25,10 +25,8 @@
 import Ubuntu.MediaScanner 0.1
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
-import QtQuick.XmlListModel 2.0
 import QtGraphicalEffects 1.0
 import UserMetrics 0.1
-import "settings.js" as Settings
 import "meta-database.js" as Library
 import "playlists.js" as Playlists
 import "common"
@@ -177,17 +175,6 @@
         onTriggered: player.stop()
     }
 
-    // TODO: Currently there are no settings, so do not display the Action
-    Action {
-        id: settingsAction
-        text: i18n.tr("Settings")
-        keywords: i18n.tr("Music Settings")
-        onTriggered: {
-            customdebug('Show settings')
-            musicSettings.visible = true
-        }
-    }
-
     actions: [searchAction, nextAction, playsAction, prevAction, stopAction, backAction]
 
     // signal to open new URIs
@@ -544,16 +531,6 @@
 
         customdebug("Arguments on startup: Debug: "+args.values.debug+ " and file: ")
 
-        Settings.initialize()
-        console.debug("INITIALIZED in tracks")
-        if (Settings.getSetting("initialized") !== "true") {
-            // initialize settings
-            console.debug("reset settings")
-            Settings.setSetting("initialized", "true") // setting to make sure the DB is there
-            Settings.setSetting("snaptrack", "1") // default state of snaptrack
-            Settings.setSetting("shuffle", "0") // default state of shuffle
-            Settings.setSetting("repeat", "0") // default state of repeat
-        }
         Library.initialize();
 
         // initialize playlists

=== removed file 'settings.js'
--- settings.js	2013-06-18 12:36:19 +0000
+++ settings.js	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2013 Victor Thompson <[e-mail]>
- *                    Daniel Holm <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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/>.
- */
-
-// First, let's create a short helper function to get the database connection
-function getDatabase() {
-     return LocalStorage.openDatabaseSync("music-app-settings", "1.0", "StorageDatabase", 1000000);
-}
-
-// At the start of the application, we can initialize the tables we need if they haven't been created yet
-function initialize() {
-    var db = getDatabase();
-    db.transaction(
-        function(tx) {
-            // Create the settings table if it doesn't already exist
-            // If the table exists, this is skipped
-            //tx.executeSql('DROP TABLE settings');
-            tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT UNIQUE, value TEXT)');
-      });
-}
-
-// This function is used to write a setting into the database
-function setSetting(setting, value) {
-    // setting: string representing the setting name (eg: “username”)
-    // value: string representing the value of the setting (eg: “myUsername”)
-    var db = getDatabase();
-    var res = "";
-    db.transaction(function(tx) {
-        var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
-              //console.log(rs.rowsAffected)
-              if (rs.rowsAffected > 0) {
-                res = "OK";
-              } else {
-                res = "Error";
-              }
-        }
-  );
-  // The function returns “OK” if it was successful, or “Error” if it wasn't
-  return res;
-}
-// This function is used to retrieve a setting from the database
-function getSetting(setting) {
-   var db = getDatabase();
-   var res="";
-
-   try {
-       db.transaction(function(tx) {
-         var rs = tx.executeSql('SELECT value FROM settings WHERE setting=?;', [setting]);
-         if (rs.rows.length > 0) {
-              res = rs.rows.item(0).value;
-         } else {
-             res = "Unknown";
-         }
-      })
-   } catch(e) {
-       return "";
-   }
-
-  // The function returns “Unknown” if the setting was not found in the database
-  // For more advanced projects, this should probably be handled through error codes
-  return res
-}
-
-// be carefull, this will drop the settings (db
-function reset() {
-    var db = getDatabase();
-    db.transaction(
-        function(tx) {
-            tx.executeSql('DROP TABLE settings');
-      });
-}