Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/add-settings-press-state into lp:ubuntu-clock-app

  1. add-settings-press-state
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 80
Merged at revision: 78
Proposed branch: lp:~nik90/ubuntu-clock-app/add-settings-press-state
Merge into: lp:ubuntu-clock-app
Diff against target: 42 lines (+11/-2)
2 files modified
app/clock/ClockPage.qml (+10/-2)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/add-settings-press-state
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+233390@code.launchpad.net

Commit message

Added pressed state for the settings button.

Description of the change

Added pressed state for the settings button.

To post a comment you must log in.
lp:~nik90/ubuntu-clock-app/add-settings-press-state updated
80. By Nekhelesh Ramananthan

Updated changelog entry

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:80
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/441/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/166
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/88

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

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/clock/ClockPage.qml'
2--- app/clock/ClockPage.qml 2014-08-26 20:20:37 +0000
3+++ app/clock/ClockPage.qml 2014-09-04 16:24:34 +0000
4@@ -73,7 +73,7 @@
5 mainStack.push(Qt.resolvedUrl("../alarm/AlarmSettingsPage.qml"))
6 }
7
8- width: units.gu(3)
9+ width: units.gu(5)
10 height: width
11 opacity: 0
12
13@@ -84,8 +84,16 @@
14 rightMargin: units.gu(2)
15 }
16
17+ Rectangle {
18+ visible: settingsIcon.pressed
19+ anchors.fill: parent
20+ color: Theme.palette.selected.background
21+ }
22+
23 Icon {
24- anchors.fill: parent
25+ width: units.gu(3)
26+ height: width
27+ anchors.centerIn: parent
28 name: "settings"
29 color: "Grey"
30 }
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2014-09-03 22:36:07 +0000
34+++ debian/changelog 2014-09-04 16:24:34 +0000
35@@ -23,6 +23,7 @@
36 next alarm when enabling an alarm.
37 * Enabled one-time alarms in the UI (LP: #1358320)
38 * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
39+ * Added pressed visual state to the settings button (LP: #1364553)
40
41 [Zsombor Egri]
42 * Fixed alarm status toggle being reverted immediately (LP: #1272337)

Subscribers

People subscribed via source and target branches