Merge lp:~3v1n0/ubuntu/precise/compiz/scale-hotkeys-change into lp:ubuntu/precise/compiz

Proposed by Marco Trevisan (Treviño)
Status: Work in progress
Proposed branch: lp:~3v1n0/ubuntu/precise/compiz/scale-hotkeys-change
Merge into: lp:ubuntu/precise/compiz
Diff against target: 273 lines (+217/-1)
6 files modified
.pc/applied-patches (+1/-0)
.pc/fix-689733.patch/plugins/scale/scale.xml.in (+184/-0)
debian/changelog (+8/-0)
debian/patches/fix-689733.patch (+21/-0)
debian/patches/series (+1/-0)
plugins/scale/scale.xml.in (+2/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu/precise/compiz/scale-hotkeys-change
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Resubmitting
Ubuntu branches Pending
Review via email: mp+87797@code.launchpad.net

Description of the change

Resubmitting fix for bug #689733 also if that bug is related to launcher icon, actually it affects also the key bindings (also because it mentions the «'Current workspace' spread» that can only be activated using a key shortcut).

Also, according to the document "12.04 Unity shortcuts" http://is.gd/DAHfx0 the Ctrl+W keybinding should be used to scale only the windows in the current workspace.

I've also added the Ctrl+Shift+W keybinding to keep the feature to show all the available windows.

To post a comment you must log in.
256. By Marco Trevisan (Treviño)

Oops, committed bad change. Reverting it ;)

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Hey Marco! Can you please resubmit your patch against lp:compiz (which is the compiz packaging branch). It should be up to date for the incoming new compiz release.

I'm asking to resubmit against the right branch :)

review: Needs Resubmitting

Unmerged revisions

256. By Marco Trevisan (Treviño)

Oops, committed bad change. Reverting it ;)

255. By Marco Trevisan (Treviño)

