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

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.

files added:
common/SettingsPage.qml

images/settings@32.svg

files modified:
alarm/AlarmFace.qml

alarm/AlarmPage.qml

clock/ClockPage.qml

clock/EasterEgg.qml

common/ClockUtils.js

debian/control

ubuntu-clock-app.qml

Show diffs side-by-side

added added

removed removed

alarm/AlarmFace.qml

id: alarmFace

property alias showSetupMessage: setupMessage.visible

property bool isMilitaryFormat: appSetting.contents.timeFormat === "12-hour" ? false : true

showSecondHand: false

onMinutesChanged: innerLabel.text = Utils.zeroleft(Utils.hourstoCirclePosition(hours), 2) + ":" + Utils.zeroleft(minutes, 2)

onHoursChanged: innerLabel.text = Utils.zeroleft(Utils.hourstoCirclePosition(hours), 2) + ":" + Utils.zeroleft(minutes, 2)

onMinutesChanged: innerLabel.text = Utils.convertTime(Utils.hourstoCirclePosition(hours), minutes, 0, appSetting.contents.timeFormat)

onHoursChanged: innerLabel.text = Utils.convertTime(Utils.hourstoCirclePosition(hours), minutes, 0, appSetting.contents.timeFormat)

onIsMilitaryFormatChanged: innerLabel.text = Utils.convertTime(Utils.hourstoCirclePosition(hours), minutes, 0, appSetting.contents.timeFormat)

innerLabel.visible: !setupMessage.visible

innerLabel.text: Utils.zeroleft(Utils.hourstoCirclePosition(hours), 2) + ":" + Utils.zeroleft(minutes, 2)

innerLabel.font.pixelSize: !isMilitaryFormat ? units.dp(31): units.dp(41)

innerLabel.text: Utils.convertTime(Utils.hourstoCirclePosition(hours), minutes, 0, appSetting.contents.timeFormat)

Label {

id: setupMessage

Older »