[fusion-commits] A simple settings manager for CompizConfig: Changes to 'master' (66ccae909dc0c807d39e19fe8abfaaf59b0be64f)
marex at server.opencompositing.org
marex at server.opencompositing.org
Mon May 12 18:20:45 CEST 2008
New commits:
commit 66ccae909dc0c807d39e19fe8abfaaf59b0be64f
Author: Patrick Niklaus <marex at opencompositing.org>
Date: Mon May 12 18:20:39 2008 +0200
Updated German translation
commit cda20d7e6d0e1d37856a0f4a198ee5e0e055b466
Author: Patrick Niklaus <marex at opencompositing.org>
Date: Mon May 12 18:14:30 2008 +0200
Added cube effects to effect page
po/de.po | 102 ++++++++++++++++++++++++---------------
po/simple-ccsm.pot | 28 +++++++----
simple-ccsm.glade | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++-
simple-ccsm.in | 109 ++++++++++++++++++++++++++++++++++++++----
4 files changed, 313 insertions(+), 61 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-03-12 13:53+0100\n"
+"POT-Creation-Date: 2008-05-12 18:14+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"
@@ -22,6 +22,12 @@ msgstr "Aktiviert"
msgid "Disabled"
msgstr "Deaktiviert"
+msgid "Zoom"
+msgstr "Zoom"
+
+msgid "Colorfilter"
+msgstr "Farbfilter"
+
#, c-format
msgid "%s (Cover)"
msgstr "%s (Cover)"
@@ -36,21 +42,6 @@ msgstr "Cover"
msgid "Flip"
msgstr "Flip"
-msgid "Profile"
-msgstr "Profil"
-
-msgid "Animations"
-msgstr "Animationen"
-
-msgid "Desktop"
-msgstr "Arbeitsfläche"
-
-msgid "Effects"
-msgstr "Effekte"
-
-msgid "Zoom"
-msgstr "Zoom"
-
msgid "Default"
msgstr "Standard"
@@ -67,9 +58,16 @@ msgstr "<b>Animationen</b>"
msgid "<b>Appearance</b>"
msgstr "<b>Aussehen</b>"
+# FIXME
+msgid "<b>Area zoom</b>"
+msgstr "<b>Gebietszoom</b>"
+
msgid "<b>Close Window</b>"
msgstr "<b>Fenster schließen</b>"
+msgid "<b>Cube Effects</b>"
+msgstr "<b>Desktop-Würfel Effekte</b>"
+
msgid "<b>Description</b>"
msgstr "<b>Beschreibung</b>"
@@ -90,6 +88,9 @@ msgstr "<b>Arbeitsfläche</b>"
msgid "<b>Effects</b>"
msgstr "<b>Effekte</b>"
+msgid "<b>Enable zoom</b>"
+msgstr "<b>Zoom aktivieren</b>"
+
msgid "<b>Minimize window</b>"
msgstr "<b>Fenster minimieren</b>"
@@ -99,29 +100,45 @@ msgstr "<b>Fenster öffnen</b>"
msgid "<b>Screen Edges</b>"
msgstr "<b>Bildschirmecken</b>"
+msgid "<b>Screen zoom</b>"
+msgstr "<b>Bildschrimzoom</b>"
+
msgid "<b>Switcher</b>"
msgstr "<b>Anwendungsumschalter</b>"
-# FIXME
-msgid "<b>Zoom in</b>"
-msgstr "<b>Herein zoomen</b>"
-
-# FIXME
-msgid "<b>Zoom out</b>"
-msgstr "<b>Heraus zoomen</b>"
-
msgid "Accessibility"
msgstr "Barrierefreiheit"
+msgid "Animations"
+msgstr "Animationen"
+
+msgid "Area zoom"
+msgstr "Gebietszoom"
+
+msgid "Deformation:"
+msgstr "Deformation"
+
+msgid "Desktop"
+msgstr "Arbeitsfläche"
+
msgid "Edges"
msgstr "Ecken"
+msgid "Effects"
+msgstr "Effekte"
+
+msgid "Enable 3D Windows"
+msgstr "3D Fenster aktivieren"
+
msgid "Enable Blur"
msgstr "Unschärfe aktivieren"
msgid "Enable Expo"
msgstr "Expo aktivieren"
+msgid "Enable Reflection"
+msgstr "Reflektion aktivieren"
+
msgid "Enable Scale"
msgstr "Scale aktivieren"
@@ -131,23 +148,36 @@ msgstr "Wobbly aktivieren"
msgid "Enable animations"
msgstr "Animationen aktivieren"
-msgid "Enable zoom"
-msgstr "Zoom aktivieren"
-
msgid "Info"
msgstr "Info"
+msgid "Opacity:"
+msgstr "Sichtbarkeit"
+
msgid "Profil:"
msgstr "Profil:"
-msgid "Simple Compiz Config Settings Manager"
-msgstr "Einfacher Compiz Config Einstellungs-Manager"
+msgid "Screen zoom"
+msgstr "Bildschirmzoom"
+
+msgid "Simple CompizConfig Settings Manager"
+msgstr "Einfacher CompizConfig Einstellungs-Manager"
-msgid "gtk-close"
-msgstr "gtk-close"
+msgid "Configure Compiz with CompizConfig"
+msgstr "Konfiguriere Compiz mit CompizConfig"
-msgid "gtk-help"
-msgstr "gtk-help"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+# FIXME
+#~ msgid "<b>Zoom out</b>"
+#~ msgstr "<b>Heraus zoomen</b>"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-help"
+#~ msgstr "gtk-help"
#~ msgid "Advanced"
#~ msgstr "Erweitert"
@@ -178,12 +208,6 @@ msgstr "gtk-help"
#~ "Verändern sie die Einstellungen für sehbehinderte Menschen, indem sie "
#~ "eines dieser Plugins aktivieren."
-#~ msgid "Configure Color Filter"
-#~ msgstr "Farbfilter einstellen"
-
-#~ msgid "Enable Magnification"
-#~ msgstr "Vergrößerung aktivieren"
-
#~ msgid ""
#~ "Please check if you have the filter-manager package installed correctly."
#~ msgstr ""
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-10 20:08+0200\n"
+"POT-Creation-Date: 2008-05-12 18:14+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"
@@ -63,6 +63,9 @@ msgstr ""
msgid "<b>Close Window</b>"
msgstr ""
+msgid "<b>Cube Effects</b>"
+msgstr ""
+
msgid "<b>Description</b>"
msgstr ""
@@ -108,6 +111,9 @@ msgstr ""
msgid "Area zoom"
msgstr ""
+msgid "Deformation:"
+msgstr ""
+
msgid "Desktop"
msgstr ""
@@ -117,12 +123,18 @@ msgstr ""
msgid "Effects"
msgstr ""
+msgid "Enable 3D Windows"
+msgstr ""
+
msgid "Enable Blur"
msgstr ""
msgid "Enable Expo"
msgstr ""
+msgid "Enable Reflection"
+msgstr ""
+
msgid "Enable Scale"
msgstr ""
@@ -135,23 +147,17 @@ msgstr ""
msgid "Info"
msgstr ""
-msgid "Profil:"
-msgstr ""
-
-msgid "Screen zoom"
+msgid "Opacity:"
msgstr ""
-msgid "Simple Compiz Config Settings Manager"
+msgid "Profil:"
msgstr ""
-msgid "gtk-close"
+msgid "Screen zoom"
msgstr ""
-msgid "gtk-help"
+msgid "Simple CompizConfig Settings Manager"
msgstr ""
msgid "Configure Compiz with CompizConfig"
msgstr ""
-
-msgid "Simple CompizConfig Settings Manager"
-msgstr ""
Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.glade
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.glade
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.glade
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.2 on Sun Apr 27 16:57:12 2008 -->
+<!--Generated with glade3 3.4.2 on Mon May 12 17:57:20 2008 -->
<glade-interface>
<widget class="GtkWindow" id="mainWin">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -482,6 +482,136 @@
</packing>
</child>
<child>
+ <widget class="GtkFrame" id="cubeEffectsFrame">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="cubeEffectsAlignment">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="additionsVBox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <widget class="GtkHScale" id="cubeOpacity">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">100 0 100 5 5 0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">GTK_POS_RIGHT</property>
+ <signal name="value_changed" handler="OpacityChanged"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Opacity:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Deformation:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="deformationChooser">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <signal name="changed" handler="DeformationBoxChanged"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="enableReflection">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Enable Reflection</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="EnableReflectionChanged"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="enable3D">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Enable 3D Windows</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="EffectPluginChanged"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="cubeEffectsLabel">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes"><b>Cube Effects</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkFrame" id="additionsFrame">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -584,7 +714,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -628,6 +758,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<signal name="changed" handler="AppearenceBoxChanged"/>
<signal name="changed" handler="SetDesktopLabel"/>
+ <signal name="changed" handler="SetCubeEffects"/>
</widget>
</child>
</widget>
Modified: fusion/compizconfig/simple-ccsm/simple-ccsm.in
===================================================================
--- fusion/compizconfig/simple-ccsm/simple-ccsm.in
+++ fusion/compizconfig/simple-ccsm/simple-ccsm.in
@@ -106,12 +106,12 @@ EffectPluginRatings = {\
'expo': 4,
'blur': 5,
'mblur': 5,
-'3d': 4,
+'3d': 5,
'water': 5,
'firepaint': 4,
'shift': 5,
'scale': 2,
-'cubereflex': 5
+'cubeaddon': 5
}
Pages = {
@@ -560,7 +560,8 @@ class EffectPage:
'enableScale': "scale",
'enableWobbly': "wobbly",
'enableBlur': "blur",
- 'enableExpo': "expo"
+ 'enableExpo': "expo",
+ 'enable3D': "3d"
}
pluginName = effectPlugins[name]
@@ -606,24 +607,93 @@ class EffectPage:
self.Context.Write()
+ def DeformationBoxChanged(self, widget):
+ if self.Block > 0:
+ return
+
+ text = widget.get_active_text()
+ plugin = self.Context.Plugins['cubeaddon']
+ setting = plugin.Screens[0]['deformation']
+ value = setting.Info[2][text]
+ if value != 0 and not plugin.Enabled:
+ EnablePlugin(plugin, True)
+ setting.Value = value
+
+ self.Context.Write()
+
+ def OpacityChanged(self, widget):
+ if self.Block > 0:
+ return
+
+ value = widget.get_value()
+ plugin = self.Context.Plugins['cube']
+ # Only change cube opacity on rotate
+ setting = plugin.Screens[0]['active_opacity']
+ setting.Value = float(value)
+
+ self.Context.Write()
+
+ def EnableReflectionChanged(self, widget):
+ if self.Block > 0:
+ return
+
+ value = widget.get_active()
+ plugin = self.Context.Plugins['cubeaddon']
+ setting = plugin.Screens[0]['reflection']
+ setting.Value = value
+
+ self.Context.Write()
+
def SetEffectPlugins(self):
widgets = {
'scale': "enableScale",
'wobbly': "enableWobbly",
'blur': "enableBlur",
- 'expo': "enableExpo"
+ 'expo': "enableExpo",
+ '3d': "enable3D"
}
for pluginName, widgetName in widgets.items():
widget = self.GladeXML.get_widget(widgetName)
active = False
+ sensitive = False
if pluginName in self.Context.Plugins:
plugin = self.Context.Plugins[pluginName]
active = plugin.Enabled
- else:
- widget.set_sensitive(False)
+ sensitive = True
+ widget.set_sensitive(sensitive)
widget.set_active(active)
+ def SetCubeEffects(self, widget=None):
+ alignment = self.GladeXML.get_widget("cubeEffectsAlignment")
+ sensitive = False
+ if 'cube' in self.Context.Plugins:
+ plugin = self.Context.Plugins['cube']
+ sensitive = plugin.Enabled
+ alignment.set_sensitive(sensitive)
+
+ def SetOpacity(self):
+ widget = self.GladeXML.get_widget("cubeOpacity")
+
+ if not 'cube' in self.Context.Plugins:
+ return
+
+ plugin = self.Context.Plugins['cube']
+ setting = plugin.Screens[0]['active_opacity']
+ value = setting.Value
+ widget.set_value(int(value))
+
+ def SetReflection(self):
+ widget = self.GladeXML.get_widget("enableReflection")
+
+ if not 'cubeaddon' in self.Context.Plugins:
+ return
+
+ plugin = self.Context.Plugins['cubeaddon']
+ setting = plugin.Screens[0]['reflection']
+ value = setting.Value
+ widget.set_active(value)
+
def FillSwitcherBox(self):
box = self.GladeXML.get_widget("switcherPluginChooser")
SetupBoxModel(box)
@@ -636,17 +706,37 @@ class EffectPage:
modes = [_("Cover"), _("Flip")]
setting = plugin.Screens[0]['mode']
mode = modes[setting.Value]
- if shortDesc.find(mode) != -1:
+ if mode in shortDesc:
box.set_active(i)
else:
box.set_active(i)
i += 1
+ def FillDeformationBox(self):
+ box = self.GladeXML.get_widget("deformationChooser")
+ SetupBoxModel(box)
+
+ if not 'cubeaddon' in self.Context.Plugins:
+ box.set_sensitive(False)
+ return
+
+ plugin = self.Context.Plugins['cubeaddon']
+ setting = plugin.Screens[0]['deformation']
+
+ items = sorted(setting.Info[2].items(), key=ccm.EnumSettingKeyFunc)
+ for key, value in items:
+ box.append_text(key)
+ box.set_active(setting.Value)
+
def Update(self):
self.Block += 1
self.SetEffectPlugins()
+ self.SetCubeEffects()
+ self.SetOpacity()
+ self.SetReflection()
self.UpdateSwitcherPlugins()
self.FillSwitcherBox()
+ self.FillDeformationBox()
self.Block -= 1
class DesktopPage:
@@ -704,6 +794,7 @@ class DesktopPage:
setting = self.Context.Plugins['core'].Screens[0]['vsize']
setting.Value = 1 # Cube can only use 1 vertical viewport
EnablePlugin(self.Context.Plugins['rotate'], True)
+ EnablePlugin(self.Context.Plugins['cubeaddon'], True)
self.Context.Write()
self.SetDesktopSize()
@@ -874,8 +965,8 @@ class MainWin:
# Pages
self.AnimationPage = AnimationPage(self.Context, self.GladeXML)
- self.EffectPage = EffectPage(self.Context, self.GladeXML)
self.DesktopPage = DesktopPage(self.Context, self.GladeXML)
+ self.EffectPage = EffectPage(self.Context, self.GladeXML)
self.ZoomPage = ZoomPage(self.Context, self.GladeXML)
self.ProfilePage = ProfilePage(self.Context, self.GladeXML)
self.EdgePage = EdgePage(self.Context, self.GladeXML)
@@ -887,8 +978,8 @@ class MainWin:
self.Context.Read()
self.AnimationPage.Update()
- self.EffectPage.Update()
self.DesktopPage.Update()
+ self.EffectPage.Update()
self.ZoomPage.Update()
self.ProfilePage.Update()
self.EdgePage.Update()
More information about the commits
mailing list