Merge lp:~bhdouglass/rockwork/translations into lp:rockwork

[Brian Douglass]

Added translation support and added sorting of the Pebble list

[Michael Zanetti (mzanetti)]

Hey, I left some comments in regard to the trademark policy. See inline replies.

Here's a link to the trademark guideline: https://developer.getpebble.com/guides/publishing-tools/pebble-trademark/

review: Needs Fixing

[lp:~bhdouglass/rockwork/translations]

29. By Brian Douglass on 2015-12-25

Updated text references to Pebble and removed unneeded Item

30. By Brian Douglass on 2015-12-25

Updated pot file

[Brian Douglass (bhdouglass)]

I wasn't event thinking about the trademark stuff, got call!

[Michael Zanetti (mzanetti)]

Ok. merged it. There was a bug. The installed apps/watchfaces model was broken. Apparently dynamicRoles: true only works properly if the first inserted item has all the roles. In our case, the showWatchApps and showWatchFaces properties are not in the first one so those broke. Anyhow, I've fixed that before merging.

review: Approve

[Brian Douglass (bhdouglass)]

Ah, sorry about that, I didn't even notice!

=== added file 'po/rockwork.mzanetti.pot'
--- po/rockwork.mzanetti.pot	1970-01-01 00:00:00 +0000
+++ po/rockwork.mzanetti.pot	2015-12-25 04:59:18 +0000
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-25 04:54+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /home/vagrant/translations/rockwork/InstalledAppsPage.qml:8
+msgid "Apps & Watchfaces"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/InstalledAppsPage.qml:8
+msgid "Apps"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/InstalledAppsPage.qml:8
+msgid "Watchfaces"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/MainMenuPage.qml:20
+msgid "Manage notifications"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/MainMenuPage.qml:26
+msgid "Manage Apps"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/MainMenuPage.qml:33
+msgid "Manage Watchfaces"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/NotificationsPage.qml:7
+msgid "Notifications"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/NotificationsPage.qml:26
+msgid ""
+"Entries here will appear as notifications keep coming. Selected "
+"notifications will be shown on your Pebble smartwatch."
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/PebblesPage.qml:6
+msgid "Manage Pebble Watches"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/PebblesPage.qml:36
+msgid "Connected"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/PebblesPage.qml:36
+msgid "Disconnected"
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/PebblesPage.qml:55
+msgid ""
+"No Pebble smartwatches configured yet. Please connect your Pebble watch "
+"using the system settings."
+msgstr ""
+
+#: /home/vagrant/translations/rockwork/PebblesPage.qml:62
+msgid "Open system settings"
+msgstr ""

=== removed file 'po/template.pot'
--- po/template.pot	2015-11-21 22:55:06 +0000
+++ po/template.pot	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-21 03:34+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: /home/micha/Develop/upebble/upebble/Main.qml:39
-msgid "Notifications"
-msgstr ""

=== removed file 'po/upebble.mzanetti.pot'
--- po/upebble.mzanetti.pot	2015-11-21 22:55:06 +0000
+++ po/upebble.mzanetti.pot	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-19 23:50+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: /home/micha/Develop/upebble/upebble/Main.qml:15
-msgid "upebble"
-msgstr ""
-
-#: /home/micha/Develop/upebble/upebble/Main.qml:28
-msgid "Hello.."
-msgstr ""
-
-#: /home/micha/Develop/upebble/upebble/Main.qml:35
-msgid "Tap me!"
-msgstr ""

=== modified file 'rockwork/InstalledAppsPage.qml'
--- rockwork/InstalledAppsPage.qml	2015-12-21 03:46:24 +0000
+++ rockwork/InstalledAppsPage.qml	2015-12-25 04:59:18 +0000
@@ -5,7 +5,7 @@
 
 Page {
     id: root
-    title: showWatchApps ? (showWatchFaces ? "Apps & Watchfaces" : "Apps") : "Watchfaces"
+    title: showWatchApps ? (showWatchFaces ? i18n.tr("Apps & Watchfaces") : i18n.tr("Apps")) : i18n.tr("Watchfaces")
 
     property var pebble: null
     property bool showWatchApps: false
@@ -34,23 +34,27 @@
                     }
                 ]
             }
