← Back to branch summary

~mefrio-g/ubuntu-clock-app/fix-1272470

« back to all changes in this revision

Viewing changes to alarm/AlarmPage.qml

  • Committer: Tarmac
  • Author(s): Nekhelesh Ramananthan
  • Date: 2014-01-13 12:23:30 UTC
  • mfrom: (287.1.10 settings-page)
  • Revision ID: tarmac-20140113122330-8hlcpf8ow5p3yb5t
- Add settings page to expose the setting to switch between 12/24 hour format
- Used u1db to store these settings
- Clock and Alarms Page respect these settings. Fixes: https://bugs.launchpad.net/bugs/1268158.

Approved by Ubuntu Phone Apps Jenkins Bot, Riccardo Padovani.

Show diffs side-by-side

added added

removed removed

Lines of Context:
alarm/AlarmPage.qml
175
175
                        id: alarmTime
176
176
                        objectName: "listAlarmTime"
177
177
                        fontSize: "large";
178
 
                        text: Qt.formatDateTime(date, "hh:mm")
 
178
                        text: Utils.convertTime(date.getHours(), date.getMinutes(), 0, appSetting.contents.timeFormat)
179
179
                        anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(1) }
180
180
                        color: Theme.palette.normal.baseText
181
181
                    }
228
228
    tools: ToolbarItems {
229
229
        id: toolbarAlarm
230
230
 
231
 
        opened: false;
232
 
        locked: false;
 
231
        ToolbarButton {
 
232
            id: settings
 
233
            action: appSettingsAction
 
234
        }
233
235
 
234
236
        ToolbarButton {
235
237
            id: addPresetToolbarButton