[fusion-commits] A simple settings manager for CompizConfig: Changes to 'master' (10e7908a08fdc1d5cb7a156d719a358fc46fef6f)

marex at server.opencompositing.org marex at server.opencompositing.org
Sat May 17 22:13:05 CEST 2008


New commits:
commit 10e7908a08fdc1d5cb7a156d719a358fc46fef6f
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 17 22:12:57 2008 +0200

    Set default desktop size

commit fa1c1e84a5d892d85beae752ee30945cad7266cf
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 17 22:06:49 2008 +0200

    Updated German translation

commit e38ed11a48a8b43a94c77f5b4d995abe9c9e2d94
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 17 22:04:01 2008 +0200

    Made profile names translatable


 po/de.po                  |   29 ++++++++++++++++++++++-------
 po/simple-ccsm.pot        |   14 +++++++++++++-
 profiles/Advanced.profile |    2 ++
 profiles/Ultimate.profile |    2 ++
 simple-ccsm.in            |   22 ++++++++++++++--------
 5 files changed, 53 insertions(+), 16 deletions(-)


Modified: fusion/compizconfig/simple-ccsm/po/de.po
===================================================================
--- fusion/compizconfig/simple-ccsm/po/de.po
+++ fusion/compizconfig/simple-ccsm/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-ccsm 0.0.1\n"
 "Report-Msgid-Bugs-To: http://bugs.opencompositing.org\n"
-"POT-Creation-Date: 2008-05-17 12:29+0200\n"
+"POT-Creation-Date: 2008-05-17 22:04+0200\n"
 "PO-Revision-Date: 2007-10-09 19:16+0200\n"
 "Last-Translator: Patrick Niklaus <marex at opencompositing.org>\n"
 "Language-Team: Compiz Fusion translators <i18n at lists.compiz-fusion.org>\n"
@@ -16,13 +16,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+# FIXME
+msgid "Minimal"
+msgstr "Minimal"
+
+# FIXME
+msgid "Medium"
+msgstr "Mittel"
+
+# FIXME
+msgid "Advanced"
+msgstr "Erweitert"
+
+# FIXME
+msgid "Ultimate"
+msgstr "Ultimativ"
+
 msgid "Provides a simple desktop environment with very few effects."
 msgstr "Bietet eine schlichte Desktop-Umgebung mit wenigen visuellen Effekten."
 
 msgid ""
 "Provides good balance between attractiveness and moderate performence "
 "requirements."
-msgstr "Bietet dezente Effekte mit gemäßigten Anforderungen an die Rechnerleistung."
+msgstr ""
+"Bietet dezente Effekte mit gemäßigten Anforderungen an die Rechnerleistung."
 
 msgid "Provides more aesthetically pleasing set of effects."
 msgstr "Bietet eine größere Auswahl grafischer Effekte."
@@ -30,8 +47,9 @@ msgstr "Bietet eine größere Auswahl grafischer Effekte."
 msgid ""
 "Provides very advanced and eye-catching set of effects. Requires faster "
 "graphics card."
-msgstr "Bietet eine große Auswahl aufwendiger grafischer Effekte. Eine "
-"schnellere Grafikkarte wird benötigt."
+msgstr ""
+"Bietet eine große Auswahl aufwendiger grafischer Effekte. Eine schnellere "
+"Grafikkarte wird benötigt."
 
 msgid "Enabled"
 msgstr "Aktiviert"
@@ -202,9 +220,6 @@ msgstr "Konfiguriere Compiz mit CompizConfig"
 #~ msgid "gtk-help"
 #~ msgstr "gtk-help"
 
-#~ msgid "Advanced"
-#~ msgstr "Erweitert"
-
 #~ msgid "Close Animation"
 #~ msgstr "Beenden Animation"
 

