Merge lp:~fboucault/unity-2d/stateful_shortcuts_2 into lp:unity-2d/3.0

Proposed by Florian Boucault
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 567
Merged at revision: 567
Proposed branch: lp:~fboucault/unity-2d/stateful_shortcuts_2
Merge into: lp:unity-2d/3.0
Diff against target: 25 lines (+2/-3)
2 files modified
places/Home.qml (+2/-2)
places/dash.qml (+0/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/stateful_shortcuts_2
Reviewer Review Type Date Requested Status
Olivier Tilloy Approve
Review via email: mp+61548@code.launchpad.net

This proposal supersedes a proposal from 2011-05-11.

Description of the change

[dash] Shortcuts expanded state are now persistent.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote : Posted in a previous version of this proposal

This merge request contains a revision that is irrelevant (also submitted as https://code.launchpad.net/~fboucault/unity-2d/improve_launcher_smoothness/+merge/60605), please extract the relevant revision and resubmit.

review: Needs Resubmitting
Revision history for this message
Olivier Tilloy (osomon) wrote : Posted in a previous version of this proposal

I reviewed the relevant revision (562), and it works as expected and fixes bug #774437.

One tiny remark, could you please update the comment before the declaration of the shortcutsActive property?

    /* Set to true if shortcut buttons are visible */
    - property bool shortcutsActive: false
    + property bool shortcutsActive: true

Since the default value changed from false to true, I’d change the comment to something like "Set to false to hide the shortcuts buttons".

Once this is addressed and the other irrelevant revision is separated, it’s good to merge.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

Good to go now!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'places/Home.qml'
2--- places/Home.qml 2011-04-11 09:23:01 +0000
3+++ places/Home.qml 2011-05-19 12:07:52 +0000
4@@ -49,8 +49,8 @@
5 }
6 }
7
8- /* Set to true if shortcut buttons are visible */
9- property bool shortcutsActive: false
10+ /* Set to false to hide the shortcuts buttons */
11+ property bool shortcutsActive: true
12
13 /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */
14 property bool globalSearchActive: model.entrySearchQuery != ""
15
16=== modified file 'places/dash.qml'
17--- places/dash.qml 2011-04-08 11:15:39 +0000
18+++ places/dash.qml 2011-05-19 12:07:52 +0000
19@@ -75,7 +75,6 @@
20 /* Take advantage of the fact that the loaded qml is local and setting
21 the source loads it immediately making pageLoader.item valid */
22 activatePage(pageLoader.item)
23- pageLoader.item.shortcutsActive = true
24 dashView.activePlaceEntry = ""
25 }
26

Subscribers

People subscribed via source and target branches