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

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.
80. By Nekhelesh Ramananthan

Updated changelog entry

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
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
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2014-08-26 20:20:37 +0000
+++ app/clock/ClockPage.qml 2014-09-04 16:24:34 +0000
@@ -73,7 +73,7 @@
73 mainStack.push(Qt.resolvedUrl("../alarm/AlarmSettingsPage.qml"))73 mainStack.push(Qt.resolvedUrl("../alarm/AlarmSettingsPage.qml"))
74 }74 }
7575
76 width: units.gu(3)76 width: units.gu(5)
77 height: width77 height: width
78 opacity: 078 opacity: 0
7979
@@ -84,8 +84,16 @@
84 rightMargin: units.gu(2)84 rightMargin: units.gu(2)
85 }85 }
8686
87 Rectangle {
88 visible: settingsIcon.pressed
89 anchors.fill: parent
90 color: Theme.palette.selected.background
91 }
92
87 Icon {93 Icon {
88 anchors.fill: parent94 width: units.gu(3)
95 height: width
96 anchors.centerIn: parent
89 name: "settings"97 name: "settings"
90 color: "Grey"98 color: "Grey"
91 }99 }
92100
=== modified file 'debian/changelog'
--- debian/changelog 2014-09-03 22:36:07 +0000
+++ debian/changelog 2014-09-04 16:24:34 +0000
@@ -23,6 +23,7 @@
23 next alarm when enabling an alarm.23 next alarm when enabling an alarm.
24 * Enabled one-time alarms in the UI (LP: #1358320)24 * Enabled one-time alarms in the UI (LP: #1358320)
25 * Fixed the transition animation to alarms to be more smoother (LP: #1362081)25 * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
26 * Added pressed visual state to the settings button (LP: #1364553)
2627
27 [Zsombor Egri]28 [Zsombor Egri]
28 * Fixed alarm status toggle being reverted immediately (LP: #1272337)29 * Fixed alarm status toggle being reverted immediately (LP: #1272337)

Subscribers

People subscribed via source and target branches