summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Niklaus <marex@compiz-fusion.org>2011-02-25 17:38:13 +0100
committerPatrick Niklaus <marex@compiz-fusion.org>2011-02-25 17:38:13 +0100
commit115754b55b4e6d49e04e7b797d44f052636f4528 (patch)
tree33a560962eb8720143d5789a1a3a46c3ef54c3e2
parenta299c358475a2c90742af4209ffdc7af1121f06b (diff)
downloadsimple-ccsm-115754b55b4e6d49e04e7b797d44f052636f4528.tar.gz
simple-ccsm-115754b55b4e6d49e04e7b797d44f052636f4528.tar.bz2
Updated profiles and profile switching code
-rw-r--r--profiles/Advanced.profile27
-rw-r--r--profiles/Medium.profile11
-rw-r--r--profiles/Minimal.profile12
-rw-r--r--profiles/Ultimate.profile35
-rwxr-xr-xsimple-ccsm.in9
5 files changed, 29 insertions, 65 deletions
diff --git a/profiles/Advanced.profile b/profiles/Advanced.profile
index fa4f1a1..0946021 100644
--- 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;gnomecompat;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
diff --git a/profiles/Medium.profile b/profiles/Medium.profile
index 376ce4d..9578850 100644
--- 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;gnomecompat;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;
+
diff --git a/profiles/Minimal.profile b/profiles/Minimal.profile
index 3fdd4cb..b65f47d 100644
--- 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;gnomecompat;mousepoll;regex;session;ezoom;staticswitcher;wall;
s0_hsize = 2
s0_vsize = 2
diff --git a/profiles/Ultimate.profile b/profiles/Ultimate.profile
index ab1c913..fd84fce 100644
--- 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;gnomecompat;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
diff --git a/simple-ccsm.in b/simple-ccsm.in
index e0708ab..4446189 100755
--- a/simple-ccsm.in
+++ b/simple-ccsm.in
@@ -1376,18 +1376,17 @@ class MainWin:
def ApplyProfile(self, widget):
profile = self.ProfileChooser.get_active_text()
+ self.Context.ResetProfile()
+ self.Context.Read()
- if profile == _("Default"):
- self.Context.ResetProfile()
- elif profile in Profiles:
+ if profile != _("Default")\
+ and profile in Profiles:
profile = Profiles[profile]
profilePath = "%s/profiles/%s.profile" % (DataDir, profile)
self.Context.CurrentProfile = ccs.Profile(self.Context, profile)
- self.Context.Read()
self.Context.UpdateProfiles()
self.Context.Import(profilePath)
-
self.Context.Write()
self.Update()