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

marex at server.opencompositing.org marex at server.opencompositing.org
Sat May 17 14:13:01 CEST 2008


New commits:
commit 86e35d2a2d47f8f146eb8ec0417064d0420be069
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 17 14:12:51 2008 +0200

    Added option to completely disable the application switcher

commit 45e95ec5da58702d9acdf92641b85fdfc746a03b
Author: Patrick Niklaus <marex at opencompositing.org>
Date:   Sat May 17 12:43:21 2008 +0200

    Updated German translation


 po/de.po           |   25 ++++++++++++++++++++++++-
 po/simple-ccsm.pot |   24 +++++++++++++++++++++++-
 simple-ccsm.in     |   50 +++++++++++++++++++++++++++-----------------------
 3 files changed, 74 insertions(+), 25 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-12 18:14+0200\n"
+"POT-Creation-Date: 2008-05-17 12:29+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,6 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+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."
+
+msgid "Provides more aesthetically pleasing set of effects."
+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."
+
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -28,6 +45,9 @@ msgstr "Zoom"
 msgid "Colorfilter"
 msgstr "Farbfilter"
 
+msgid "None"
+msgstr "Keine"
+
 #, c-format
 msgid "%s (Cover)"
 msgstr "%s (Cover)"
@@ -91,6 +111,9 @@ msgstr "<b>Effekte</b>"
 msgid "<b>Enable zoom</b>"
 msgstr "<b>Zoom aktivieren</b>"
 
+msgid "<b>Focus window</b>"
+msgstr "<b>Fenster fokussieren</b>"
+
 msgid "<b>Minimize window</b>"
 msgstr "<b>Fenster minimieren</b>"
 

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-12 18:14+0200\n"
+"POT-Creation-Date: 2008-05-17 12:29+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,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Provides a simple desktop environment with very few effects."
+msgstr ""
+
+msgid ""
+"Provides good balance between attractiveness and moderate performence "
+"requirements."
+msgstr ""
+
+msgid "Provides more aesthetically pleasing set of effects."
+msgstr ""
+
+msgid ""
+"Provides very advanced and eye-catching set of effects. Requires faster "
+"graphics card."
+msgstr ""
+
 msgid "Enabled"
 msgstr ""
 
@@ -28,6 +44,9 @@ msgstr ""
 msgid "Colorfilter"
 msgstr ""
 
+msgid "None"
+msgstr ""
+
 #, c-format
 msgid "%s (Cover)"
 msgstr ""
@@ -87,6 +106,9 @@ msgstr ""
 msgid "<b>Enable zoom</b>"
 msgstr ""
 
+msgid "<b>Focus window</b>"
+msgstr ""
+
 msgid "<b>Minimize window</b>"
 msgstr ""
 

Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.in
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.in
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.in
@@ -39,13 +39,6 @@ DataDir = '@prefix@/share/simple-ccsm/'
 Profiles = [\
 "Minimal", "Medium", "Advanced", "Ultimate"
 ]
-# TODO Write descriptions
-Descriptions = {\
-'Minimal': _("Provides a simple desktop environment with very few effects."),
-'Medium': _("Provides good balance between attractiveness and moderate performence requirements."),
-'Advanced': _("Provides more aesthetically pleasing set of effects."),
-'Ultimate': _("Provides very advanced and eye-catching set of effects. Requires faster graphics card.")
-}
 
 # Switcher keybinding
 SwitcherKey = "<Alt>Tab"
@@ -101,6 +94,13 @@ gtk.glade.bindtextdomain("simple-ccsm", "@prefix@/share/locale")
 gettext.bindtextdomain("simple-ccsm", "@prefix@/share/locale")
 gettext.textdomain("simple-ccsm")
 
+Descriptions = {\
+'Minimal': _("Provides a simple desktop environment with very few effects."),
+'Medium': _("Provides good balance between attractiveness and moderate performence requirements."),
+'Advanced': _("Provides more aesthetically pleasing set of effects."),
+'Ultimate': _("Provides very advanced and eye-catching set of effects. Requires faster graphics card.")
+}
+
 # 0 to 5 stars
 EffectPluginRatings = {\
 'wobbly': 5,
@@ -603,25 +603,27 @@ class EffectPage:
 
         self.Context.Write()
 
-        for shortDesc, plugin in self.SwitcherPlugins.items():
-            if text == shortDesc:
-                EnablePlugin(plugin, True)
+        if not text in self.SwitcherPlugins:
+            return
 
-                # Set default key binding to Alt-Tab
-                setting = self.SwitcherKeySettings[plugin.Name]
-                settings = self.SwitcherKeySettings.values()
-                conflict = ccm.KeyConflict(setting, SwitcherKey, settings=settings, autoResolve=True)
-                if conflict.Resolve(ccm.GlobalUpdater):
-                    setting.Value = SwitcherKey
+        plugin = self.SwitcherPlugins[text]
+        EnablePlugin(plugin, True)
 
-                # Exception for shift, since it has 2 modes
-                if plugin.Name == 'shift':
-                    setting = plugin.Screens[0]['mode']
+        # Set default key binding to Alt-Tab
+        setting = self.SwitcherKeySettings[plugin.Name]
+        settings = self.SwitcherKeySettings.values()
+        conflict = ccm.KeyConflict(setting, SwitcherKey, settings=settings, autoResolve=True)
+        if conflict.Resolve(ccm.GlobalUpdater):
+            setting.Value = SwitcherKey
+
+            # Exception for shift, since it has 2 modes
+            if plugin.Name == 'shift':
+                setting = plugin.Screens[0]['mode']
 
-                    if text.find(_("Cover")) != -1:
-                        setting.Value = 0
-                    elif text.find(_("Flip")) != -1:
-                        setting.Value = 1
+                if text.find(_("Cover")) != -1:
+                    setting.Value = 0
+                elif text.find(_("Flip")) != -1:
+                    setting.Value = 1
 
         self.Context.Write()
 
@@ -715,6 +717,8 @@ class EffectPage:
     def FillSwitcherBox(self):
         box = self.GladeXML.get_widget("switcherPluginChooser")
         SetupBoxModel(box)
+        box.append_text(_("None"))
+        box.set_active(0)
 
         i = 0
         for shortDesc, plugin in self.SwitcherPlugins.items():


More information about the commits mailing list