Merge lp:~kissiel/checkbox/fix-1446986 into lp:checkbox

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3728
Merged at revision: 3731
Proposed branch: lp:~kissiel/checkbox/fix-1446986
Merge into: lp:checkbox
Diff against target: 41 lines (+2/-12)
1 file modified
checkbox-touch/components/SelectionPage.qml (+2/-12)
To merge this branch: bzr merge lp:~kissiel/checkbox/fix-1446986
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+257613@code.launchpad.net

Description of the change

This patch removes (redundant) header action that confirmed selection and moved
to next screen. 'Continue' button at the bottom of the screen has the same
behaviour, so this is now the way to go.

12c2a92 checkbox-touch: remove 'continue' header action

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-touch/components/SelectionPage.qml'
2--- checkbox-touch/components/SelectionPage.qml 2015-04-27 15:58:20 +0000
3+++ checkbox-touch/components/SelectionPage.qml 2015-04-28 07:20:11 +0000
4@@ -69,15 +69,6 @@
5 head {
6 actions: [
7 Action {
8- id: continueAction
9- objectName: "continueAction"
10- iconName: "media-playback-start"
11- text: continueText
12- onTriggered: {
13- if (!continueButton.isLatched) gatherSelection();
14- }
15- },
16- Action {
17 id: selectAllAction
18 objectName: "selectAllAction"
19 iconName: "select"
20@@ -109,11 +100,11 @@
21 states: [
22 State {
23 name: "empty selection"
24- PropertyChanges { target: continueAction; enabled: false }
25+ PropertyChanges { target: continueButton; enabled: false }
26 },
27 State {
28 name: "nonempty selection"
29- PropertyChanges { target: continueAction; enabled: true }
30+ PropertyChanges { target: continueButton; enabled: true }
31 }
32 ]
33
34@@ -198,7 +189,6 @@
35 id: continueButton
36 objectName: "continueButton"
37 Layout.fillWidth: true
38- enabled: continueAction.enabled
39 text: continueText
40 unlatchedColor: UbuntuColors.green
41 onLatchedClicked: gatherSelection()

Subscribers

People subscribed via source and target branches