← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~nik90/ubuntu-clock-app/improved-bottomedge-header into lp:ubuntu-clock-app

 

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/improved-bottomedge-header into lp:ubuntu-clock-app.

Commit message:
Improves the bottom edge header by showing the back button chevron pointing downwards as suggested by design.

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/improved-bottomedge-header/+merge/256129

Improves the bottom edge header by showing the back button chevron pointing downwards as suggested by design.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/improved-bottomedge-header into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2015-03-05 12:54:28 +0000
+++ app/alarm/AlarmPage.qml	2015-04-14 11:59:36 +0000
@@ -36,6 +36,14 @@
             head: alarmPage.head
             when: !alarmListView.isInSelectionMode
 
+            backAction: Action {
+                iconName: "down"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    pageStack.pop()
+                }
+            }
+
             actions: [
                 Action {
                     objectName: "addAlarmAction"

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-06 13:34:43 +0000
+++ debian/changelog	2015-04-14 11:59:36 +0000
@@ -15,6 +15,7 @@
   * Renabled create alarm tests on device which were disabled due to upstream bug
     in autopilot. (LP: #1426108)
   * Fixed timezone difference label overflowing into the clock (LP: #1440732)
+  * Improved bottom edge header by correcting the direction of the chevron (LP: #1432696)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-04-06 13:33:55 +0000
+++ po/com.ubuntu.clock.pot	2015-04-14 11:59:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-06 15:32+0200\n"
+"POT-Creation-Date: 2015-04-14 13:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -23,7 +23,7 @@
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:125
 #: ../app/worldclock/UserWorldCityList.qml:101
 msgid "Delete"
 msgstr ""
@@ -32,28 +32,29 @@
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:44
+#: ../app/alarm/AlarmPage.qml:41 ../app/alarm/AlarmPage.qml:66
+#: ../app/worldclock/WorldCityList.qml:80
+msgid "Back"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:44
 #: ../app/alarm/EditAlarmPage.qml:166
 msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
-msgid "Back"
-msgstr ""
-
-#: ../app/alarm/AlarmPage.qml:87
+#: ../app/alarm/AlarmPage.qml:95
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
+#: ../app/alarm/AlarmPage.qml:97 ../app/alarm/AlarmRepeat.qml:38
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:154
+#: ../app/alarm/AlarmPage.qml:162
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:155
+#: ../app/alarm/AlarmPage.qml:163
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 


Follow ups