Merge lp:~3v1n0/compiz/scale-all-wp-key into lp:compiz/0.9.11

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3836
Merged at revision: 3837
Proposed branch: lp:~3v1n0/compiz/scale-all-wp-key
Merge into: lp:compiz/0.9.11
Diff against target: 25 lines (+11/-3)
1 file modified
debian/patches/ubuntu-config.patch (+11/-3)
To merge this branch: bzr merge lp:~3v1n0/compiz/scale-all-wp-key
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209325@code.launchpad.net

Commit message

debian/patches/ubuntu-config.patch: use Super+Shift+W for initiating scale for all workspaces

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/ubuntu-config.patch'
2--- debian/patches/ubuntu-config.patch 2014-02-18 01:53:40 +0000
3+++ debian/patches/ubuntu-config.patch 2014-03-04 18:31:06 +0000
4@@ -418,10 +418,18 @@
5 </option>
6 <option name="initiate_button" type="button">
7 <_short>Initiate Window Picker</_short>
8-Index: scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in
9+@@ -161,6 +158,7 @@
10+ <option name="initiate_all_key" type="key">
11+ <_short>Initiate Window Picker For All Windows</_short>
12+ <_long>Layout and start transforming all windows</_long>
13++ <default>&lt;Super&gt;&lt;Shift&gt;w</default>
14+ </option>
15+ <option name="initiate_group_edge" type="edge">
16+ <_short>Initiate Window Picker For Window Group</_short>
17+Index: compiz/plugins/staticswitcher/staticswitcher.xml.in
18 ===================================================================
19---- scale-xy-offsets.orig/plugins/staticswitcher/staticswitcher.xml.in 2014-02-17 21:25:57.420121366 +0100
20-+++ scale-xy-offsets/plugins/staticswitcher/staticswitcher.xml.in 2014-02-17 21:25:57.412121402 +0100
21+--- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2014-03-04 19:11:33.195668835 +0100
22++++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2014-03-04 19:11:33.187668855 +0100
23 @@ -11,7 +11,6 @@
24 <relation type="after">
25 <plugin>composite</plugin>

Subscribers

People subscribed via source and target branches