[pitivi: 51/65] Renamed the private PresetManager.ignore attribute accordingly



commit 2c1306fbcd59bd7b32f42a51914a74c5a683de28
Author: Alex BÄluÈ <alexandru balut gmail com>
Date:   Thu Jun 16 20:58:58 2011 +0200

    Renamed the private PresetManager.ignore attribute accordingly

 pitivi/ui/preset.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py
index f6f088a..81c6093 100644
--- a/pitivi/ui/preset.py
+++ b/pitivi/ui/preset.py
@@ -43,7 +43,7 @@ class PresetManager(object):
         self.widget_map = {}
         self.ordered = gtk.ListStore(str, object)
         self.cur_preset = None
-        self.ignore = False
+        self._ignore_update_requests = False
 
     def _getFilename(self):
         return os.path.join(xdg_data_home(), "pitivi", self.filename)
@@ -144,14 +144,17 @@ class PresetManager(object):
         return self.ordered
 
     def updateValue(self, name, value):
-        if self.cur_preset and not self.ignore:
+        if self._ignore_update_requests:
+            # This is caused by restorePreset, nothing to do.
+            return
+        if self.cur_preset:
             self.presets[self.cur_preset][name] = value
 
     def bindWidget(self, propname, setter_func, getter_func):
         self.widget_map[propname] = (setter_func, getter_func)
 
     def restorePreset(self, preset):
-        self.ignore = True
+        self._ignore_update_requests = True
         if preset is None:
             self.cur_preset = None
             return
@@ -159,9 +162,9 @@ class PresetManager(object):
             return
         values = self.presets[preset]
         self.cur_preset = preset
-        for field, (setter_func, getter_func) in self.widget_map.iteritems():
-            setter_func(values[field])
-        self.ignore = False
+        for field, (setter, getter) in self.widget_map.iteritems():
+            setter(values[field])
+        self._ignore_update_requests = False
 
     def savePreset(self):
         values = self.presets[self.cur_preset]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]