debian/patches/fix-689733.patch:
 - Use Super+W to spread windows of the current workspace (LP: #689733)
 - Set Super+Shift+W to spread all the open windows

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2011-10-20 14:23:52 +0000
3+++ .pc/applied-patches 2012-01-06 18:52:25 +0000
4@@ -18,3 +18,4 @@
5 rev_2884_fix_874004.patch
6 rev_2890_fix_879253.patch
7 fix-886978.patch
8+fix-689733.patch
9
10=== added directory '.pc/fix-689733.patch'
11=== added file '.pc/fix-689733.patch/.timestamp'
12=== added directory '.pc/fix-689733.patch/plugins'
13=== added directory '.pc/fix-689733.patch/plugins/scale'
14=== added file '.pc/fix-689733.patch/plugins/scale/scale.xml.in'
15--- .pc/fix-689733.patch/plugins/scale/scale.xml.in 1970-01-01 00:00:00 +0000
16+++ .pc/fix-689733.patch/plugins/scale/scale.xml.in 2012-01-06 18:52:25 +0000
17@@ -0,0 +1,184 @@
18+<compiz>
19+ <plugin name="scale" useBcop="true">
20+ <_short>Scale</_short>
21+ <_long>Scale windows</_long>
22+ <category>Window Management</category>
23+ <deps>
24+ <requirement>
25+ <plugin>opengl</plugin>
26+ </requirement>
27+ <relation type="after">
28+ <plugin>fade</plugin>
29+ <plugin>decor</plugin>
30+ </relation>
31+ </deps>
32+ <options>
33+ <group>
34+ <_short>Appearance</_short>
35+ <option name="spacing" type="int">
36+ <_short>Spacing</_short>
37+ <_long>Space between windows</_long>
38+ <default>68</default>
39+ <min>0</min>
40+ <max>250</max>
41+ </option>
42+ <option name="speed" type="float">
43+ <_short>Speed</_short>
44+ <_long>Scale speed</_long>
45+ <default>2.4</default>
46+ <min>0.1</min>
47+ <max>50</max>
48+ <precision>0.1</precision>
49+ </option>
50+ <option name="timestep" type="float">
51+ <_short>Timestep</_short>
52+ <_long>Scale timestep</_long>
53+ <default>0.1</default>
54+ <min>0.1</min>
55+ <max>50</max>
56+ <precision>0.1</precision>
57+ </option>
58+ <option name="darken_back" type="bool">
59+ <_short>Darken Background</_short>
60+ <_long>Darken background when scaling windows</_long>
61+ <default>true</default>
62+ </option>
63+ <option name="opacity" type="int">
64+ <_short>Opacity</_short>
65+ <_long>Amount of opacity in percent</_long>
66+ <default>100</default>
67+ <min>0</min>
68+ <max>100</max>
69+ </option>
70+ <option name="overlay_icon" type="int">
71+ <_short>Overlay Icon</_short>
72+ <_long>Overlay an icon on windows once they are scaled</_long>
73+ <min>0</min>
74+ <max>2</max>
75+ <default>0</default>
76+ <desc>
77+ <value>0</value>
78+ <_name>None</_name>
79+ </desc>
80+ <desc>
81+ <value>1</value>
82+ <_name>Emblem</_name>
83+ </desc>
84+ <desc>
85+ <value>2</value>
86+ <_name>Big</_name>
87+ </desc>
88+ </option>
89+ </group>
90+ <group>
91+ <_short>Behaviour</_short>
92+ <option name="window_match" type="match">
93+ <_short>Scale Windows</_short>
94+ <_long>Windows that should be scaled in scale mode</_long>
95+ <default>Toolbar | Utility | Dialog | Normal | Unknown</default>
96+ </option>
97+ <option name="hover_time" type="int">
98+ <_short>Drag and Drop Hover Timeout</_short>
99+ <_long>Time (in ms) before scale mode is terminated when hovering over a window dragging and dropping an item</_long>
100+ <default>750</default>
101+ <min>50</min>
102+ <max>10000</max>
103+ </option>
104+ <option name="dnd_distance" type="int">
105+ <_short>Drag and Drop Distance</_short>
106+ <_long>The minimum distance (in px) beyond which the timeout is reset.</_long>
107+ <default>6</default>
108+ <min>0</min>
109+ <max>250</max>
110+ </option>
111+ <option name="multioutput_mode" type="int">
112+ <_short>Multi Output Mode</_short>
113+ <_long>Selects where windows are scaled if multiple output devices are used.</_long>
114+ <min>0</min>
115+ <max>1</max>
116+ <default>0</default>
117+ <desc>
118+ <value>0</value>
119+ <_name>On current output device</_name>
120+ </desc>
121+ <desc>
122+ <value>1</value>
123+ <_name>On all output devices</_name>
124+ </desc>
125+ </option>
126+ </group>
127+ <group>
128+ <_short>Bindings</_short>
129+ <option name="key_bindings_toggle" type="bool">
130+ <_short>Key Bindings Toggle Scale Mode</_short>
131+ <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
132+ <default>true</default>
133+ </option>
134+ <option name="button_bindings_toggle" type="bool">
135+ <_short>Button Bindings Toggle Scale Mode</_short>
136+ <_long>Button bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
137+ <default>false</default>
138+ </option>
139+ <option name="initiate_edge" type="edge">
140+ <_short>Initiate Window Picker</_short>
141+ <_long>Layout and start transforming windows</_long>
142+ <allowed edgednd="true"/>
143+ </option>
144+ <option name="initiate_key" type="key">
145+ <_short>Initiate Window Picker</_short>
146+ <_long>Layout and start transforming windows</_long>
147+ <default>&lt;Shift&gt;&lt;Alt&gt;Up</default>
148+ </option>
149+ <option name="initiate_button" type="button">
150+ <_short>Initiate Window Picker</_short>
151+ <_long>Layout and start transforming windows</_long>
152+ </option>
153+ <option name="initiate_all_edge" type="edge">
154+ <_short>Initiate Window Picker For All Windows</_short>
155+ <_long>Layout and start transforming all windows</_long>
156+ <allowed edgednd="true"/>
157+ </option>
158+ <option name="initiate_all_button" type="button">
159+ <_short>Initiate Window Picker For All Windows</_short>
160+ <_long>Layout and start transforming all windows</_long>
161+ </option>
162+ <option name="initiate_all_key" type="key">
163+ <_short>Initiate Window Picker For All Windows</_short>
164+ <_long>Layout and start transforming all windows</_long>
165+ <default>&lt;Super&gt;w</default>
166+ </option>
167+ <option name="initiate_group_edge" type="edge">
168+ <_short>Initiate Window Picker For Window Group</_short>
169+ <_long>Layout and start transforming window group</_long>
170+ <allowed edgednd="true"/>
171+ </option>
172+ <option name="initiate_group_button" type="button">
173+ <_short>Initiate Window Picker For Window Group</_short>
174+ <_long>Layout and start transforming window group</_long>
175+ </option>
176+ <option name="initiate_group_key" type="key">
177+ <_short>Initiate Window Picker For Window Group</_short>
178+ <_long>Layout and start transforming window group</_long>
179+ </option>
180+ <option name="initiate_output_edge" type="edge">
181+ <_short>Initiate Window Picker For Windows on Current Output</_short>
182+ <_long>Layout and start transforming windows on current output</_long>
183+ <allowed edgednd="true"/>
184+ </option>
185+ <option name="initiate_output_button" type="button">
186+ <_short>Initiate Window Picker For Windows on Current Output</_short>
187+ <_long>Layout and start transforming windows on current output</_long>
188+ </option>
189+ <option name="initiate_output_key" type="key">
190+ <_short>Initiate Window Picker For Windows on Current Output</_short>
191+ <_long>Layout and start transforming windows on current output</_long>
192+ </option>
193+ <option name="show_desktop" type="bool">
194+ <_short>Click Desktop to Show Desktop</_short>
195+ <_long>Enter Show Desktop mode when Desktop is clicked during Scale</_long>
196+ <default>false</default>
197+ </option>
198+ </group>
199+ </options>
200+ </plugin>
201+</compiz>
202
203=== modified file 'debian/changelog'
204--- debian/changelog 2011-12-04 22:21:08 +0000
205+++ debian/changelog 2012-01-06 18:52:25 +0000
206@@ -1,3 +1,11 @@
207+compiz (1:0.9.6+bzr20110929-0ubuntu9) UNRELEASED; urgency=low
208+
209+ * debian/patches/fix-689733.patch:
210+ - Use Super+W to spread windows of the current workspace (LP: #689733)
211+ - Set Super+Shift+W to spread all the open windows
212+
213+ -- Marco Trevisan (Treviño) <3v1n0@ubuntu.com> Fri, 06 Jan 2012 19:25:55 +0100
214+
215 compiz (1:0.9.6+bzr20110929-0ubuntu8) precise; urgency=low
216
217 * Drop build dependency on libdecoration0-dev (built from this very source).
218
219=== added file 'debian/patches/fix-689733.patch'
220--- debian/patches/fix-689733.patch 1970-01-01 00:00:00 +0000
221+++ debian/patches/fix-689733.patch 2012-01-06 18:52:25 +0000
222@@ -0,0 +1,21 @@
223+=== modified file 'plugins/scale/scale.xml.in'
224+--- a/plugins/scale/scale.xml.in 2011-09-12 08:09:46 +0000
225++++ b/plugins/scale/scale.xml.in 2012-01-06 18:24:02 +0000
226+@@ -145,7 +145,7 @@
227+ <option name="initiate_all_key" type="key">
228+ <_short>Initiate Window Picker For All Windows</_short>
229+ <_long>Layout and start transforming all windows</_long>
230+- <default>&lt;Super&gt;w</default>
231++ <default>&lt;Super&gt;&lt;Shift&gt;w</default>
232+ </option>
233+ <option name="initiate_group_edge" type="edge">
234+ <_short>Initiate Window Picker For Window Group</_short>
235+@@ -172,6 +172,7 @@
236+ <option name="initiate_output_key" type="key">
237+ <_short>Initiate Window Picker For Windows on Current Output</_short>
238+ <_long>Layout and start transforming windows on current output</_long>
239++ <default>&lt;Super&gt;w</default>
240+ </option>
241+ <option name="show_desktop" type="bool">
242+ <_short>Click Desktop to Show Desktop</_short>
243+
244
245=== modified file 'debian/patches/series'
246--- debian/patches/series 2011-10-20 14:23:52 +0000
247+++ debian/patches/series 2012-01-06 18:52:25 +0000
248@@ -18,3 +18,4 @@
249 rev_2884_fix_874004.patch
250 rev_2890_fix_879253.patch
251 fix-886978.patch
252+fix-689733.patch
253
254=== modified file 'plugins/scale/scale.xml.in'
255--- plugins/scale/scale.xml.in 2011-09-12 08:09:46 +0000
256+++ plugins/scale/scale.xml.in 2012-01-06 18:52:25 +0000
257@@ -145,7 +145,7 @@
258 <option name="initiate_all_key" type="key">
259 <_short>Initiate Window Picker For All Windows</_short>
260 <_long>Layout and start transforming all windows</_long>
261- <default>&lt;Super&gt;w</default>
262+ <default>&lt;Super&gt;&lt;Shift&gt;w</default>
263 </option>
264 <option name="initiate_group_edge" type="edge">
265 <_short>Initiate Window Picker For Window Group</_short>
266@@ -172,6 +172,7 @@
267 <option name="initiate_output_key" type="key">
268 <_short>Initiate Window Picker For Windows on Current Output</_short>
269 <_long>Layout and start transforming windows on current output</_long>
270+ <default>&lt;Super&gt;w</default>
271 </option>
272 <option name="show_desktop" type="bool">
273 <_short>Click Desktop to Show Desktop</_short>

Subscribers

People subscribed via source and target branches