Merge lp:~nik90/ubuntu-clock-app/fix-disapearing-text into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan on 2013-10-18
Status: Merged
Approved by: Nekhelesh Ramananthan on 2013-10-18
Approved revision: 245
Merged at revision: 243
Proposed branch: lp:~nik90/ubuntu-clock-app/fix-disapearing-text
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 49 lines (+10/-7)
1 file modified
alarm/AddAlarmPage.qml (+10/-7)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/fix-disapearing-text
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-10-18
Ubuntu Clock Developers 2013-10-18 Pending
Review via email: mp+191773@code.launchpad.net

Commit message

Fixes the issue of the add alarm page being broken due to upstream SDK rev 796.

Description of the change

Due to upstream change, the add alarms page broke. This has been fixed in this MP.

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

Reverted the disappearing alarm day fix since it turns out it is an upstream SDK bug involving optionSelector.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'alarm/AddAlarmPage.qml'
2--- alarm/AddAlarmPage.qml 2013-10-05 09:43:45 +0000
3+++ alarm/AddAlarmPage.qml 2013-10-18 10:39:28 +0000
4@@ -25,6 +25,15 @@
5 import "../common"
6
7 // Page to edit or create a new alarm
8+/*
9+ Parameters passed:
10+
11+ Variable to check if the page is for creating a new alarm or editing an existing one
12+ bool isNewAlarm
13+
14+ Variable to hold the index of the alarm which is being edited. If page is called for creating a new alarm, this variable will not be available
15+ int alarmIndex
16+ */
17 Page {
18 id: addAlarmPage
19
20@@ -59,10 +68,6 @@
21 }
22 }
23
24- actions: [
25-
26- ]
27-
28 // Function to save a new alarm
29 function saveNewAlarm() {
30 var alarmTime = new Date();
31@@ -238,9 +243,8 @@
32 OptionSelector {
33 id: occurSelector
34 text: i18n.tr("Occurs")
35- visible: repeatSelector.selectedIndex == 0
36+ visible: repeatSelector.selectedIndex == 0 // Show the day selector only when the alarm is a one-type alarm
37 model: [Qt.locale().standaloneDayName(0), Qt.locale().standaloneDayName(1), Qt.locale().standaloneDayName(2), Qt.locale().standaloneDayName(3), Qt.locale().standaloneDayName(4), Qt.locale().standaloneDayName(5), Qt.locale().standaloneDayName(6)]
38- expanded: false
39
40 selectedIndex: alarm.date.getDay();
41
42@@ -296,7 +300,6 @@
43 id: repeatSelector
44 text: i18n.tr("Repeats")
45 model: [i18n.tr("One Time"), i18n.tr("Daily"), i18n.tr("Weekly")]
46- expanded: false
47
48 selectedIndex: {
49 if (alarm.type == Alarm.OneTime)

Subscribers

People subscribed via source and target branches