gnue/gnuef/designer/src GFDesigner.py

[Jason Cater]

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

Modified files:
        gnuef/designer/src: GFDesigner.py 

Log message:
        Added grid to preview pane and fixed other minor problems

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/GFDesigner.py
diff -u gnue/gnuef/designer/src/GFDesigner.py:1.6 
gnue/gnuef/designer/src/GFDesigner.py:1.7
--- gnue/gnuef/designer/src/GFDesigner.py:1.6   Sun Jun 10 22:17:11 2001
+++ gnue/gnuef/designer/src/GFDesigner.py       Mon Jun 11 01:19:12 2001
@@ -242,7 +242,12 @@
 
   def drawPage(self, page): 
 
-    self.panel = wxSashWindow(self.previewPane, -1, pos=wxPoint(10,60))
+    self.panel = GridPane(self, self.previewPane, wxPoint(10,60))
+    self.panelColor = self.panel.GetBackgroundColour()
+    self.panelGridColor = wxColour(self.panelColor.Red()+16,
+                 self.panelColor.Green()+16,    
+                 self.panelColor.Blue()+16)
+
     self.pageNameLabel.SetLabel("Page: %s" % page.name)
 
     UIwxpython.initFont(self.panel)
@@ -282,12 +287,14 @@
 
   def __drawItem(self, object): 
     if self.widgets.has_key(object.getObjectType()): 
-      print self.widgets[object.getObjectType()]
+#      object._widgetContainer = WidgetContainer(self, self.panel) 
       object._widget = self.widgets[object.getObjectType()]\
          (object,self.panel, self.textWidth, self.textHeight, \
           self.widgetWidth, self.widgetHeight, self,initialize=0)
+#      object._widgetContainer.set(object._widget)
       object._widget._object = object
 
+
   def uiEventTrap(self, event): 
     pass
 
@@ -376,7 +383,7 @@
          child._type == 'GFimport-trigger'): 
         triggers.append(child)
       elif isinstance(child, GFObjects.GFPage) or \
-        (isinstance(child, GFImportItem) and 
+        (isinstance(child, GFLibrary.GFImportItem) and 
          child._type == 'GFimport-page'): 
         pages.append(child)
       else: 
@@ -435,29 +442,68 @@
 
 #
 #
-#
-class DesignerToolFrame(wxMDIChildFrame): 
-  def __init__(self, instance, title):
-    wxMDIChildFrame.__init__(self, instance, -1, title)
-    self._instance = instance
-
-
-#
-#
 #
-class FormInfoFrame (DesignerToolFrame):
+class WidgetContainer(wxPanel): 
+  def __init__(self, instance, parent): 
+    wxPanel.__init__(self,parent, -1)
+    self.__instance = instance 
+    self.__hasFocus = 1
+
+  def set(self, object):  
+    self.__object = object
+    w,h = self.__object.widgets[0].GetSizeTuple()
+    x,y = self.__object.widgets[0].GetPositionTuple() 
+    self.SetSize(wxSize(w+8, h+8))
+    self.SetPosition(wxPoint(x-3, y-3))
+
+    EVT_SIZE(object.widgets[0], self.resize)
+#    EVT_PAINT(self, self.OnPaint)
+
+  def gainFocus(self, event):
+    self.__hasFocus = 1
+
+  def loseFocus(self, event):
+    self.__hasFocus = 0 
+
+  def resize(self, event): 
+    w,h = self.__object.widget[0].GetSizeTuple()
+    self.SetSize(wxSize(w+8, h+8))
+
+  def OnPaint(self, event): 
+    dc = wxPaintDC(self)
+    w, h = self.GetSizeTuple()
+    dc.SetPen(wxPen(wxBLUE))
+    dc.DrawRect(0,0,1,1)
+    dc.DrawRect(w-2,0,w-1,1)
+    dc.DrawRect(0,h-2,1,h-1)
+    dc.DrawRect(w-2,h-2,w-1,h-1)
+    dc.SetBrush(wxBrush(self.__instance.panelColor))
+    dc.DrawRect(2,2,w-3,h-3) 
+    event.Skip()
 
-  def __init__(self, instance): 
-    DesignerToolFrame.__init__(self, instance, "Form Info")
 
 #
 #
 #
-class DataSourceFrame (DesignerToolFrame):
-
-  def __init__(self, instance): 
-    DesignerToolFrame.__init__(self, instance, "Data Sources")
-
+class GridPane(wxSashWindow): 
+  def __init__(self, instance, parent, pos): 
+    wxSashWindow.__init__(self, parent, -1, pos=pos) 
+    self.__showGrids = 1
+    self.__instance = instance
+    EVT_PAINT(self, self.OnPaint)
+
+  def OnPaint(self, event): 
+    if self.__showGrids: 
+      dc = wxPaintDC(self)  
+      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)
+    event.Skip()
+    
 
 #
 #