File simple-ccsm-compiz09.patch of Package simple-ccsm
--- a/profiles/Advanced.profile
+++ b/profiles/Advanced.profile
@@ -1,28 +1,15 @@
-[thumbnail]
-s0_border = 12
-s0_thumb_color = #00000033
-s0_current_viewport = false
-s0_window_like = false
-s0_title_enabled = false
-
-[shift]
-as_next_key = <Alt>Tab
+[core]
+s0_active_plugins = core;composite;opengl;decor;obs;place;move;shift;compiztoolbox;resize;mousepoll;regex;cube;session;scale;animation;rotate;cubeaddon;expo;ezoom;
[cubeaddon]
s0_reflection = false
s0_deformation = 0
[animation]
-s0_close_effects = 12;9;9;
-s0_open_effects = 11;9;9;
-s0_minimize_effects = 17;
-s0_focus_effects = 2;
+s0_open_effects = animation:Magic Lamp;animation:Fade;animation:Fade;
+s0_close_effects = animation:Magic Lamp;animation:Fade;animation:Fade;
-[core]
-as_active_plugins = core;workarounds;dbus;resize;crashhandler;mousepoll;decoration;svg;place;png;text;imgjpeg;move;regex;animation;cube;shift;scale;rotate;cubeaddon;expo;ezoom;
-s0_hsize = 4
-s0_vsize = 1
-
-[switcher]
-as_next_key = Disabled
+[shift]
+s0_next_key = <Alt>Tab
+s0_prev_key = <Shift><Alt>Tab
--- a/profiles/Medium.profile
+++ b/profiles/Medium.profile
@@ -1,9 +1,10 @@
-[animation]
-s0_minimize_effects = 19;
-s0_focus_effects = 2;
-
[core]
-as_active_plugins = core;workarounds;dbus;resize;crashhandler;mousepoll;decoration;svg;wall;place;png;text;imgjpeg;move;regex;animation;scale;expo;ezoom;switcher;
+s0_active_plugins = core;composite;opengl;decor;obs;scale;place;move;compiztoolbox;resize;mousepoll;regex;session;animation;wall;expo;ezoom;switcher;
s0_hsize = 2
s0_vsize = 2
+[animation]
+s0_open_effects = animation:Fade;animation:Fade;animation:Fade;
+s0_close_effects = animation:Fade;animation:Fade;animation:Fade;
+s0_minimize_effects = animation:Zoom;
+
--- a/profiles/Minimal.profile
+++ b/profiles/Minimal.profile
@@ -1,15 +1,5 @@
-[animation]
-s0_close_effects = 9;9;9;
-s0_open_effects = 9;9;9;
-s0_minimize_effects = 19;
-
-[resize]
-as_mode = 1
-as_border_color = #8080808a
-as_fill_color = #0000004f
-
[core]
-as_active_plugins = core;workarounds;dbus;resize;crashhandler;mousepoll;decoration;svg;wall;place;png;text;imgjpeg;move;regex;animation;ezoom;
+s0_active_plugins = core;composite;opengl;decor;obs;place;move;compiztoolbox;resize;mousepoll;regex;session;ezoom;staticswitcher;wall;
s0_hsize = 2
s0_vsize = 2
--- a/profiles/Ultimate.profile
+++ b/profiles/Ultimate.profile
@@ -1,29 +1,16 @@
-[thumbnail]
-s0_border = 12
-s0_thumb_color = #00000033
-s0_current_viewport = false
-s0_window_like = false
-s0_title_enabled = false
-
-[shift]
-as_next_key = <Alt>Tab
-
-[cubeaddon]
-s0_deformation = 2
-
-[animation]
-s0_close_effects = 4;9;9;
-s0_open_effects = 3;9;9;
-s0_focus_effects = 1;
+[cube]
+s0_active_opacity = 70,000000
[core]
-as_active_plugins = core;workarounds;dbus;resize;crashhandler;mousepoll;decoration;svg;wobbly;place;png;text;imgjpeg;move;regex;animation;cube;3d;shift;scale;rotate;cubeaddon;expo;ezoom;
-s0_hsize = 4
-s0_vsize = 1
+s0_active_plugins = core;composite;opengl;decor;obs;place;move;shift;compiztoolbox;resize;mousepoll;regex;wobbly;cube;session;td;scale;animation;rotate;animationaddon;cubeaddon;expo;ezoom;
-[switcher]
-as_next_key = Disabled
+[animation]
+s0_open_effects = animationaddon:Skewer;animation:Fade;animation:Fade;
+s0_close_effects = animationaddon:Explode;animation:Fade;animation:Fade;
+s0_minimize_effects = animationaddon:Domino;
+s0_focus_effects = animation:Dodge;
-[cube]
-s0_active_opacity = 60.000000
+[shift]
+s0_next_key = <Alt>Tab
+s0_prev_key = <Shift><Alt>Tab
--- a/simple-ccsm.in
+++ b/simple-ccsm.in
@@ -522,7 +522,7 @@ class ProfilePage:
text = box.do_get_active_text (box)
except (AttributeError, NameError, TypeError):
text = box.get_active_text ()
- setting = plugin.Screens[0][settingName]
+ setting = plugin.Screen[settingName]
if len(setting.Value) >= 1:
value = setting.Value[0]
if value in names[settingName]:
@@ -540,7 +540,7 @@ class ProfilePage:
def CheckAccessibility(self, widget=None):
enabled = False
- for name in ('ezoom', 'zoom', 'mag'):
+ for name in ('ezoom', 'mag'):
plugin = self.Context.Plugins[name]
if plugin.Enabled:
enabled = True
@@ -649,7 +649,7 @@ class AnimationPage:
except (AttributeError, NameError, TypeError):
text = widget.get_active_text ()
plugin = self.Context.Plugins['animation']
- setting = plugin.Screens[0][settingName]
+ setting = plugin.Screen[settingName]
value = setting.Value
if len(value) >= 1:
if text: # Handle "chosen animation is in an extension plugin" case
@@ -657,7 +657,7 @@ class AnimationPage:
setting.Value = value
self.Context.Write()
else:
- for setting in plugin.Groups[setting.Group][setting.SubGroup].Screens[0].values():
+ for setting in plugin.Groups[setting.Group][setting.SubGroup].Screen.values():
setting.Reset()
self.Context.Write()
self.AnimationBoxChanged(widget, settingName)
@@ -694,7 +694,7 @@ class AnimationPage:
for boxName, settingName in AnimationSettings.items():
box = self.Builder.get_object(boxName)
- setting = plugin.Screens[0][settingName]
+ setting = plugin.Screen[settingName]
info = setting.Info[1]
itemsByValue = info[1]
items = info[2]
@@ -734,9 +734,9 @@ class EffectPage:
else:
self.SwitcherPlugins[plugin.ShortDesc] = plugin
- setting = plugin.Display['next_key']
+ setting = plugin.Screen['next_key']
self.SwitcherKeySettings[pluginName] = setting
- setting = plugin.Display['prev_key']
+ setting = plugin.Screen['prev_key']
self.ReverseSwitcherKeySettings[pluginName] = setting
@@ -801,7 +801,7 @@ class EffectPage:
# Exception for shift, since it has 2 modes
if plugin.Name == 'shift':
- setting = plugin.Screens[0]['mode']
+ setting = plugin.Screen['mode']
if text.find(_("Cover")) != -1:
setting.Value = 0
@@ -819,7 +819,7 @@ class EffectPage:
except (AttributeError, NameError, TypeError):
text = widget.get_active_text ()
plugin = self.Context.Plugins['cubeaddon']
- setting = plugin.Screens[0]['deformation']
+ setting = plugin.Screen['deformation']
value = setting.Info[2][text]
if value != 0 and not plugin.Enabled:
EnablePlugin(plugin, True)
@@ -834,7 +834,7 @@ class EffectPage:
value = widget.get_value()
plugin = self.Context.Plugins['cube']
# Only change cube opacity on rotate
- setting = plugin.Screens[0]['active_opacity']
+ setting = plugin.Screen['active_opacity']
setting.Value = float(value)
self.Context.Write()
@@ -845,7 +845,7 @@ class EffectPage:
value = widget.get_active()
plugin = self.Context.Plugins['cubeaddon']
- setting = plugin.Screens[0]['reflection']
+ setting = plugin.Screen['reflection']
setting.Value = value
self.Context.Write()
@@ -885,7 +885,7 @@ class EffectPage:
return
plugin = self.Context.Plugins['cube']
- setting = plugin.Screens[0]['active_opacity']
+ setting = plugin.Screen['active_opacity']
value = setting.Value
widget.set_value(int(value))
@@ -896,7 +896,7 @@ class EffectPage:
return
plugin = self.Context.Plugins['cubeaddon']
- setting = plugin.Screens[0]['reflection']
+ setting = plugin.Screen['reflection']
value = setting.Value
widget.set_active(value)
@@ -912,7 +912,7 @@ class EffectPage:
if plugin.Enabled:
if plugin.Name == 'shift':
modes = [_("Cover"), _("Flip")]
- setting = plugin.Screens[0]['mode']
+ setting = plugin.Screen['mode']
mode = modes[setting.Value]
if mode in shortDesc:
box.set_active(i)
@@ -929,7 +929,7 @@ class EffectPage:
return
plugin = self.Context.Plugins['cubeaddon']
- setting = plugin.Screens[0]['deformation']
+ setting = plugin.Screen['deformation']
items = sorted(setting.Info[2].items(), key=ccm.EnumSettingKeyFunc)
for key, value in items:
@@ -976,7 +976,7 @@ class DesktopPage:
settingName = settings[name]
value = widget.get_value()
- self.Context.Plugins['core'].Screens[0][settingName].Value = value
+ self.Context.Plugins['core'].Screen[settingName].Value = value
self.Context.Write()
self.SetDesktopPreview()
@@ -1000,7 +1000,7 @@ class DesktopPage:
plugin.Enabled = True
# exception for cube, since it requires rotate
if plugin.Name == 'cube':
- setting = self.Context.Plugins['core'].Screens[0]['vsize']
+ setting = self.Context.Plugins['core'].Screen['vsize']
setting.Value = 1 # Cube can only use 1 vertical viewport
if 'rotate' in self.Context.Plugins:
EnablePlugin(self.Context.Plugins['rotate'], True)
@@ -1011,8 +1011,8 @@ class DesktopPage:
self.SetDesktopSize()
def SetDesktopPreview(self):
- hsize = self.Context.Plugins['core'].Screens[0]["hsize"].Value
- vsize = self.Context.Plugins['core'].Screens[0]["vsize"].Value
+ hsize = self.Context.Plugins['core'].Screen["hsize"].Value
+ vsize = self.Context.Plugins['core'].Screen["vsize"].Value
self.DesktopPreview.set_value((hsize, vsize))
def SetDesktopSize(self):
@@ -1021,7 +1021,7 @@ class DesktopPage:
for widgetName, settingName in scales.items():
widget = self.Builder.get_object(widgetName)
- setting = self.Context.Plugins['core'].Screens[0][settingName]
+ setting = self.Context.Plugins['core'].Screen[settingName]
widget.set_value(setting.Value)
def FillAppearenceBox(self):
@@ -1099,7 +1099,7 @@ class ZoomPage:
if identifier not in self.Widgets:
plugin = self.Context.Plugins[pluginName]
- setting = plugin.Display[settingName]
+ setting = plugin.Screen[settingName]
widget = ccm.MakeSetting(setting)
container = self.Builder.get_object(containerName)
container.pack_start(widget.EBox, True, True, 0)
@@ -1110,7 +1110,7 @@ class ZoomPage:
self.Widgets[identifier].Read()
available = {}
- for name in ('ezoom', 'zoom', 'mag'):
+ for name in ('ezoom', 'mag'):
if name in self.Context.Plugins:
plugin = self.Context.Plugins[name]
available[name] = plugin
@@ -1120,9 +1120,6 @@ class ZoomPage:
if 'ezoom' in available:
plugin = available['ezoom']
widget.set_active(plugin.Enabled)
- elif 'zoom' in available:
- plugin = available['zoom']
- widget.set_active(plugin.Enabled)
else:
widget.set_sensitive(False)
widget.set_active(False)
@@ -1287,7 +1284,7 @@ class MainWin:
subprocess.Popen(cmd)
# Create a file that indicates wether compiz is enabled or not
- xdg_compiz = GetXdgConfigHome('compiz')
+ xdg_compiz = GetXdgConfigHome('compiz-1')
path = os.path.join(xdg_compiz, 'enable-compiz')
open(path, "w+").close() # touch replacement
@@ -1309,7 +1306,7 @@ class MainWin:
subprocess.Popen(cmd)
# Create a file that indicates compiz is explicitly disabled, so should not be started
- xdg_compiz = GetXdgConfigHome('compiz')
+ xdg_compiz = GetXdgConfigHome('compiz-1')
path = os.path.join(xdg_compiz, 'disable-compiz')
open(path, "w+").close() # touch replacement
