gnue/designer/src MenuBar.py PropertyEditor.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/12 11:53:26

Modified files:
        designer/src   : MenuBar.py PropertyEditor.py 

Log message:
        Fixed problem with Reorder by Location when hidden fields are present; 
made property editor not display deprecated attributes unless user is already 
using the deprecated attribute (keeps new forms from using deprecated stuff)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/MenuBar.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/PropertyEditor.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue/designer/src/MenuBar.py
diff -u gnue/designer/src/MenuBar.py:1.9 gnue/designer/src/MenuBar.py:1.10
--- gnue/designer/src/MenuBar.py:1.9    Wed Jul 11 11:41:34 2001
+++ gnue/designer/src/MenuBar.py        Thu Jul 12 11:53:26 2001
@@ -233,7 +233,7 @@
     self.object._children = []
     # First, add back hidden objects all 
     for object in hiddenObjects:
-#      self.object._children.append(object)
+      self.object._children.append(object)
       self.instance.onCreateObject(object, __name__)
 
     # Now, add hidden objects
Index: gnue/designer/src/PropertyEditor.py
diff -u gnue/designer/src/PropertyEditor.py:1.10 
gnue/designer/src/PropertyEditor.py:1.11
--- gnue/designer/src/PropertyEditor.py:1.10    Wed Jul  4 17:30:55 2001
+++ gnue/designer/src/PropertyEditor.py Thu Jul 12 11:53:26 2001
@@ -74,27 +74,36 @@
       self.rowList.sort()
       i = 0
       for key in self.rowList: 
-        self.grid.SetRowLabelValue(i, string.upper(key[0]) + 
string.lower(key[1:]))
-
-        if self.attributes[key].has_key('ValueSet'): 
-          self.grid.SetCellEditor(i, 0, 
RestrictedCellEditor(self.attributes[key]))
-        elif self.attributes[key]['Typecast'] == GTypecast.boolean: 
-          self.grid.SetCellEditor(i, 0, BoolCellEditor(self.attributes[key]))
-        elif self.attributes[key]['Typecast'] in (GTypecast.integer, 
-                GTypecast.number, GTypecast.whole):
-          self.grid.SetCellEditor(i, 0, IntCellEditor(self.attributes[key]))
-        else: 
-          self.grid.SetCellEditor(i, 0, CharCellEditor(self.attributes[key]))
 
-        if hasattr(object, key): 
-          if self.attributes[key]['Typecast'] == GTypecast.boolean:
-            if object.__dict__[key]:    
-              self.grid.SetCellValue(i,0,"TRUE")
-            else: 
-              self.grid.SetCellValue(i,0,"FALSE")
+        # Only show properties for nondeprecated values (unless set)
+        if not (self.attributes[key].has_key ('Deprecated') and \
+                self.attributes[key]['Deprecated'] and \
+                (not hasattr(object, key) or \
+                   (self.attributes[key].has_key('Default') and \
+                    object.__dict__[key] == self.attributes[key]['Default'] )
+                ) ): 
+
+          self.grid.SetRowLabelValue(i, string.upper(key[0]) + 
string.lower(key[1:]))
+
+          if self.attributes[key].has_key('ValueSet'): 
+            self.grid.SetCellEditor(i, 0, 
RestrictedCellEditor(self.attributes[key]))
+          elif self.attributes[key]['Typecast'] == GTypecast.boolean: 
+            self.grid.SetCellEditor(i, 0, BoolCellEditor(self.attributes[key]))
+          elif self.attributes[key]['Typecast'] in (GTypecast.integer, 
+                  GTypecast.number, GTypecast.whole):
+            self.grid.SetCellEditor(i, 0, IntCellEditor(self.attributes[key]))
           else: 
-            self.grid.SetCellValue(i,0, "%s" % object.__dict__[key])
-        i = i + 1
+            self.grid.SetCellEditor(i, 0, CharCellEditor(self.attributes[key]))
+  
+          if hasattr(object, key): 
+            if self.attributes[key]['Typecast'] == GTypecast.boolean:
+              if object.__dict__[key]:    
+                self.grid.SetCellValue(i,0,"TRUE")
+              else: 
+                self.grid.SetCellValue(i,0,"FALSE")
+            else: 
+              self.grid.SetCellValue(i,0, "%s" % object.__dict__[key])
+          i = i + 1
       self.onSize(None)
       EVT_GRID_CELL_CHANGE(self.grid, self.OnCellChange)
 
@@ -387,6 +396,10 @@
     EVT_SIZE(self, self.onSize)
 
   def onSetCurrentObject (self, object, handler):
+
+    # Until this works!
+    return
+
     if object == None: 
       return
     if handler != __name__:
@@ -418,9 +431,17 @@
       EVT_GRID_CELL_CHANGE(self.grid, self.OnCellChange)
 
   def onCreateObject (self, object, handler):
+
+    # Until this works!
+    return
+
     pass
 
   def onModifyObject (self, object, handler, modifications):
+
+    # Until this works!
+    return
+
     if object == None: 
       return
     if handler != __name__ and self.object == object:
@@ -429,6 +450,10 @@
       self.onSetCurrentObject(object, handler)
 
   def onDeleteObject (self, object, handler):
+
+    # Until this works!
+    return
+
     if object == None: 
       return
     if handler != __name__: