Mailinglist Archive: opensuse-commit (1421 mails)

< Previous Next >
commit simple-ccsm
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 06 May 2008 01:42:44 +0200
  • Message-id: <20080505234244.9E298678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package simple-ccsm
checked in at Tue May 6 01:42:44 CEST 2008.


--------
--- simple-ccsm/simple-ccsm.changes 2008-04-28 16:14:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/simple-ccsm/simple-ccsm.changes
2008-05-05 14:29:57.908719000 +0200
@@ -1,0 +2,9 @@
+Mon May 5 14:33:56 CEST 2008 - rodrigo@xxxxxxx
+
+- Add simple-ccsm-backports.patch that fixes many GUI glitches
+ (bnc#383345)
+- Updated simple-ccsm-enable-desktop-effects.patch to create/remove
+ a ~/.config/compiz/enable-compiz file so that gnome-wm knows what
+ WM is the preferred one (bnc#381675)
+
+-------------------------------------------------------------------



New:
----
simple-ccsm-backports.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ simple-ccsm.spec ++++++
--- /var/tmp/diff_new_pack.y13480/_old 2008-05-06 01:42:37.000000000 +0200
+++ /var/tmp/diff_new_pack.y13480/_new 2008-05-06 01:42:37.000000000 +0200
@@ -17,12 +17,13 @@
Group: System/X11/Utilities
PreReq: %fillup_prereq
Version: 0.7.4
-Release: 11
-Requires: compiz compiz-fusion-plugins-main compiz-manager
compizconfig-settings-manager python-compizconfig python-xml libcompizconfig
+Release: 15
+Requires: compiz compiz-fusion-plugins-main compiz-manager
compizconfig-settings-manager libcompizconfig python-compizconfig python-xml
Summary: Simple Settings Manager for Compiz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
Source: simple-ccsm-%{version}.tar.bz2
+Patch0: simple-ccsm-backports.patch
Patch1: simple-ccsm-enable-desktop-effects.patch
%py_requires

@@ -37,6 +38,7 @@

%prep
%setup -q -n simple-ccsm-%{version}
+%patch0 -p1
%patch1 -p1

%build
@@ -61,6 +63,12 @@
%{py_sitedir}/*

%changelog
+* Mon May 05 2008 rodrigo@xxxxxxx
+- Add simple-ccsm-backports.patch that fixes many GUI glitches
+ (bnc#383345)
+- Updated simple-ccsm-enable-desktop-effects.patch to create/remove
+ a ~/.config/compiz/enable-compiz file so that gnome-wm knows what
+ WM is the preferred one (bnc#381675)
* Mon Apr 28 2008 rodrigo@xxxxxxx
- Added missing dependency on compiz-fusion-plugins-main and
compizconfig-settings-manager (bnc#382509)

++++++ simple-ccsm-backports.patch ++++++
Common subdirectories: simple-ccsm-0.7.4/images and simple-ccsm-0.7.4.new/images
Only in simple-ccsm-0.7.4: PKG-INFO
Common subdirectories: simple-ccsm-0.7.4/po and simple-ccsm-0.7.4.new/po
Common subdirectories: simple-ccsm-0.7.4/profiles and
simple-ccsm-0.7.4.new/profiles
Only in simple-ccsm-0.7.4: simple-ccsm
diff -u simple-ccsm-0.7.4/simple-ccsm.glade
simple-ccsm-0.7.4.new/simple-ccsm.glade
--- simple-ccsm-0.7.4/simple-ccsm.glade 2008-04-03 21:38:35.000000000 +0530
+++ simple-ccsm-0.7.4.new/simple-ccsm.glade 2008-04-30 21:21:59.000000000
+0530
@@ -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.0 on Thu Mar 27 20:37:37 2008 -->
+<!--Generated with glade3 3.4.2 on Sun Apr 27 15:50:42 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>
@@ -288,6 +288,7 @@
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="EnableAnimationsChanged"/>
+ <signal name="toggled" handler="SetAnimationRating"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -519,6 +520,7 @@
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="EffectPluginChanged"/>
+ <signal name="toggled"
handler="SetEffectRating"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -622,6 +624,7 @@
<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="AppearenceBoxChanged"/>
+ <signal name="changed" handler="SetDesktopLabel"/>
</widget>
</child>
</widget>
@@ -814,6 +817,7 @@
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="ZoomChanged"/>
+ <signal name="toggled"
handler="CheckAccessibility"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -830,6 +834,7 @@
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="ZoomChanged"/>
+ <signal name="toggled"
handler="CheckAccessibility"/>
</widget>
<packing>
<property name="expand">False</property>
diff -u simple-ccsm-0.7.4/simple-ccsm.in simple-ccsm-0.7.4.new/simple-ccsm.in
--- simple-ccsm-0.7.4/simple-ccsm.in 2008-04-03 21:38:35.000000000 +0530
+++ simple-ccsm-0.7.4.new/simple-ccsm.in 2008-04-30 21:21:59.000000000
+0530
@@ -363,6 +363,7 @@
def __init__(self, context, gladeXML):
self.GladeXML = gladeXML
self.Context = context
+ self.DesktopPlugins = {}

# Check List
self.EffectStars = StarScale()
@@ -387,7 +388,7 @@
if "largedesktop" in plugin.Features:
self.DesktopPlugins[plugin.ShortDesc] = plugin

- def SetDesktopLabel(self):
+ def SetDesktopLabel(self, widget=None):
for shortDesc, plugin in self.DesktopPlugins.items():
if plugin.Enabled:
self.DesktopLabel.set_markup(self.DesktopLayout % shortDesc)
@@ -422,9 +423,10 @@
continue
text = box.get_active_text()
setting = plugin.Screens[0][settingName]
- value = setting.Value[0]
- name = names[settingName][value]
- rating += AnimationRatings[name]
+ if len(setting.Value) >= 1:
+ value = setting.Value[0]
+ name = names[settingName][value]
+ rating += AnimationRatings[name]

if not plugin.Enabled:
rating = 0.0
@@ -464,8 +466,12 @@
if self.Block > 0:
return

+ active = widget.get_active()
plugin = self.Context.Plugins['animation']
- EnablePlugin(plugin, widget.get_active())
+ EnablePlugin(plugin, active)
+ for name in ("openAnimationBox", "closeAnimationBox",
"minimizeAnimationBox"):
+ widget = self.GladeXML.get_widget(name)
+ widget.set_sensitive(active)

def AnimationBoxChanged(self, widget):
if self.Block > 0:
@@ -489,11 +495,21 @@
self.AnimationBoxChanged(widget, settingName)

def SetEnableAnimations(self):
- plugin = self.Context.Plugins['animation']
widget = self.GladeXML.get_widget("enableAnimations")
- widget.set_active(plugin.Enabled)
+ active = False
+ if 'animation' in self.Context.Plugins:
+ plugin = self.Context.Plugins['animation']
+ active = plugin.Enabled
+
+ widget.set_active(active)
+ for name in ("openAnimationBox", "closeAnimationBox",
"minimizeAnimationBox"):
+ widget = self.GladeXML.get_widget(name)
+ widget.set_sensitive(active)

def FillAnimationBoxes(self):
+ if 'animation' not in self.Context.Plugins:
+ return
+
plugin = self.Context.Plugins['animation']

for boxName, settingName in AnimationSettings.items():
@@ -503,7 +519,7 @@
SetupBoxModel(box)
for key, value in items:
box.append_text(key)
- if len(setting.Value):
+ if len(setting.Value) >= 1:
value = setting.Value[0]
box.set_active(value)
else:
@@ -525,20 +541,19 @@

def UpdateSwitcherPlugins(self):
self.SwitcherPlugins = {}
+ self.SwitcherKeySettings = {}
for pluginName in ('switcher', 'shift', 'ring'):
if pluginName in self.Context.Plugins:
plugin = self.Context.Plugins[pluginName]
+
if pluginName == 'shift':
self.SwitcherPlugins[_("%s (Cover)") % plugin.ShortDesc] =
plugin
self.SwitcherPlugins[_("%s (Flip)") % plugin.ShortDesc] =
plugin
else:
self.SwitcherPlugins[plugin.ShortDesc] = plugin

- self.SwitcherKeySettings = {}
- for pluginName in ('switcher', 'shift', 'ring'):
- plugin = self.Context.Plugins[pluginName]
- setting = plugin.Display['next_key']
- self.SwitcherKeySettings[pluginName] = setting
+ setting = plugin.Display['next_key']
+ self.SwitcherKeySettings[pluginName] = setting

def EffectPluginChanged(self, widget):
if self.Block > 0:
@@ -605,8 +620,13 @@

for pluginName, widgetName in widgets.items():
widget = self.GladeXML.get_widget(widgetName)
- plugin = self.Context.Plugins[pluginName]
- widget.set_active(plugin.Enabled)
+ active = False
+ if pluginName in self.Context.Plugins:
+ plugin = self.Context.Plugins[pluginName]
+ active = plugin.Enabled
+ else:
+ widget.set_sensitive(False)
+ widget.set_active(active)

def FillSwitcherBox(self):
box = self.GladeXML.get_widget("switcherPluginChooser")
++++++ simple-ccsm-enable-desktop-effects.patch ++++++
--- /var/tmp/diff_new_pack.y13480/_old 2008-05-06 01:42:38.000000000 +0200
+++ /var/tmp/diff_new_pack.y13480/_new 2008-05-06 01:42:38.000000000 +0200
@@ -14,14 +14,6 @@
diff -upr simple-ccsm-0.7.4-orig/simple-ccsm.glade
simple-ccsm-0.7.4/simple-ccsm.glade
--- simple-ccsm-0.7.4-orig/simple-ccsm.glade 2008-04-03 18:08:35.000000000
+0200
+++ simple-ccsm-0.7.4/simple-ccsm.glade 2008-04-15 13:28:05.970646000
+0200
-@@ -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.0 on Thu Mar 27 20:37:37 2008 -->
-+<!--Generated with glade3 3.4.2 on Mon Apr 14 16:44:52 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>
@@ -13,50 +13,73 @@
<property name="border_width">10</property>
<property name="spacing">12</property>
@@ -188,7 +180,7 @@

self.AnimationPage.Update()
self.EffectPage.Update()
-@@ -878,6 +905,31 @@ class MainWin:
+@@ -878,6 +905,34 @@ class MainWin:
self.EdgePage.Update()

self.SetProfile()
@@ -210,9 +202,12 @@
+ if enabled:
+ cmd = CompizStartCommand.split(" ")
+ subprocess.Popen(cmd)
++ os.system("mkdir -p $HOME/.config/compiz")
++ os.system("touch $HOME/.config/compiz/enable-compiz")
+ else:
+ cmd = "metacity --replace".split(" ")
+ subprocess.Popen(cmd)
++ os.system("rm $HOME/.config/compiz/enable-compiz")
+
+ self.Notebook.set_sensitive(enabled)
+ self.ProfileChooser.set_sensitive(enabled)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread