Compiz

Merge lp:~mc-return/compiz/compiz.merge-fix1074487-expo-xml-fixes into lp:compiz/0.9.10

  1. compiz.merge-fix1074487-expo-xml-fixes
  2. Merge into 0.9.10
Proposed by MC Return
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 3746
Merged at revision: 3747
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1074487-expo-xml-fixes
Merge into: lp:compiz/0.9.10
Diff against target: 567 lines (+162/-161)
2 files modified
debian/patches/ubuntu-config.patch (+105/-104)
plugins/expo/expo.xml.in (+57/-57)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1074487-expo-xml-fixes
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+171484@code.launchpad.net

Commit message

Expo, .xml.in fixes:

Better description of the plugin.
Improved and fixed tooltips.
Moved the "Curve Strength" option closer to "Deformation".

Refreshed the quilt patch for Ubuntu:
There is no need to set the default distance to 0.005 as this setting
has no effect without deformation.
Set default multi-screen mode to "One wall per output" for Ubuntu,
because "One big wall" works now for all display configurations and
could potentially change the appearance for Ubuntu users.

(LP: #1074487)

Description of the change

It is finally done.
Quilt and me are friends for some time now. :)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3746
http://jenkins.qa.ubuntu.com/job/compiz-ci/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/214/rebuild

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

