Merge lp:~nik90/ubuntu-clock-app/dynamic-delete-alarm-size into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Removed the hardcoded size of the delete alarm button.

Removed the hardcoded size of the delete alarm button.

Note: width and height now depend on the label size. I looked at ButtonStyle.qml used by the SDK and noticed that it also set an implicit height of 4 gu units which matches clock app design spec. So removed the height definition as well.

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

PASSED: Continuous integration, rev:151
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/565/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/952
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/952/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/565/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good, thanks! (the pot update doesn't seem useful though, or do you have a rule to update it with every commit?)

review: Approve

[Nekhelesh Ramananthan (nik90)]

Thnx for the review. The pot file update seems to be done whenever I run on the device through qtc. I will fix the cmakelist in another to not do that in the future.

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-10-11 18:56:01 +0000
+++ app/alarm/EditAlarmPage.qml	2014-10-15 09:57:12 +0000
@@ -331,9 +331,6 @@
             horizontalCenter: parent.horizontalCenter
         }
 
-        width: units.gu(17)
-        height: units.gu(4)
-
         visible: !isNewAlarm
 
         color: "Red"

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-14 13:48:02 +0000
+++ debian/changelog	2014-10-15 09:57:12 +0000
@@ -17,6 +17,8 @@
   * Added world clock feature qml tests
   * Delayed loading of xmltimezone model until add world city page is loaded and
     dynamically load/unload the jsontimezone model only when necessary.
+  * Removed hardcoded delete alarm button size and let it adapt to the label size
+    dynamically (LP: #1381429)
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-10-11 18:33:17 +0000
+++ po/com.ubuntu.clock.pot	2014-10-15 09:57:12 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-10 16:52+0200\n"
+"POT-Creation-Date: 2014-10-15 11:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,45 +18,45 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
-#: ../app/alarm/EditAlarmPage.qml:299
+#: ../app/alarm/EditAlarmPage.qml:303
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:110
+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:108
 #: ../app/worldclock/UserWorldCityList.qml:101
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:28
+#: ../app/alarm/AlarmPage.qml:26
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:45 ../app/alarm/EditAlarmPage.qml:46
-#: ../app/alarm/EditAlarmPage.qml:173
+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
+#: ../app/alarm/EditAlarmPage.qml:177
 msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:60 ../app/worldclock/WorldCityList.qml:68
+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:79
 msgid "Back"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:81
+#: ../app/alarm/AlarmPage.qml:78
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:83 ../app/alarm/AlarmRepeat.qml:35
+#: ../app/alarm/AlarmPage.qml:80 ../app/alarm/AlarmRepeat.qml:35
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:140
+#: ../app/alarm/AlarmPage.qml:138
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:141
+#: ../app/alarm/AlarmPage.qml:139
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:289
+#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:293
 msgid "Repeat"
 msgstr ""
 
@@ -94,7 +94,7 @@
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:312
+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:316
 msgid "Sound"
 msgstr ""
 
@@ -142,15 +142,15 @@
 msgid "in %1m"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:39
+#: ../app/alarm/EditAlarmPage.qml:43
 msgid "New alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:39
+#: ../app/alarm/EditAlarmPage.qml:43
 msgid "Edit alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:336
+#: ../app/alarm/EditAlarmPage.qml:337
 msgid "Delete alarm"
 msgstr ""
 
@@ -163,7 +163,7 @@
 msgstr ""
 
 #: ../app/worldclock/AddWorldCityButton.qml:61
-#: ../app/worldclock/WorldCityList.qml:54
+#: ../app/worldclock/WorldCityList.qml:64
 msgid "City"
 msgstr ""
 
@@ -203,27 +203,27 @@
 msgid "Same time"
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:41
+#: ../app/worldclock/WorldCityList.qml:51
 msgid "Select a city"
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:82
+#: ../app/worldclock/WorldCityList.qml:94
 msgid "Search..."
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:159
+#: ../app/worldclock/WorldCityList.qml:205
 msgid "Searching for a city"
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:164
+#: ../app/worldclock/WorldCityList.qml:210
 msgid "No City Found"
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:170
+#: ../app/worldclock/WorldCityList.qml:216
 msgid "Unable to connect."
 msgstr ""
 
-#: ../app/worldclock/WorldCityList.qml:171
+#: ../app/worldclock/WorldCityList.qml:217
 msgid "Please check your network connection and try again"
 msgstr ""