+
             RowLayout {
                 anchors {
                     fill: parent
                     margins: units.gu(1)
                 }
                 spacing: units.gu(1)
+
                 Image {
                     Layout.fillHeight: true
                     Layout.preferredWidth: height
                     source: "file://" + model.icon
                 }
+
                 ColumnLayout {
                     Layout.fillWidth: true
                     Label {
                         text: model.name
                         Layout.fillWidth: true
                     }
+
                     Label {
                         text: model.vendor
                         Layout.fillWidth: true

=== modified file 'rockwork/MainMenuPage.qml'
--- rockwork/MainMenuPage.qml	2015-12-21 03:46:24 +0000
+++ rockwork/MainMenuPage.qml	2015-12-25 04:59:18 +0000
@@ -8,11 +8,32 @@
 
     property var pebble: null
 
+    //Creating the menu list this way to allow the text field to be translatable (http://askubuntu.com/a/476331)
     ListModel {
         id: mainMenuModel
-        ListElement { icon: "stock_notification"; text: "Manage notifications"; page: "NotificationsPage.qml" }
-        ListElement { icon: "stock_application"; text: "Manage apps"; page: "InstalledAppsPage.qml"; showWatchApps: true }
-        ListElement { icon: "stock_alarm-clock"; text: "Manage watchfaces"; page: "InstalledAppsPage.qml"; showWatchFaces: true }
+        dynamicRoles: true
+    }
+
+    Component.onCompleted: {
+        mainMenuModel.append({
+            icon: "stock_notification",
+            text: i18n.tr("Manage notifications"),
+            page: "NotificationsPage.qml",
+        });
+
+        mainMenuModel.append({
+            icon: "stock_application",
+            text: i18n.tr("Manage Apps"),
+            page: "InstalledAppsPage.qml",
+            showWatchApps: true,
+        });
+
+        mainMenuModel.append({
+            icon: "stock_alarm-clock",
+            text: i18n.tr("Manage Watchfaces"),
+            page: "InstalledAppsPage.qml",
+            showWatchFaces: true,
+        });
     }
 
     Column {
@@ -24,18 +45,21 @@
                 RowLayout {
                     anchors.fill: parent
                     anchors.margins: units.gu(1)
+
                     Icon {
                         Layout.fillHeight: true
                         Layout.preferredWidth: height
                         implicitHeight: parent.height
                         implicitWidth: height
-                        name:  model.icon
+                        name: model.icon
                     }
+
                     Label {
                         text: model.text
                         Layout.fillWidth: true
                     }
                 }
+
                 onClicked: {
                     var options = {};
                     options["pebble"] = root.pebble
@@ -47,4 +71,3 @@
         }
     }
 }
-

=== modified file 'rockwork/NotificationsPage.qml'
--- rockwork/NotificationsPage.qml	2015-12-16 23:25:28 +0000
+++ rockwork/NotificationsPage.qml	2015-12-25 04:59:18 +0000
@@ -4,20 +4,26 @@
 import RockWork 1.0
 
 Page {
-    title: "Notifications"
+    title: i18n.tr("Notifications")
 
     ColumnLayout {
         anchors.fill: parent
         anchors.topMargin: units.gu(1)
+
         Item {
             Layout.fillWidth: true
             implicitHeight: infoLabel.height
 
             Label {
                 id: infoLabel
-                anchors { left: parent.left; right: parent.right; margins: units.gu(1) }
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(1)
+                }
+
                 wrapMode: Text.WordWrap
-                text: "Entries here will appear as notifications keep coming. Selected notifications will be shown on your Pebble."
+                text: i18n.tr("Entries here will appear as notifications keep coming. Selected notifications will be shown on your Pebble smartwatch.")
             }
         }
 
@@ -29,18 +35,20 @@
             model: NotificationSourceModel {
                 id: notificationSourceModel
             }
+
             delegate: ListItem {
                 RowLayout {
                     anchors.fill: parent
                     anchors.margins: units.gu(1)
+
                     Label {
                         text: model.name
                         Layout.fillWidth: true
                     }
+
                     Switch {
                         checked: model.enabled
                         onCheckedChanged: {
-                            print("new checked", checked)
                             notificationSourceModel.setEnabled(index, checked)
                         }
                     }
@@ -48,6 +56,4 @@
             }
         }
     }
-
 }
-

=== modified file 'rockwork/PebblesPage.qml'
--- rockwork/PebblesPage.qml	2015-12-21 03:46:24 +0000
+++ rockwork/PebblesPage.qml	2015-12-25 04:59:18 +0000
@@ -3,7 +3,7 @@
 import Ubuntu.Components 1.3
 
 Page {
-    title: "Manage watches"
+    title: i18n.tr("Manage Pebble Watches")
 
     head {
         actions: [
@@ -23,18 +23,22 @@
             RowLayout {
                 anchors.fill: parent
                 anchors.margins: units.gu(1)
+
                 ColumnLayout {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
+
                     Label {
                         text: model.name
                     }
+
                     Label {
-                        text: model.connected ? "Connected" : "Disconnected"
+                        text: model.connected ? i18n.tr("Connected") : i18n.tr("Disconnected")
                         fontSize: "small"
                     }
                 }
             }
+
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("MainMenuPage.qml"), {pebble: pebbles.get(index)})
             }
@@ -46,18 +50,18 @@
         width: parent.width - units.gu(4)
         spacing: units.gu(4)
         visible: pebbles.count === 0
+
         Label {
-            text: "No Pebble set up yet. Please connect your Pebble watch using the system settings app."
+            text: i18n.tr("No Pebble smartwatches configured yet. Please connect your Pebble watch using the system settings.")
             fontSize: "large"
             width: parent.width
             wrapMode: Text.WordWrap
         }
+
         Button {
-            text: "Open system settings"
+            text: i18n.tr("Open system settings")
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: Qt.openUrlExternally("settings://system/bluetooth")
         }
     }
-
 }
