From e4c5ce46cf62d272ad0454c74210b935696e0008 Mon Sep 17 00:00:00 2001 From: Sam Spilsbury Date: Sun, 9 Mar 2008 22:20:12 +0900 Subject: * Prevent compiz-fusion-trouble crash --- Compiz-Fusion-Preferences/compiz-fusion-settings | 32 +++++++++++++++--------- Compiz-Fusion-Troubleshooter/fusion-trouble | 2 +- Compiz-Fusion-Troubleshooter/fusion-trouble.in | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Compiz-Fusion-Preferences/compiz-fusion-settings b/Compiz-Fusion-Preferences/compiz-fusion-settings index 791d012..03a05fd 100755 --- a/Compiz-Fusion-Preferences/compiz-fusion-settings +++ b/Compiz-Fusion-Preferences/compiz-fusion-settings @@ -832,7 +832,7 @@ class Base: if Option[0] != None: # First Disable the Old Option if self.context.Plugins[Option[0]].Display[Option[1]].Value == Edge: - self.context.Plugins[Option[0]].Display[Option[1]].Value = "Disabled" + self.context.Plugins[Option[0]].Display[Option[1]].Value[2] = "Disabled" self.context.Write() OldOptionDisabled = True else: @@ -845,7 +845,7 @@ class Base: # Enable the plugin Conflict = ccm.ActionConflict(Setting, edges = Edge) if Conflict.Resolve(self.GlobalUpdater): - self.context.Plugins[Option[0]].Display[Option[1]].Value = Edge + self.context.Plugins[Option[0]].Display[Option[1]].Value[2] = Edge self.context.Plugins[Option[0]].Enabled = True self.context.Write() break @@ -965,8 +965,8 @@ class Base: NewDecrValue = CurValue + "Button5" for i in self.OBSModifiers: if i[0] == NameOfWidget: - self.plugins[self.pluginnames.index(pluginName)].Display[OptionName].Value = NewIncrValue - self.plugins[self.pluginnames.index(pluginName)].Display[OptionName.replace("_increase", "_decrease")].Value = NewDecrValue + self.plugins[self.pluginnames.index(pluginName)].Display[OptionName] = NewIncrValue + self.plugins[self.pluginnames.index(pluginName)].Display[OptionName.replace("_increase", "_decrease")].Value[1] = NewDecrValue self.context.Write() @@ -1117,15 +1117,15 @@ class Base: self.context.Write() else: - Value = i.Value[0] + Value = i.Value Val = (4000 - (CurrentSpeed * 800)) - Value = int(Val) + Value[0] = int(Val) # We dont want it to be too slow - Value = Value - 2000 + Value[0] = Value[0] - 2000 # Leave it if it hits 100 - if Value < 100: - Value = 100 - i.Value[0] = Value + if Value[0] < 100: + Value[0] = 100 + i.Value = Value self.context.Write() def PluginEnableDisable(self, widget, name, name2=None): @@ -1162,6 +1162,14 @@ class Base: self.context.Write() + def SettingButtonChanged(self, signal, name, settingName, settingType, widget): + if settingType == "Screen": + self.plugins[self.pluginnames.index(name)].Screens[0][settingName].Value[1] = widget.get_text() + else: + plugin.Display[settingName].Value = widget.get_text() + + self.context.Write() + def CreatePluginSetting(self, widgetName, name, sensitive, name2=None): self.Widget = self.gladefile.get_widget(widgetName) self.Widget.set_sensitive(sensitive) @@ -1225,14 +1233,14 @@ class Base: def ActionKeyEdited(self, cell, path, text): keyIter = self.KeyBindingsStore.get_iter(path) settingObject = self.KeyBindingsStore.get_value(keyIter, 3) - settingObject.Value = text + settingObject.Value[0] = text self.context.Write() self.KeyBindingsStore.set_value(keyIter, 2, settingObject.Value) def ActionButtonEdited(self, cell, path, text): mouseIter = self.KeyBindingsStore.get_iter(path) settingObject = self.KeyBindingsStore.get_value(mouseIter, 6) - settingObject.Value = text + settingObject.Value[1] = text self.context.Write() self.KeyBindingsStore.set_value(mouseIter, 5, settingObject.Value) diff --git a/Compiz-Fusion-Troubleshooter/fusion-trouble b/Compiz-Fusion-Troubleshooter/fusion-trouble index 83c7652..206ba66 100755 --- a/Compiz-Fusion-Troubleshooter/fusion-trouble +++ b/Compiz-Fusion-Troubleshooter/fusion-trouble @@ -124,7 +124,7 @@ class fusionWelcome(threading.Thread): print cancel self.Welcome.show_all() - self.Welcome.set_icon("fusion-trouble-icon") + self.Welcome.set_icon_from_file("/usr/local/share/icons/hicolor/scalable/apps/fusion-trouble-icon.svg") self.wait = GladeXML.get_widget("wait") self.bar = GladeXML.get_widget('StartProgress') diff --git a/Compiz-Fusion-Troubleshooter/fusion-trouble.in b/Compiz-Fusion-Troubleshooter/fusion-trouble.in index 89460a6..dec86c8 100755 --- a/Compiz-Fusion-Troubleshooter/fusion-trouble.in +++ b/Compiz-Fusion-Troubleshooter/fusion-trouble.in @@ -124,7 +124,7 @@ class fusionWelcome(threading.Thread): print cancel self.Welcome.show_all() - self.Welcome.set_icon("fusion-trouble-icon") + self.Welcome.set_icon_from_file("@prefix@/share/icons/hicolor/scalable/apps/fusion-trouble-icon.svg") self.wait = GladeXML.get_widget("wait") self.bar = GladeXML.get_widget('StartProgress') -- cgit v1.1