gnue/designer/src/forms/LayoutEditor GridPane.p...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         layout-editor-phantom
Changes by:     Jason Cater <address@hidden>    03/05/21 17:49:45

Modified files:
        designer/src/forms/LayoutEditor: GridPane.py LayoutEditor.py 

Log message:
        more experimentation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/GridPane.py.diff?only_with_tag=layout-editor-phantom&tr1=1.6.2.1&tr2=1.6.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?only_with_tag=layout-editor-phantom&tr1=1.71.2.1&tr2=1.71.2.2&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/LayoutEditor/GridPane.py
diff -c gnue/designer/src/forms/LayoutEditor/GridPane.py:1.5 
gnue/designer/src/forms/LayoutEditor/GridPane.py:1.6
*** gnue/designer/src/forms/LayoutEditor/GridPane.py:1.5        Mon Feb 17 
02:32:51 2003
--- gnue/designer/src/forms/LayoutEditor/GridPane.py    Thu Mar  6 12:18:38 2003
***************
*** 40,61 ****
      self.__showGrids = 1
      self.__instance = instance
      EVT_PAINT(self, self.OnPaint)
!     
      # TODO: Have the sash events resize the form
      self.SetSashVisible(wxSASH_RIGHT,1)
      self.SetSashVisible(wxSASH_BOTTOM,1)
  
    def OnPaint(self, event):
      if self.__showGrids:
        dc = wxPaintDC(self)
        dc.BeginDrawing()
        w, h = self.GetSizeTuple()
        dc.SetPen(wxPen(self.__instance.panelGridColor))
!       for x in range(self.__instance.widgetWidth,w-2, 
self.__instance.widgetWidth):
          dc.DrawLine(x,0,x,h-1)
  
        for y in 
range(self.__instance.widgetHeight,h-2,self.__instance.widgetHeight):
          dc.DrawLine(0,y,w-1,y)
        dc.EndDrawing()
      event.Skip()
  
--- 40,90 ----
      self.__showGrids = 1
      self.__instance = instance
      EVT_PAINT(self, self.OnPaint)
! 
      # TODO: Have the sash events resize the form
      self.SetSashVisible(wxSASH_RIGHT,1)
      self.SetSashVisible(wxSASH_BOTTOM,1)
  
+     EVT_SASH_DRAGGED(self, self.GetId(), self.SashChanged)
+ 
    def OnPaint(self, event):
      if self.__showGrids:
        dc = wxPaintDC(self)
        dc.BeginDrawing()
        w, h = self.GetSizeTuple()
        dc.SetPen(wxPen(self.__instance.panelGridColor))
!       for x in range(self.__instance.widgetWidth,w-3, 
self.__instance.widgetWidth):
          dc.DrawLine(x,0,x,h-1)
  
        for y in 
range(self.__instance.widgetHeight,h-2,self.__instance.widgetHeight):
          dc.DrawLine(0,y,w-1,y)
        dc.EndDrawing()
      event.Skip()
+ 
+   def SashChanged(self, event):
+     w = event.GetDragRect().width
+     h = event.GetDragRect().height
+ 
+     neww = int(w/float(self.__instance.widgetWidth)+.5)
+     newh = int(h/float(self.__instance.widgetHeight)+.5)
+ 
+     layout = self.__instance.instance.rootObject._layout
+ 
+     oldvars = {}
+     newvars = {}
+ 
+     if neww != layout.Char__width:
+       oldvars['Char:width'] = layout.Char__width
+       newvars['Char:width'] = neww
+       layout.Char__width = neww
+     if newh != layout.Char__height:
+       oldvars['Char:height'] = layout.Char__height
+       newvars['Char:height'] = newh
+       layout.Char__height = newh
+ 
+     if oldvars:
+       self.__instance.instance.dispatchEvent('ObjectModified', object=layout,
+                                     originator="Forms::GridPane",
+                                     old=oldvars,
+                                     new=newvars)
  
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.70 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.71
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.70   Fri Apr  4 
21:23:59 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Fri Apr  4 
23:29:23 2003
***************
*** 654,660 ****
  
          if pos:
            for widget in self._currentSelection:
!             if object._type != 'GFPage':
                widget._widgetHandler.relativeMove(*pos)
  
      elif event.KeyCode() == WXK_DELETE and \
--- 654,660 ----
  
          if pos:
            for widget in self._currentSelection:
!             if widget._type != 'GFPage':
                widget._widgetHandler.relativeMove(*pos)
  
      elif event.KeyCode() == WXK_DELETE and \