Merge lp:~nik90/podbird/dev-renable-theme into lp:podbird/devel

[Nekhelesh Ramananthan]

Re-enabling theming and also remove deprecated ListItem.SingleValue listitem.

Re-enabling theming and also remove deprecated ListItem.SingleValue listitem.

=== modified file 'app/components/HeaderListItem.qml'
--- app/components/HeaderListItem.qml	2015-05-07 11:29:06 +0000
+++ app/components/HeaderListItem.qml	2015-06-19 21:41:08 +0000
@@ -1,4 +1,22 @@
-import QtQuick 2.3
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird 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.
+ *
+ * Podbird 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/>.
+ */
+
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 
 ListItem {
@@ -7,11 +25,10 @@
     property alias title: headerText.text
 
     height: headerText.implicitHeight + units.gu(1)
+
     Label {
         id: headerText
-        anchors.left: parent.left
-        anchors.leftMargin: units.gu(2)
-        anchors.verticalCenter: parent.verticalCenter
+        anchors { left: parent.left; leftMargin: units.gu(2); verticalCenter: parent.verticalCenter }
         font.weight: Font.DemiBold
     }
 }

=== added file 'app/components/SingleValueListItem.qml'
--- app/components/SingleValueListItem.qml	1970-01-01 00:00:00 +0000
+++ app/components/SingleValueListItem.qml	2015-06-19 21:41:08 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird 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.
+ *
+ * Podbird 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/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+
+ListItem {
+    id: customListItem
+
+    property alias text: _title.text
+    property alias value: _value.text
+
+    RowLayout {
+        spacing: units.gu(1)
+        anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
+
+        Label {
+            id: _title
+            Layout.fillWidth: true
+        }
+
+        Label {
+            id: _value
+            elide: Text.ElideMiddle
+            horizontalAlignment: Text.AlignRight
+            Layout.maximumWidth: parent.width - _title.implicitWidth - _progression.width - units.gu(2)
+        }
+
+        Icon {
+            id: _progression
+            name: "go-next"
+            width: units.gu(2)
+            height: width
+        }
+    }
+}

=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml	2015-05-07 11:29:06 +0000
+++ app/components/SubtitledListItem.qml	2015-06-19 21:41:08 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 
 ListItem {
@@ -45,7 +45,7 @@
             width: parent.width
             wrapMode: Text.WordWrap
         }
-        
+
         Label {
             id: _subtitle
             fontSize: "small"

=== modified file 'app/settings/ThemeSetting.qml'
--- app/settings/ThemeSetting.qml	2015-05-07 11:29:06 +0000
+++ app/settings/ThemeSetting.qml	2015-06-19 21:41:08 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import "../components"
 
 Page {
@@ -26,6 +27,28 @@
     visible: false
     title: i18n.tr("Theme")
 
+    /*
+     Note (nik90): After the upgrade to Ubuntu.Components 1.2, dynamic application theme switching is broken. This
+     has been reported upstream at http://pad.lv/1462690. Until this is fixed, users will have to restart the app
+     when switching application theme. This dialog explains that to the user.
+    */
+    Component {
+        id: rebootAppDialog
+        Dialog {
+            id: dialogInternal
+            title: i18n.tr("Restart %1").arg("Podbird")
+            text: i18n.tr("You will need to restart %1 to change the application theme. \
+    This is necessary to avoid any strange behaviour in the app. We apologize for the inconvenience").arg("Podbird")
+            Button {
+                text: i18n.tr("Exit App")
+                color: podbird.appTheme.positiveActionButton
+                onClicked: {
+                    Qt.quit()
+                }
+            }
+        }
+    }
+
     ListModel {
         id: themeModel
         Component.onCompleted: initialize()
@@ -56,9 +79,8 @@
             divider.visible: true
 
             onClicked: {
-                var themeElement = model.file
-                podbird.settings.themeName = themeElement
-                podbird.appThemeManager.source = themeElement
+                podbird.settings.themeName = model.file
+                PopupUtils.open(rebootAppDialog, themeSettingPage);
             }
 
             Icon {

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-05-12 22:09:49 +0000
+++ app/ui/SettingsPage.qml	2015-06-19 21:41:08 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItems
 import "../components"
 
 Page {
@@ -131,29 +130,26 @@
                 onClicked: podbird.settings.showListView = !podbird.settings.showListView
             }
 
-//            ListItems.SingleValue {
-//                progression: true
-//                showDivider: false
-//                text: i18n.tr("Theme")
-//                value: podbird.settings.themeName.split(".qml")[0] === "Light" ? i18n.tr("Light") : i18n.tr("Dark")
-//                onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
-//            }
+            SingleValueListItem {
+                divider.visible: false
+                text: i18n.tr("Theme")
+                value: podbird.settings.themeName.split(".qml")[0] === "Light" ? i18n.tr("Light") : i18n.tr("Dark")
+                onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
+            }
 
             HeaderListItem {
                 title: i18n.tr("Playback Settings")
             }
 
-            ListItems.SingleValue {
-                progression: true
-                showDivider: false
+            SingleValueListItem {
+                divider.visible: false
                 text: i18n.tr("Skip Forward")
                 value: i18n.tr("%1 seconds").arg(podbird.settings.skipForward)
                 onClicked: PopupUtils.open(skipForwardDialog, settingsPage);
             }
 
-            ListItems.SingleValue {
-                progression: true
-                showDivider: false
+            SingleValueListItem {
+                divider.visible: false
                 text: i18n.tr("Skip Back")
                 value: i18n.tr("%1 seconds").arg(podbird.settings.skipBack)
                 onClicked: PopupUtils.open(skipBackDialog, settingsPage);