trusting your change, looking fine, thanks!

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 2013-06-19 18:30:55 +0000
3+++ debian/patches/ubuntu-config.patch 2013-06-26 08:22:26 +0000
4@@ -242,101 +242,6 @@
5 </option>
6 <option name="mipmap" type="bool">
7 <_short>Mipmap</_short>
8---- a/plugins/expo/expo.xml.in
9-+++ b/plugins/expo/expo.xml.in
10-@@ -17,6 +17,7 @@
11- <plugin>wobbly</plugin>
12- <plugin>animation</plugin>
13- <plugin>wallpaper</plugin>
14-+ <plugin>imgpng</plugin>
15- </relation>
16- </deps>
17- <options>
18-@@ -25,7 +26,7 @@
19- <option name="expo_key" type="key">
20- <_short>Expo key</_short>
21- <_long>Engage wall expo mode key binding</_long>
22-- <default>&lt;Super&gt;e</default>
23-+ <default>&lt;Super&gt;s</default>
24- </option>
25- <option name="expo_button" type="button">
26- <_short>Expo button</_short>
27-@@ -35,9 +36,6 @@
28- <option name="expo_edge" type="edge">
29- <_short>Expo edge</_short>
30- <_long>Engage wall expo mode edge binding</_long>
31-- <default>
32-- <edge name="TopLeft"/>
33-- </default>
34- </option>
35- <option name="double_click_time" type="int">
36- <_short>Double click time</_short>
37-@@ -80,7 +78,7 @@
38- <option name="zoom_time" type="float">
39- <_short>Zoom time</_short>
40- <_long>Duration of the zoomout animation</_long>
41-- <default>0.5</default>
42-+ <default>0.3</default>
43- <min>0.1</min>
44- <max>5.0</max>
45- <precision>0.1</precision>
46-@@ -134,17 +132,17 @@
47- <option name="x_offset" type="int">
48- <_short>X Offset</_short>
49- <_long>X offset in pixels</_long>
50-- <default>0</default>
51-+ <default>64</default>
52- </option>
53- <option name="y_offset" type="int">
54- <_short>Y Offset</_short>
55- <_long>Y offset in pixels</_long>
56-- <default>0</default>
57-+ <default>24</default>
58- </option>
59- <option name="distance" type="float">
60- <_short>Distance</_short>
61- <_long>Distance of the expo wall</_long>
62-- <default>0.0</default>
63-+ <default>0.005</default>
64- <min>0.0</min>
65- <max>1.0</max>
66- <precision>0.01</precision>
67-@@ -152,7 +150,7 @@
68- <option name="vp_distance" type="float">
69- <_short>Viewport distance</_short>
70- <_long>Distance between viewports</_long>
71-- <default>0.10</default>
72-+ <default>0.2</default>
73- <min>0.0</min>
74- <max>1.0</max>
75- <precision>0.01</precision>
76-@@ -203,7 +201,7 @@
77- <option name="vp_brightness" type="float">
78- <_short>Brightness</_short>
79- <_long>Inactive viewport brightness.</_long>
80-- <default>75.0</default>
81-+ <default>40.0</default>
82- <min>0.0</min>
83- <max>100.0</max>
84- <precision>0.1</precision>
85-@@ -223,7 +221,7 @@
86- <red>0xfbfb</red>
87- <green>0x8b8b</green>
88- <blue>0x0</blue>
89-- <alpha>0x0</alpha>
90-+ <alpha>0xffff</alpha>
91- </default>
92- </option>
93- </subgroup>
94-@@ -232,7 +230,7 @@
95- <option name="reflection" type="bool">
96- <_short>Reflection</_short>
97- <_long>Show a reflection of the viewports on the ground</_long>
98-- <default>true</default>
99-+ <default>false</default>
100- </option>
101- <option name="ground_color1" type="color">
102- <_short>Ground color(near)</_short>
103 --- a/plugins/fade/fade.xml.in
104 +++ b/plugins/fade/fade.xml.in
105 @@ -10,6 +10,7 @@
106@@ -611,7 +516,7 @@
107 <option name="initiate_button" type="button">
108 --- a/plugins/wall/wall.xml.in
109 +++ b/plugins/wall/wall.xml.in
110-@@ -31,12 +31,12 @@
111+@@ -30,12 +30,12 @@
112 <option name="miniscreen" type="bool">
113 <_short>Show Live Viewport Previews</_short>
114 <_long>Show live viewport previews in switcher window</_long>
115@@ -626,7 +531,7 @@
116 <min>0.0</min>
117 <max>2.0</max>
118 <precision>0.05</precision>
119-@@ -44,7 +44,7 @@
120+@@ -43,7 +43,7 @@
121 <option name="preview_scale" type="int">
122 <_short>Preview Scale</_short>
123 <_long>Size of the preview in %</_long>
124@@ -635,7 +540,7 @@
125 <min>0</min>
126 <max>400</max>
127 </option>
128-@@ -58,7 +58,7 @@
129+@@ -57,7 +57,7 @@
130 <option name="border_width" type="int">
131 <_short>Border Width</_short>
132 <_long>Width of the border between the previews</_long>
133@@ -644,7 +549,7 @@
134 <min>0</min>
135 <max>30</max>
136 </option>
137-@@ -66,10 +66,10 @@
138+@@ -65,10 +65,10 @@
139 <_short>Outline Color</_short>
140 <_long>Outline color of the switcher window.</_long>
141 <default>
142@@ -659,7 +564,7 @@
143 </default>
144 </option>
145 <subgroup>
146-@@ -79,30 +79,30 @@
147+@@ -78,30 +78,30 @@
148 <_short>Base Color</_short>
149 <_long>First color for the background gradient of the switcher window.</_long>
150 <default>
151@@ -702,7 +607,7 @@
152 </default>
153 </option>
154 </subgroup>
155-@@ -113,20 +113,20 @@
156+@@ -112,20 +112,20 @@
157 <_short>Base Color</_short>
158 <_long>First color for the thumb gradient of the switcher window.</_long>
159 <default>
160@@ -731,7 +636,7 @@
161 </default>
162 </option>
163 </subgroup>
164-@@ -140,7 +140,7 @@
165+@@ -139,7 +139,7 @@
166 <red>0xffff</red>
167 <green>0xffff</green>
168 <blue>0xffff</blue>
169@@ -740,7 +645,7 @@
170 </default>
171 </option>
172 <option name="thumb_highlight_gradient_shadow_color" type="color">
173-@@ -150,7 +150,7 @@
174+@@ -149,7 +149,7 @@
175 <red>0xdfff</red>
176 <green>0xdfff</green>
177 <blue>0xdfff</blue>
178@@ -749,7 +654,7 @@
179 </default>
180 </option>
181 </subgroup>
182-@@ -348,7 +348,7 @@
183+@@ -351,7 +351,7 @@
184 <option name="edgeflip_move" type="bool">
185 <_short>Edge Flip Move</_short>
186 <_long>Flip viewport when moving a window to a screen edge</_long>
187@@ -843,3 +748,99 @@
188 </option>
189 </subgroup>
190 </group>
191+--- a/plugins/expo/expo.xml.in
192++++ b/plugins/expo/expo.xml.in
193+@@ -17,6 +17,7 @@
194+ <plugin>wobbly</plugin>
195+ <plugin>animation</plugin>
196+ <plugin>wallpaper</plugin>
197++ <plugin>imgpng</plugin>
198+ </relation>
199+ </deps>
200+ <options>
201+@@ -25,7 +26,7 @@
202+ <option name="expo_key" type="key">
203+ <_short>Expo Key</_short>
204+ <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long>
205+- <default>&lt;Super&gt;e</default>
206++ <default>&lt;Super&gt;s</default>
207+ </option>
208+ <option name="expo_button" type="button">
209+ <_short>Expo Button</_short>
210+@@ -36,7 +37,6 @@
211+ <_short>Expo Corner/Edge</_short>
212+ <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long>
213+ <default>
214+- <edge name="TopLeft"/>
215+ </default>
216+ </option>
217+ <option name="double_click_time" type="int">
218+@@ -80,7 +80,7 @@
219+ <option name="zoom_time" type="float">
220+ <_short>Animation Duration</_short>
221+ <_long>Duration of the selected animation (in seconds).</_long>
222+- <default>0.5</default>
223++ <default>0.3</default>
224+ <min>0.1</min>
225+ <max>5.0</max>
226+ <precision>0.1</precision>
227+@@ -142,12 +142,12 @@
228+ <option name="x_offset" type="int">
229+ <_short>X Offset</_short>
230+ <_long>Horizontal offset (in pixels).</_long>
231+- <default>0</default>
232++ <default>64</default>
233+ </option>
234+ <option name="y_offset" type="int">
235+ <_short>Y Offset</_short>
236+ <_long>Vertical offset (in pixels).</_long>
237+- <default>0</default>
238++ <default>24</default>
239+ </option>
240+ <option name="distance" type="float">
241+ <_short>Camera Distance</_short>
242+@@ -160,7 +160,7 @@
243+ <option name="vp_distance" type="float">
244+ <_short>Viewport Distance</_short>
245+ <_long>The distance between viewports in Expo mode.</_long>
246+- <default>0.10</default>
247++ <default>0.2</default>
248+ <min>0.0</min>
249+ <max>1.0</max>
250+ <precision>0.01</precision>
251+@@ -188,7 +188,7 @@
252+ <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long>
253+ <min>0</min>
254+ <max>1</max>
255+- <default>0</default>
256++ <default>1</default>
257+ <desc>
258+ <value>0</value>
259+ <_name>One big wall</_name>
260+@@ -203,7 +203,7 @@
261+ <option name="vp_brightness" type="float">
262+ <_short>Brightness</_short>
263+ <_long>The brightness of unfocused viewports (in percent).</_long>
264+- <default>75.0</default>
265++ <default>40.0</default>
266+ <min>0.0</min>
267+ <max>100.0</max>
268+ <precision>0.1</precision>
269+@@ -223,7 +223,7 @@
270+ <red>0xfbfb</red>
271+ <green>0x8b8b</green>
272+ <blue>0x0</blue>
273+- <alpha>0x0</alpha>
274++ <alpha>0xffff</alpha>
275+ </default>
276+ </option>
277+ </subgroup>
278+@@ -232,7 +232,7 @@
279+ <option name="reflection" type="bool">
280+ <_short>Reflection</_short>
281+ <_long>Render a realtime reflection of the viewports on the ground.</_long>
282+- <default>true</default>
283++ <default>false</default>
284+ </option>
285+ <option name="ground_color1" type="color">
286+ <_short>Ground Color (near)</_short>
287
288=== modified file 'plugins/expo/expo.xml.in'
289--- plugins/expo/expo.xml.in 2012-11-26 07:13:04 +0000
290+++ plugins/expo/expo.xml.in 2013-06-26 08:22:26 +0000
291@@ -2,7 +2,7 @@
292 <compiz>
293 <plugin name="expo" useBcop="true">
294 <_short>Expo</_short>
295- <_long>Expo Plugin</_long>
296+ <_long>Expose all viewports and freely arrange open windows amongst them</_long>
297 <category>Desktop</category>
298 <deps>
299 <requirement>
300@@ -23,53 +23,53 @@
301 <group>
302 <_short>Bindings</_short>
303 <option name="expo_key" type="key">
304- <_short>Expo key</_short>
305- <_long>Engage wall expo mode key binding</_long>
306+ <_short>Expo Key</_short>
307+ <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long>
308 <default>&lt;Super&gt;e</default>
309 </option>
310 <option name="expo_button" type="button">
311- <_short>Expo button</_short>
312- <_long>Engage wall expo mode button binding</_long>
313+ <_short>Expo Button</_short>
314+ <_long>Initiate or terminate Expo mode with this mousebutton shortcut.</_long>
315 <default></default>
316 </option>
317 <option name="expo_edge" type="edge">
318- <_short>Expo edge</_short>
319- <_long>Engage wall expo mode edge binding</_long>
320+ <_short>Expo Corner/Edge</_short>
321+ <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long>
322 <default>
323 <edge name="TopLeft"/>
324 </default>
325 </option>
326 <option name="double_click_time" type="int">
327- <_short>Double click time</_short>
328- <_long>Timeframe to execute a double click</_long>
329+ <_short>Double-Click Time</_short>
330+ <_long>Timeframe to execute a double-click (in ms).</_long>
331 <default>500</default>
332 <min>50</min>
333 <max>2000</max>
334 </option>
335 <option name="dnd_button" type="button">
336- <_short>Drag&amp;drop</_short>
337- <_long>Button binding for drag &amp; drop of windows</_long>
338+ <_short>Drag &amp; Drop Button</_short>
339+ <_long>Drag and drop windows in Expo with this mousebutton.</_long>
340 <default>Button1</default>
341 <passive_grab>false</passive_grab>
342 <internal/>
343 </option>
344 <option name="exit_button" type="button">
345- <_short>Exit expo</_short>
346- <_long>Button binding to exit expo</_long>
347+ <_short>Exit Expo Button</_short>
348+ <_long>End Expo mode with this mousebutton.</_long>
349 <default>Button3</default>
350 <passive_grab>false</passive_grab>
351 <internal/>
352 </option>
353 <option name="next_vp_button" type="button">
354- <_short>Next viewport</_short>
355- <_long>Button binding to switch to next viewport in expo</_long>
356+ <_short>Next Viewport Button</_short>
357+ <_long>Button binding to focus the next viewport in Expo mode.</_long>
358 <default>Button5</default>
359 <passive_grab>false</passive_grab>
360 <internal/>
361 </option>
362 <option name="prev_vp_button" type="button">
363- <_short>Previous viewport</_short>
364- <_long>Button binding to switch to next viewport in expo</_long>
365+ <_short>Previous Viewport Button</_short>
366+ <_long>Button binding to focus the previous viewport in Expo mode.</_long>
367 <default>Button4</default>
368 <passive_grab>false</passive_grab>
369 <internal/>
370@@ -78,21 +78,21 @@
371 <group>
372 <_short>Behaviour</_short>
373 <option name="zoom_time" type="float">
374- <_short>Zoom time</_short>
375- <_long>Duration of the zoomout animation</_long>
376+ <_short>Animation Duration</_short>
377+ <_long>Duration of the selected animation (in seconds).</_long>
378 <default>0.5</default>
379 <min>0.1</min>
380 <max>5.0</max>
381 <precision>0.1</precision>
382 </option>
383 <option name="expo_immediate_move" type="bool">
384- <_short>Immediate moves</_short>
385- <_long>Selects if windows movements in expo mode should be immediate - this among other things disables wobbliness</_long>
386+ <_short>Immediate Moves</_short>
387+ <_long>Should window movements in Expo mode be immediate - this among other things disables wobbliness.</_long>
388 <default>false</default>
389 </option>
390 <option name="expo_animation" type="int">
391 <_short>Expo Animation</_short>
392- <_long>Animation used when switching to expo mode</_long>
393+ <_long>The animation used when initiating or leaving Expo.</_long>
394 <default>0</default>
395 <min>0</min>
396 <max>2</max>
397@@ -114,7 +114,7 @@
398 <_short>Appearance</_short>
399 <option name="deform" type="int">
400 <_short>Deformation</_short>
401- <_long>Deformation of the expo wall</_long>
402+ <_long>The deformation of the Expo wall.</_long>
403 <default>0</default>
404 <min>0</min>
405 <max>2</max>
406@@ -131,27 +131,35 @@
407 <_name>Curve</_name>
408 </desc>
409 </option>
410+ <option name="curve" type="float">
411+ <_short>Curve Strength</_short>
412+ <_long>Strength of the deformation in curve mode.</_long>
413+ <default>0.50</default>
414+ <min>0.0</min>
415+ <max>1.0</max>
416+ <precision>0.01</precision>
417+ </option>
418 <option name="x_offset" type="int">
419 <_short>X Offset</_short>
420- <_long>X offset in pixels</_long>
421+ <_long>Horizontal offset (in pixels).</_long>
422 <default>0</default>
423- </option>
424+ </option>
425 <option name="y_offset" type="int">
426 <_short>Y Offset</_short>
427- <_long>Y offset in pixels</_long>
428+ <_long>Vertical offset (in pixels).</_long>
429 <default>0</default>
430- </option>
431+ </option>
432 <option name="distance" type="float">
433- <_short>Distance</_short>
434- <_long>Distance of the expo wall</_long>
435+ <_short>Camera Distance</_short>
436+ <_long>The distance between the camera and the exposed viewports.</_long>
437 <default>0.0</default>
438 <min>0.0</min>
439 <max>1.0</max>
440 <precision>0.01</precision>
441 </option>
442 <option name="vp_distance" type="float">
443- <_short>Viewport distance</_short>
444- <_long>Distance between viewports</_long>
445+ <_short>Viewport Distance</_short>
446+ <_long>The distance between viewports in Expo mode.</_long>
447 <default>0.10</default>
448 <min>0.0</min>
449 <max>1.0</max>
450@@ -159,33 +167,25 @@
451 </option>
452 <option name="aspect_ratio" type="float">
453 <_short>Aspect Ratio</_short>
454- <_long>Expo mode aspect ratio</_long>
455+ <_long>The relation of the viewports' width to height in Expo mode.</_long>
456 <default>1.0</default>
457 <min>0.0</min>
458 <max>1.0</max>
459 <precision>0.1</precision>
460 </option>
461- <option name="curve" type="float">
462- <_short>Curve strength</_short>
463- <_long>Strength of the deformation in curve mode</_long>
464- <default>0.50</default>
465- <min>0.0</min>
466- <max>1.0</max>
467- <precision>0.01</precision>
468- </option>
469 <option name="hide_docks" type="bool">
470- <_short>Hide panels/docks in expo</_short>
471- <_long>Hide panels/docks in expo.</_long>
472+ <_short>Hide Panels/Docks</_short>
473+ <_long>Hide panels and docks in Expo mode.</_long>
474 <default>false</default>
475 </option>
476 <option name="mipmaps" type="bool">
477 <_short>Mipmaps</_short>
478- <_long>Generate mipmaps in expo mode</_long>
479+ <_long>Generate mipmaps for higher quality textures in Expo mode.</_long>
480 <default>false</default>
481 </option>
482 <option name="multioutput_mode" type="int">
483 <_short>Multi Output Mode</_short>
484- <_long>Selects how the expo wall is displayed if multiple output devices are used.</_long>
485+ <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long>
486 <min>0</min>
487 <max>1</max>
488 <default>0</default>
489@@ -199,10 +199,10 @@
490 </desc>
491 </option>
492 <subgroup>
493- <short>Inactive viewports</short>
494+ <short>Inactive Viewports</short>
495 <option name="vp_brightness" type="float">
496 <_short>Brightness</_short>
497- <_long>Inactive viewport brightness.</_long>
498+ <_long>The brightness of unfocused viewports (in percent).</_long>
499 <default>75.0</default>
500 <min>0.0</min>
501 <max>100.0</max>
502@@ -210,15 +210,15 @@
503 </option>
504 <option name="vp_saturation" type="float">
505 <_short>Saturation</_short>
506- <_long>Inactive viewport saturation.</_long>
507+ <_long>The saturation of unfocused viewports (in percent).</_long>
508 <default>100.0</default>
509 <min>0.0</min>
510 <max>100.0</max>
511 <precision>0.1</precision>
512 </option>
513 <option name="selected_color" type="color">
514- <_short>Selected Color</_short>
515- <_long>Color to use when highlighting the selected viewport</_long>
516+ <_short>Selection Glow Color</_short>
517+ <_long>Color and opacity of the glow texture that highlights the selected viewport.</_long>
518 <default>
519 <red>0xfbfb</red>
520 <green>0x8b8b</green>
521@@ -231,12 +231,12 @@
522 <short>Reflection</short>
523 <option name="reflection" type="bool">
524 <_short>Reflection</_short>
525- <_long>Show a reflection of the viewports on the ground</_long>
526+ <_long>Render a realtime reflection of the viewports on the ground.</_long>
527 <default>true</default>
528 </option>
529 <option name="ground_color1" type="color">
530- <_short>Ground color(near)</_short>
531- <_long>Color of the ground (near).</_long>
532+ <_short>Ground Color (near)</_short>
533+ <_long>Color and opacity of the ground (near).</_long>
534 <default>
535 <red>0xb333</red>
536 <green>0xb333</green>
537@@ -245,8 +245,8 @@
538 </default>
539 </option>
540 <option name="ground_color2" type="color">
541- <_short>Ground color(far)</_short>
542- <_long>Color of the ground (far).</_long>
543+ <_short>Ground Color (far)</_short>
544+ <_long>Color and opacity of the ground (far).</_long>
545 <default>
546 <red>0xb333</red>
547 <green>0xb333</green>
548@@ -255,8 +255,8 @@
549 </default>
550 </option>
551 <option name="ground_size" type="float">
552- <_short>Reflection ground size</_short>
553- <_long>Reflection ground size.</_long>
554+ <_short>Reflection Ground Size</_short>
555+ <_long>Size of the ground the reflection is rendered on.</_long>
556 <default>0.5</default>
557 <min>0.0</min>
558 <max>1.0</max>
559@@ -264,7 +264,7 @@
560 </option>
561 <option name="scale_factor" type="float">
562 <_short>Reflection Scale</_short>
563- <_long>Scale factor of the expo wall reflection</_long>
564+ <_long>The vertical scale factor of the ground reflection.</_long>
565 <default>0.75</default>
566 <min>0.0</min>
567 <max>2.0</max>

Subscribers

People subscribed via source and target branches

to all changes: