Changeset 3520 for branches/active/0.3.3dev/tools/editor/plugins/ObjectEdit.py

Timestamp:

12/02/10 21:22:45 (2 years ago)

Author:

helios2000

Message:

• Added an additional flag to the Instance. This protects against unintentional change of Instance blocking. ObjectEdit?, Saver and Loader use the flag.

File:

• branches/active/0.3.3dev/tools/editor/plugins/ObjectEdit.py (modified) (5 diffs)

branches/active/0.3.3dev/tools/editor/plugins/ObjectEdit.py

@@ -330 +330 @@
                         x_offset = unicode( 0 )
                         y_offset = unicode( 0 )
-                
+
+                if self._instances[0].isOverrideBlocking():
+                        self.container.findChild(name="override_blocking_toggle")._setMarked(True)
+                else:
+                        self.container.findChild(name="override_blocking_toggle")._setMarked(False)
+
                 self.container.distributeInitialData({
                         'select_rotations'      : self._avail_rotations,
@@ -413 +418 @@
                 @param  widget: pychan widget
                 """
+                self.check_override_blocking()
                 object = self._instances[0].getObject()
                 object_id = object.getId()
@@ -425 +431 @@
 
                 self._object_blocking = int(blocking)
-                self._instance_blocking = int(blocking)
+                self._instance_blocking = int(self._instances[0].isBlocking())
 
                 self.update_gui()
@@ -437 +443 @@
                 @param  widget: pychan widget
                 """
-
+                self.check_override_blocking()
                 instance = self._instances[0]
                 instance.setBlocking(not instance.isBlocking())
@@ -443 +449 @@
 
                 self.update_gui()
+
+        def check_override_blocking(self):
+                instance = self._instances[0]
+                marked = self.container.findChild(name="override_blocking_toggle")._isMarked()
+                if marked:
+                        instance.setOverrideBlocking(True)
+                else:
+                        instance.setOverrideBlocking(False)
 
         def use_user_data(self):