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

[Nekhelesh Ramananthan]

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

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

[Nekhelesh Ramananthan (nik90)]

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

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

PASSED: Continuous integration, rev:245
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/76/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1160
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/76

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

review: Approve (continuous-integration)

=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml	2013-10-05 09:43:45 +0000
+++ alarm/AddAlarmPage.qml	2013-10-18 10:39:28 +0000
@@ -25,6 +25,15 @@
 import "../common"
 
 // Page to edit or create a new alarm
+/*
+  Parameters passed:
+
+  Variable to check if the page is for creating a new alarm or editing an existing one
+  bool isNewAlarm
+
+  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
+  int alarmIndex
+  */
 Page {
     id: addAlarmPage
 
@@ -59,10 +68,6 @@
         }
     }
 
-    actions: [
-
-    ]
-
     // Function to save a new alarm
     function saveNewAlarm() {
         var alarmTime = new Date();
@@ -238,9 +243,8 @@
                 OptionSelector {
                     id: occurSelector
                     text: i18n.tr("Occurs")
-                    visible: repeatSelector.selectedIndex == 0
+                    visible: repeatSelector.selectedIndex == 0  // Show the day selector only when the alarm is a one-type alarm
                     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)]
-                    expanded: false
 
                     selectedIndex: alarm.date.getDay();
 
@@ -296,7 +300,6 @@
                     id: repeatSelector
                     text: i18n.tr("Repeats")
                     model: [i18n.tr("One Time"), i18n.tr("Daily"), i18n.tr("Weekly")]
-                    expanded: false
 
                     selectedIndex: {
                         if (alarm.type == Alarm.OneTime)