gnue/designer setup.py src/LayoutEditor.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/25 09:12:47

Modified files:
        designer       : setup.py 
        designer/src   : LayoutEditor.py 

Log message:
        Fixed duplicate keyword problem in setup.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/designer/setup.py
diff -u gnue/designer/setup.py:1.3 gnue/designer/setup.py:1.4
--- gnue/designer/setup.py:1.3  Sun Jun 24 12:31:26 2001
+++ gnue/designer/setup.py      Mon Jun 25 09:12:47 2001
@@ -240,10 +240,10 @@
        
               
        packages = ["gnue.designer"],
-       package_dir = {"gnue.designer" : "src"},
-       package_dir = {"gnue.designer.templates" : "templates"},
-       package_dir = {"gnue.designer.templates.forms" : "templates.forms"},
-       package_dir = {"gnue.designer.templates.reports" : "templates.reports"},
+       package_dir = {"gnue.designer" : "src",
+                      "gnue.designer.templates" : "templates",
+                      "gnue.designer.templates.forms" : "templates.forms",
+                      "gnue.designer.templates.reports" : "templates.reports"},
        scripts = ["client/gdesigner"]
        )
 
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.8 
gnue/designer/src/LayoutEditor.py:1.9
--- gnue/designer/src/LayoutEditor.py:1.8       Sun Jun 24 19:59:30 2001
+++ gnue/designer/src/LayoutEditor.py   Mon Jun 25 09:12:47 2001
@@ -401,44 +401,40 @@
       pos = event.GetPositionTuple() 
       self.x, self.y = pos 
  
-
+  #
+  # Resize the current widget.  dx and dy are incremental
+  # resize units. (e.g, (-1,0) means make the widget one 
+  # unit smaller than it currently is.
+  #
   def relativeResize(self, dx, dy): 
-    if dx == -1 and \
-       hasattr(self.object, 'width'):
-      self.object.width = self.object.width - 1 
-      for widget in self.mainWidget.widgets: 
-        w,h = widget.GetSizeTuple()
-        widget.SetSize(wxSize(w-self.instance.gridWidth,h))
-      self.instance._instance.onModifyObject(self.object, __name__, 
-          (('width', self.object.width)))
-    if dx == 1 and \
-       hasattr(self.object, 'width'):
-      self.object.width = self.object.width + 1
-      for widget in self.mainWidget.widgets:
-        w,h = widget.GetSizeTuple()
-        widget.SetSize(wxSize(w+self.instance.gridWidth,h))
-      self.instance._instance.onModifyObject(self.object, __name__, 
-          (('width', self.object.width)))
-    if dy == -1 and \
-       hasattr(self.object, 'height') and \
-       self.object.height > 1: 
-      self.object.height = self.object.height - 1 
-      for widget in self.mainWidget.widgets: 
-        w,h = widget.GetSizeTuple()
-        widget.SetSize(wxSize(w,h-self.instance.gridHeight))
-      self.instance._instance.onModifyObject(self.object, __name__, 
-          (('height', self.object.width)))
-    if dy == 1 and \
-       hasattr(self.object, 'height'):
-      self.object.height = self.object.height + 1 
-      for widget in self.mainWidget.widgets: 
-        w,h = widget.GetSizeTuple()
-        widget.SetSize(wxSize(w,h+self.instance.gridHeight))
-      self.instance._instance.onModifyObject(self.object, __name__, 
-          (('height', self.object.width)))
-    self.recalcBoundaries()
+    if not (dx or dy): 
+      return 0
 
+    nx = dx * self.instance.gridWidth
+    ny = dy * self.instance.gridHeight
 
+    if (self.object.width + dx < 0 or self.object.height + dy < 0): 
+      return 0
+    else: 
+      for widget in self.mainWidget.widgets: 
+        x,y = widget.GetSizeTuple()
+        widget.SetSize(wxSize(x + nx,y + ny))
+      changes = []
+      if dx: 
+        self.object.width = self.object.width + dx
+        changes.append(['width',self.object.width])
+      if dy: 
+        self.object.height = self.object.height + dy
+        changes.append(['height',self.object.height])
+      self.instance._instance.onModifyObject(self.object, __name__, changes)
+      self.recalcBoundaries()
+ 
+
+  #
+  # Move the current widget. dx and dy are increments. 
+  # (e.g., (-1,-2) means move the object up one unit 
+  # and left two units. 
+  #
   def relativeMove(self, dx, dy): 
     if not (dx or dy): 
       return 0
@@ -461,7 +457,10 @@
         changes.append(['y',self.object.y])
       self.instance._instance.onModifyObject(self.object, __name__, changes)
       self.recalcBoundaries()
- 
+
+  # 
+  # Recursively destroy this widget set
+  #
   def Destroy(self): 
     self.highlightBox.Destroy()
     for widget in self.mainWidget.widgets: 
@@ -659,7 +658,23 @@
       if dy: 
         self.object._widgetHandler.relativeMove(0, dy)
     else: 
-      self.xEditor.SetValue(0)
+      self.yEditor.SetValue(0)
+
+  def OnWidthUpdated(self, event): 
+    if hasattr(self.object, 'width'):
+      dw = self.wEditor.GetValue() - self.object.width
+      if dw: 
+        self.object._widgetHandler.relativeResize(dw,0)
+    else: 
+      self.wEditor.SetValue(0)
+
+  def OnHeightUpdated(self, event): 
+    if hasattr(self.object, 'height'):
+      dh = self.hEditor.GetValue() - self.object.height
+      if dh: 
+        self.object._widgetHandler.relativeResize(0,dh)
+    else: 
+      self.hEditor.SetValue(0)
 
   def setCurrentObject(self, object): 
     self.object = object