-

=== modified file 'rockwork/pebbles.cpp'
--- rockwork/pebbles.cpp	2015-12-16 23:25:28 +0000
+++ rockwork/pebbles.cpp	2015-12-25 04:59:18 +0000
@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <QDBusArgument>
 #include <QDBusServiceWatcher>
+#include <algorithm>
 
 #define ROCKWORK_SERVICE QStringLiteral("org.rockwork")
 #define ROCKWORK_MANAGER_PATH QStringLiteral("/org/rockwork/Manager")
@@ -118,10 +119,25 @@
             endInsertRows();
             emit countChanged();
         }
+
+        std::sort(m_pebbles.begin(), m_pebbles.end(), Pebbles::sortPebbles);
     }
     arg.endArray();
 }
 
+bool Pebbles::sortPebbles(Pebble *a, Pebble *b)
+{
+    if (a->connected() && !b->connected()) {
+        return true;
+    }
+    else if (!a->connected() && b->connected()) {
+        return false;
+    }
+    else {
+        return a->name() < b->name();
+    }
+}
+
 void Pebbles::pebbleConnectedChanged()
 {
     Pebble *pebble = static_cast<Pebble*>(sender());
@@ -137,4 +153,3 @@
     }
     return -1;
 }
-

=== modified file 'rockwork/pebbles.h'
--- rockwork/pebbles.h	2015-12-21 03:46:24 +0000
+++ rockwork/pebbles.h	2015-12-25 04:59:18 +0000
@@ -45,6 +45,7 @@
 
 private:
     int find(const QDBusObjectPath &path) const;
+    static bool sortPebbles(Pebble *a, Pebble *b);
 
 private:
     QDBusInterface *m_iface;