Modified: fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
===================================================================
--- fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
+++ fusion/compizconfig/simple-ccsm/po/simple-ccsm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.opencompositing.org\n"
-"POT-Creation-Date: 2008-05-17 12:29+0200\n"
+"POT-Creation-Date: 2008-05-17 22:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Minimal"
+msgstr ""
+
+msgid "Medium"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Ultimate"
+msgstr ""
+
 msgid "Provides a simple desktop environment with very few effects."
 msgstr ""
 

Modified: fusion/compizconfig/simple-ccsm/profiles/Advanced.profile
===================================================================
--- fusion/compizconfig/simple-ccsm/profiles/Advanced.profile
+++ fusion/compizconfig/simple-ccsm/profiles/Advanced.profile
@@ -20,6 +20,8 @@ s0_focus_effects = 2;
 
 [core]
 as_active_plugins = core;text;workarounds;thumbnail;imgjpeg;shift;crashhandler;dbus;resize;decoration;svg;place;png;move;regex;cube;animation;scale;rotate;cubeaddon;expo;ezoom;
+s0_hsize = 1
+s0_vsize = 4
 
 [switcher]
 as_next_key = Disabled

Modified: fusion/compizconfig/simple-ccsm/profiles/Ultimate.profile
===================================================================
--- fusion/compizconfig/simple-ccsm/profiles/Ultimate.profile
+++ fusion/compizconfig/simple-ccsm/profiles/Ultimate.profile
@@ -18,6 +18,8 @@ s0_focus_effects = 1;
 
 [core]
 as_active_plugins = core;text;workarounds;thumbnail;imgjpeg;shift;crashhandler;dbus;resize;decoration;svg;wobbly;place;png;move;regex;cube;animation;3d;scale;rotate;cubeaddon;expo;ezoom;
+s0_hsize = 1
+s0_vsize = 4
 
 [switcher]
 as_next_key = Disabled

Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.in
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.in
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.in
@@ -36,9 +36,6 @@ locale.setlocale(locale.LC_ALL, "")
 _ = gettext.gettext
 
 DataDir = '@prefix@/share/simple-ccsm/'
-Profiles = [\
-"Minimal", "Medium", "Advanced", "Ultimate"
-]
 
 # Switcher keybinding
 SwitcherKey = "<Alt>Tab"
@@ -94,6 +91,13 @@ gtk.glade.bindtextdomain("simple-ccsm", "@prefix@/share/locale")
 gettext.bindtextdomain("simple-ccsm", "@prefix@/share/locale")
 gettext.textdomain("simple-ccsm")
 
+Profiles = {\
+_("Minimal"): 'Minimal',
+_("Medium"): 'Medium',
+_("Advanced"): 'Advanced',
+_("Ultimate"): 'Ultimate'
+}
+
 Descriptions = {\
 'Minimal': _("Provides a simple desktop environment with very few effects."),
 'Medium': _("Provides good balance between attractiveness and moderate performence requirements."),
@@ -1009,7 +1013,8 @@ class MainWin:
         self.SetProfile()
 
     def ApplyProfile(self, widget):
-        profile = self.ProfileChooser.get_active_text()
+        text = self.ProfileChooser.get_active_text()
+        profile = Profiles[text]
 
         if profile == _("Default"):
             self.Context.ResetProfile()
@@ -1029,12 +1034,13 @@ class MainWin:
         self.Context.UpdateProfiles()
 
         self.ProfileChooser.append_text(_("Default"))
-        for profile in Profiles:
-            self.ProfileChooser.append_text(profile)
+        profiles = sorted(Profiles.values())
+        for profile in profiles:
+            self.ProfileChooser.append_text(_(profile))
 
         current = self.Context.CurrentProfile.Name or _("Default")
-        if current in Profiles:
-            pos = Profiles.index(current) + 1
+        if current in profiles:
+            pos = profiles.index(current) + 1
             self.ProfileChooser.set_active(pos)
         elif current != _("Default"):
             self.ProfileChooser.prepend_text(current)


More information about the commits mailing list