Compiz

Merge lp:~didrocks/compiz/compiz-one-ws into lp:compiz/0.9.9

  1. compiz-one-ws
  2. Merge into 0.9.9
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3562
Merged at revision: 3562
Proposed branch: lp:~didrocks/compiz/compiz-one-ws
Merge into: lp:compiz/0.9.9
Diff against target: 219 lines (+47/-55)
1 file modified
debian/patches/ubuntu-config.patch (+47/-55)
To merge this branch: bzr merge lp:~didrocks/compiz/compiz-one-ws
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+143061@code.launchpad.net

Commit message

Set one workspace by default (LP: #868423)

Description of the change

set one workspace by default (LP: #868423)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :
Download full text (12.8 KiB)

Why not just remove the icon.....
On 14/01/2013 12:19 PM, "Didier Roche" <email address hidden> wrote:

> Didier Roche has proposed merging lp:~didrocks/compiz/compiz-one-ws into
> lp:compiz.
>
> Commit message:
> set one workspace by default (LP: #868423)
>
> Requested reviews:
> Compiz Maintainers (compiz-team)
> Related bugs:
> Bug #868423 in Ayatana Design: "Launcher - Workspace switcher should not
> be in the Launcher by default"
> https://bugs.launchpad.net/ayatana-design/+bug/868423
>
> For more details, see:
> https://code.launchpad.net/~didrocks/compiz/compiz-one-ws/+merge/143061
>
> set one workspace by default (LP: #868423)
> --
> https://code.launchpad.net/~didrocks/compiz/compiz-one-ws/+merge/143061
> Your team Compiz Maintainers is requested to review the proposed merge of
> lp:~didrocks/compiz/compiz-one-ws into lp:compiz.
>
> === modified file 'debian/patches/ubuntu-config.patch'
> --- debian/patches/ubuntu-config.patch 2012-11-26 07:13:04 +0000
> +++ debian/patches/ubuntu-config.patch 2013-01-14 04:18:22 +0000
> @@ -1,8 +1,8 @@
> === modified file 'metadata/core.xml.in'
> -Index: new/metadata/core.xml.in
> +Index: compiz-one-ws/metadata/core.xml.in
> ===================================================================
> ---- old/metadata/core.xml.in 2012-11-23 18:54:15.673949000 +0800
> -+++ new/metadata/core.xml.in 2012-11-23 18:54:59.307064517 +0800
> +--- compiz-one-ws.orig/metadata/core.xml.in 2013-01-13
> 20:09:29.517213134 -0800
> ++++ compiz-one-ws/metadata/core.xml.in 2013-01-13 20:09:51.461213761
> -0800
> @@ -139,7 +139,7 @@
> <option name="focus_prevention_match" type="match">
> <_short>Focus Prevention Windows</_short>
> @@ -53,27 +53,19 @@
> </option>
> <option name="toggle_window_maximized_button"
> type="button">
> <_short>Toggle Window Maximized</_short>
> -@@ -245,14 +246,14 @@
> +@@ -245,7 +246,7 @@
> <option name="hsize" type="int">
> <_short>Horizontal Virtual Size</_short>
> <_long>Screen size multiplier for horizontal
> virtual size</_long>
> - <default>4</default>
> -+ <default>2</default>
> - <min>1</min>
> - <max>32</max>
> - </option>
> - <option name="vsize" type="int">
> - <_short>Vertical Virtual Size</_short>
> - <_long>Screen size multiplier for vertical virtual
> size</_long>
> -- <default>1</default>
> -+ <default>2</default>
> - <min>1</min>
> - <max>32</max>
> - </option>
> -Index: new/plugins/animation/animation.xml.in
> ++ <default>1</default>
> + <min>1</min>
> + <max>32</max>
> + </option>
> +Index: compiz-one-ws/plugins/animation/animation.xml.in
> ===================================================================
> -...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3562
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/12/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/12//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3562
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/11/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/11//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3562
http://jenkins.qa.ubuntu.com/job/compiz-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/360/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/360//rebuild/?

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

@Sam: See the associated bug reports, we reset to 1x1 by default, so that someone triggering the keybinding don't have other workspaces seen. There is an option in gnome-control-center to readd them (see the same bug report). The interface is already in raring.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Would it make sense to do this by simply not loading the expo plugin by default? Hmm, I guess for controlling the config externally (gnome-control-center) this way is better...

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

@Daniel: that would be a nice idea, not sure how keybindings are reacting without it (like, moving a window to workspace X). But I guess compiz doesn't have this reliable dynamic add/remove plugin, especially as unityshell is dectecting it on load.

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 2012-11-26 07:13:04 +0000
3+++ debian/patches/ubuntu-config.patch 2013-01-14 04:21:19 +0000
4@@ -1,8 +1,8 @@
5 === modified file 'metadata/core.xml.in'
6-Index: new/metadata/core.xml.in
7+Index: compiz-one-ws/metadata/core.xml.in
8 ===================================================================
9---- old/metadata/core.xml.in 2012-11-23 18:54:15.673949000 +0800
10-+++ new/metadata/core.xml.in 2012-11-23 18:54:59.307064517 +0800
11+--- compiz-one-ws.orig/metadata/core.xml.in 2013-01-13 20:09:29.517213134 -0800
12++++ compiz-one-ws/metadata/core.xml.in 2013-01-13 20:09:51.461213761 -0800
13 @@ -139,7 +139,7 @@
14 <option name="focus_prevention_match" type="match">
15 <_short>Focus Prevention Windows</_short>
16@@ -53,27 +53,19 @@
17 </option>
18 <option name="toggle_window_maximized_button" type="button">
19 <_short>Toggle Window Maximized</_short>
20-@@ -245,14 +246,14 @@
21+@@ -245,7 +246,7 @@
22 <option name="hsize" type="int">
23 <_short>Horizontal Virtual Size</_short>
24 <_long>Screen size multiplier for horizontal virtual size</_long>
25 - <default>4</default>
26-+ <default>2</default>
27- <min>1</min>
28- <max>32</max>
29- </option>
30- <option name="vsize" type="int">
31- <_short>Vertical Virtual Size</_short>
32- <_long>Screen size multiplier for vertical virtual size</_long>
33-- <default>1</default>
34-+ <default>2</default>
35- <min>1</min>
36- <max>32</max>
37- </option>
38-Index: new/plugins/animation/animation.xml.in
39++ <default>1</default>
40+ <min>1</min>
41+ <max>32</max>
42+ </option>
43+Index: compiz-one-ws/plugins/animation/animation.xml.in
44 ===================================================================
45---- old/plugins/animation/animation.xml.in 2012-11-23 18:54:15.673949000 +0800
46-+++ new/plugins/animation/animation.xml.in 2012-11-23 18:54:59.307064517 +0800
47+--- compiz-one-ws.orig/plugins/animation/animation.xml.in 2013-01-13 20:09:29.517213134 -0800
48++++ compiz-one-ws/plugins/animation/animation.xml.in 2013-01-13 20:09:29.501213133 -0800
49 @@ -36,7 +36,7 @@
50 <extensible/>
51 <sort start="2"/>
52@@ -212,10 +204,10 @@
53 <min>0</min>
54 <max>1</max>
55 <precision>0.01</precision>
56-Index: new/plugins/decor/decor.xml.in
57+Index: compiz-one-ws/plugins/decor/decor.xml.in
58 ===================================================================
59---- old/plugins/decor/decor.xml.in 2012-11-23 18:54:15.673949000 +0800
60-+++ new/plugins/decor/decor.xml.in 2012-11-23 18:54:59.307064517 +0800
61+--- compiz-one-ws.orig/plugins/decor/decor.xml.in 2013-01-13 20:09:29.517213134 -0800
62++++ compiz-one-ws/plugins/decor/decor.xml.in 2013-01-13 20:09:29.501213133 -0800
63 @@ -31,7 +31,7 @@
64 <option name="active_shadow_opacity" type="float">
65 <_short>Shadow Opacity</_short>
66@@ -252,10 +244,10 @@
67 </option>
68 <option name="mipmap" type="bool">
69 <_short>Mipmap</_short>
70-Index: new/plugins/expo/expo.xml.in
71+Index: compiz-one-ws/plugins/expo/expo.xml.in
72 ===================================================================
73---- old/plugins/expo/expo.xml.in 2012-11-23 18:54:15.673949000 +0800
74-+++ new/plugins/expo/expo.xml.in 2012-11-23 18:55:22.875064959 +0800
75+--- compiz-one-ws.orig/plugins/expo/expo.xml.in 2013-01-13 20:09:29.517213134 -0800
76++++ compiz-one-ws/plugins/expo/expo.xml.in 2013-01-13 20:09:29.501213133 -0800
77 @@ -17,6 +17,7 @@
78 <plugin>wobbly</plugin>
79 <plugin>animation</plugin>
80@@ -367,10 +359,10 @@
81 <min>0.0</min>
82 <max>2.0</max>
83 <precision>0.01</precision>
84-Index: new/plugins/ezoom/ezoom.xml.in
85+Index: compiz-one-ws/plugins/ezoom/ezoom.xml.in
86 ===================================================================
87---- old/plugins/ezoom/ezoom.xml.in 2012-11-23 18:54:15.673949000 +0800
88-+++ new/plugins/ezoom/ezoom.xml.in 2012-11-23 18:54:59.307064517 +0800
89+--- compiz-one-ws.orig/plugins/ezoom/ezoom.xml.in 2013-01-13 20:09:29.517213134 -0800
90++++ compiz-one-ws/plugins/ezoom/ezoom.xml.in 2013-01-13 20:09:29.505213133 -0800
91 @@ -29,7 +29,6 @@
92 <option type="button" name="zoom_in_button">
93 <_short>Zoom In</_short>
94@@ -404,10 +396,10 @@
95 </option>
96 </subgroup>
97 </group>
98-Index: new/plugins/fade/fade.xml.in
99+Index: compiz-one-ws/plugins/fade/fade.xml.in
100 ===================================================================
101---- old/plugins/fade/fade.xml.in 2012-11-23 18:54:15.673949000 +0800
102-+++ new/plugins/fade/fade.xml.in 2012-11-23 18:54:59.307064517 +0800
103+--- compiz-one-ws.orig/plugins/fade/fade.xml.in 2013-01-13 20:09:29.517213134 -0800
104++++ compiz-one-ws/plugins/fade/fade.xml.in 2013-01-13 20:09:29.505213133 -0800
105 @@ -10,6 +10,7 @@
106 </requirement>
107 <relation type="after">
108@@ -425,10 +417,10 @@
109 </option>
110 <option name="visual_bell" type="bell">
111 <_short>Visual Bell</_short>
112-Index: new/plugins/gnomecompat/gnomecompat.xml.in
113+Index: compiz-one-ws/plugins/gnomecompat/gnomecompat.xml.in
114 ===================================================================
115---- old/plugins/gnomecompat/gnomecompat.xml.in 2012-11-23 18:54:15.673949000 +0800
116-+++ new/plugins/gnomecompat/gnomecompat.xml.in 2012-11-23 18:54:59.307064517 +0800
117+--- compiz-one-ws.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-01-13 20:09:29.517213134 -0800
118++++ compiz-one-ws/plugins/gnomecompat/gnomecompat.xml.in 2013-01-13 20:09:29.505213133 -0800
119 @@ -53,6 +53,7 @@
120 <option name="run_command_terminal_key" type="key">
121 <_short>Open a terminal</_short>
122@@ -437,10 +429,10 @@
123 </option>
124 </group>
125 </options>
126-Index: new/plugins/grid/grid.xml.in
127+Index: compiz-one-ws/plugins/grid/grid.xml.in
128 ===================================================================
129---- old/plugins/grid/grid.xml.in 2012-11-23 18:54:15.673949000 +0800
130-+++ new/plugins/grid/grid.xml.in 2012-11-23 18:54:59.307064517 +0800
131+--- compiz-one-ws.orig/plugins/grid/grid.xml.in 2013-01-13 20:09:29.517213134 -0800
132++++ compiz-one-ws/plugins/grid/grid.xml.in 2013-01-13 20:09:29.509213133 -0800
133 @@ -23,17 +23,16 @@
134 <option name="put_center_key" type="key">
135 <_short>Put Center</_short>
136@@ -469,10 +461,10 @@
137 </option>
138 <option name="put_restore_key" type="key">
139 <_short>Restore</_short>
140-Index: new/plugins/place/place.xml.in
141+Index: compiz-one-ws/plugins/place/place.xml.in
142 ===================================================================
143---- old/plugins/place/place.xml.in 2012-11-23 18:54:15.673949000 +0800
144-+++ new/plugins/place/place.xml.in 2012-11-23 18:54:59.307064517 +0800
145+--- compiz-one-ws.orig/plugins/place/place.xml.in 2013-01-13 20:09:29.517213134 -0800
146++++ compiz-one-ws/plugins/place/place.xml.in 2013-01-13 20:09:29.509213133 -0800
147 @@ -20,8 +20,8 @@
148 <option name="mode" type="int">
149 <_short>Placement Mode</_short>
150@@ -484,10 +476,10 @@
151 <max>5</max>
152 <desc>
153 <value>0</value>
154-Index: new/plugins/resize/resize.xml.in
155+Index: compiz-one-ws/plugins/resize/resize.xml.in
156 ===================================================================
157---- old/plugins/resize/resize.xml.in 2012-11-23 18:54:15.673949000 +0800
158-+++ new/plugins/resize/resize.xml.in 2012-11-23 18:54:59.307064517 +0800
159+--- compiz-one-ws.orig/plugins/resize/resize.xml.in 2013-01-13 20:09:29.517213134 -0800
160++++ compiz-one-ws/plugins/resize/resize.xml.in 2013-01-13 20:09:29.509213133 -0800
161 @@ -28,7 +28,7 @@
162 <option name="mode" type="int">
163 <_short>Default Resize Mode</_short>
164@@ -532,10 +524,10 @@
165 </default>
166 </option>
167 <subgroup>
168-Index: new/plugins/scale/scale.xml.in
169+Index: compiz-one-ws/plugins/scale/scale.xml.in
170 ===================================================================
171---- old/plugins/scale/scale.xml.in 2012-11-23 18:54:15.673949000 +0800
172-+++ new/plugins/scale/scale.xml.in 2012-11-23 18:54:59.307064517 +0800
173+--- compiz-one-ws.orig/plugins/scale/scale.xml.in 2013-01-13 20:09:29.517213134 -0800
174++++ compiz-one-ws/plugins/scale/scale.xml.in 2013-01-13 20:09:29.509213133 -0800
175 @@ -19,14 +19,14 @@
176 <option name="spacing" type="int">
177 <_short>Spacing</_short>
178@@ -624,10 +616,10 @@
179 </option>
180 </group>
181 </options>
182-Index: new/plugins/staticswitcher/staticswitcher.xml.in
183+Index: compiz-one-ws/plugins/staticswitcher/staticswitcher.xml.in
184 ===================================================================
185---- old/plugins/staticswitcher/staticswitcher.xml.in 2012-11-23 18:54:15.673949000 +0800
186-+++ new/plugins/staticswitcher/staticswitcher.xml.in 2012-11-23 18:54:59.307064517 +0800
187+--- compiz-one-ws.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-01-13 20:09:29.517213134 -0800
188++++ compiz-one-ws/plugins/staticswitcher/staticswitcher.xml.in 2013-01-13 20:09:29.509213133 -0800
189 @@ -11,7 +11,6 @@
190 <relation type="after">
191 <plugin>composite</plugin>
192@@ -704,10 +696,10 @@
193 <desc>
194 <value>0</value>
195 <_name>None</_name>
196-Index: new/plugins/vpswitch/vpswitch.xml.in
197+Index: compiz-one-ws/plugins/vpswitch/vpswitch.xml.in
198 ===================================================================
199---- old/plugins/vpswitch/vpswitch.xml.in 2012-11-23 18:54:15.673949000 +0800
200-+++ new/plugins/vpswitch/vpswitch.xml.in 2012-11-23 18:54:59.307064517 +0800
201+--- compiz-one-ws.orig/plugins/vpswitch/vpswitch.xml.in 2013-01-13 20:09:29.517213134 -0800
202++++ compiz-one-ws/plugins/vpswitch/vpswitch.xml.in 2013-01-13 20:09:29.509213133 -0800
203 @@ -95,13 +95,11 @@
204 <option name="next_button" type="button">
205 <_short>Move Next</_short>
206@@ -722,10 +714,10 @@
207 <internal/>
208 </option>
209 <option name="initiate_button" type="button">
210-Index: new/plugins/wall/wall.xml.in
211+Index: compiz-one-ws/plugins/wall/wall.xml.in
212 ===================================================================
213---- old/plugins/wall/wall.xml.in 2012-11-23 18:54:15.673949000 +0800
214-+++ new/plugins/wall/wall.xml.in 2012-11-23 18:54:59.311064517 +0800
215+--- compiz-one-ws.orig/plugins/wall/wall.xml.in 2013-01-13 20:09:29.517213134 -0800
216++++ compiz-one-ws/plugins/wall/wall.xml.in 2013-01-13 20:09:29.509213133 -0800
217 @@ -31,12 +31,12 @@
218 <option name="miniscreen" type="bool">
219 <_short>Show Live Viewport Previews</_short>

Subscribers

People subscribed via source and target branches