ubuntu-touch-coreapps-reviewers team mailing list archive

[Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>]

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-weather-app/0-fix-broken-settings-links into lp:ubuntu-weather-app/reboot.

Commit message:
Fxied the broken settings page links and also renamed Settings folder to settings to maintain consistency.

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-weather-app/0-fix-broken-settings-links/+merge/252112

This MP fixes the broken settings page links and also renames Settings folder to settings to maintain consistency.
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~nik90/ubuntu-weather-app/0-fix-broken-settings-links into lp:ubuntu-weather-app/reboot.

=== modified file 'app/ui/CMakeLists.txt'
--- app/ui/CMakeLists.txt	2015-02-09 19:49:06 +0000
+++ app/ui/CMakeLists.txt	2015-03-06 13:42:03 +0000
@@ -1,4 +1,4 @@
-add_subdirectory(Settings)
+add_subdirectory(settings)
 
 file(GLOB UI_QML_JS_FILES *.qml *.js)
 

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-02-09 19:49:06 +0000
+++ app/ui/SettingsPage.qml	2015-03-06 13:42:03 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
-
 Page {
     title: i18n.tr("Settings")
 
@@ -41,21 +40,21 @@
                 progression: true
                 text: i18n.tr("Units")
 
-                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/UnitsPage.qml"))
+                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
             }
 
             ListItem.SingleValue {
                 progression: true
                 text: i18n.tr("Data Provider")
 
-                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/DataProviderPage.qml"))
+                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
             }
 
             ListItem.SingleValue {
                 progression: true
                 text: i18n.tr("Refresh Interval")
 
-                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/RefreshIntervalPage.qml"))
+                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
             }
         }
     }

=== renamed directory 'app/ui/Settings' => 'app/ui/settings'
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-03-03 18:46:47 +0000
+++ po/com.ubuntu.weather.pot	2015-03-06 13:42:03 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-03 18:45+0000\n"
+"POT-Creation-Date: 2015-03-06 14:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -65,46 +65,46 @@
 msgid "Locations"
 msgstr ""
 
-#: ../app/ui/Settings/DataProviderPage.qml:25 ../app/ui/SettingsPage.qml:49
+#: ../app/ui/SettingsPage.qml:25
+msgid "Settings"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:42 ../app/ui/settings/UnitsPage.qml:25
+msgid "Units"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:49 ../app/ui/settings/DataProviderPage.qml:25
 msgid "Data Provider"
 msgstr ""
 
-#: ../app/ui/Settings/DataProviderPage.qml:44
+#: ../app/ui/SettingsPage.qml:56 ../app/ui/settings/RefreshIntervalPage.qml:25
+msgid "Refresh Interval"
+msgstr ""
+
+#: ../app/ui/settings/DataProviderPage.qml:44
 msgid "Provider"
 msgstr ""
 
-#: ../app/ui/Settings/RefreshIntervalPage.qml:25 ../app/ui/SettingsPage.qml:56
-msgid "Refresh Interval"
-msgstr ""
-
-#: ../app/ui/Settings/RefreshIntervalPage.qml:42
+#: ../app/ui/settings/RefreshIntervalPage.qml:42
 msgid "minutes"
 msgstr ""
 
-#: ../app/ui/Settings/RefreshIntervalPage.qml:47
+#: ../app/ui/settings/RefreshIntervalPage.qml:47
 msgid "Interval"
 msgstr ""
 
-#: ../app/ui/Settings/UnitsPage.qml:25 ../app/ui/SettingsPage.qml:42
-msgid "Units"
-msgstr ""
-
-#: ../app/ui/Settings/UnitsPage.qml:44
+#: ../app/ui/settings/UnitsPage.qml:44
 msgid "Temperature"
 msgstr ""
 
-#: ../app/ui/Settings/UnitsPage.qml:56
+#: ../app/ui/settings/UnitsPage.qml:56
 msgid "Precipitation"
 msgstr ""
 
-#: ../app/ui/Settings/UnitsPage.qml:67
+#: ../app/ui/settings/UnitsPage.qml:67
 msgid "Wind Speed"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:25
-msgid "Settings"
-msgstr ""
-
 #: ubuntu-weather-app.desktop.in.in.h:1
 msgid "Weather"
 msgstr ""