gnue/designer/src DataSourceEditor.py Instance....

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/22 13:17:14

Modified files:
        designer/src   : DataSourceEditor.py Instance.py 
                         PropertyEditor.py SchemaViewer.py 
                         TriggerEditor.py 
        designer/src/forms: Instance.py LayoutEditor.py 

Log message:
        misc bug fixes due to splitting of forms and base logic; fixed 
background refresh problem with form's layouteditor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/DataSourceEditor.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PropertyEditor.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/SchemaViewer.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TriggerEditor.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/designer/src/DataSourceEditor.py
diff -c gnue/designer/src/DataSourceEditor.py:1.18 
gnue/designer/src/DataSourceEditor.py:1.19
*** gnue/designer/src/DataSourceEditor.py:1.18  Mon Jan 21 18:56:46 2002
--- gnue/designer/src/DataSourceEditor.py       Tue Jan 22 13:17:14 2002
***************
*** 34,40 ****
  import Incubator
  
  class DataSourceEditor(wxPanel):
!   def __init__(self, parentWindow, instance, rootObject):
      wxPanel.__init__(self,parentWindow,-1)
      self.instance = instance
      self.rootObject = instance.rootObject
--- 34,40 ----
  import Incubator
  
  class DataSourceEditor(wxPanel):
!   def __init__(self, instance, rootObject, parentWindow):
      wxPanel.__init__(self,parentWindow,-1)
      self.instance = instance
      self.rootObject = instance.rootObject
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.43 gnue/designer/src/Instance.py:1.44
*** gnue/designer/src/Instance.py:1.43  Tue Jan 22 01:17:03 2002
--- gnue/designer/src/Instance.py       Tue Jan 22 13:17:14 2002
***************
*** 163,202 ****
      self.__objectListeners = [self.visualEditor]
  
  
      self.createTools()
- 
- 
- ##    self.treeEditorWindow = ToolFrame(self, "Object Navigator")
- ##    self.treeEditor = TreeView(self, self.rootObject, self.treeEditorWindow)
- ##    self.treeEditorWindow.finalize()
- ##    self.tree = self.treeEditor # TODO: This needs to be removed
- ##
- ##    self.triggerEditorWindow = ToolFrame(self, "Trigger Editor")
- ##    self.triggerEditor = TriggerEditor(self.triggerEditorWindow, self,
- ##                                       self.rootObject)
- ##    self.triggerEditorWindow.finalize()
- ##
- ##    self.datasourceEditorWindow = ToolFrame(self, "Data Source Editor")
- ##    self.datasourceEditor = DataSourceEditor(self.datasourceEditorWindow,
- ##                                             self, self.rootObject)
- ##    self.datasourceEditorWindow.finalize()
- ##
- ##    self.schemaViewerWindow = ToolFrame(self, "Schema Navigator")
- ##    self.schemaViewer = SchemaViewer(self.schemaViewerWindow,
- ##                                     self, self.rootObject)
- ##    self.schemaViewerWindow.finalize()
- ##
- ##    self.propertyEditorWindow = PropertyToolFrame(self, "Property 
Inspector")
- ##    self.propertyEditor = self.propertyEditorWindow.propertyEditor
- ##    self.propertyEditorWindow.finalize()
- ##
- ##    self.eventEditor = self.propertyEditorWindow.eventEditor
- ##
- 
- ##    self._currentPage = self._pages[0]
- 
- ##    self.tree.Expand(self.rootObject._treeItem)
- 
      self._menubar.lastToolAdded()
  
      self._app.addInstance(self)
--- 163,170 ----
      self.__objectListeners = [self.visualEditor]
  
  
+     # Create the supplemental tools
      self.createTools()
      self._menubar.lastToolAdded()
  
      self._app.addInstance(self)
***************
*** 221,227 ****
  
  
  
!   def addTool(id, title, baseclass):
      window = ToolFrame(self, title)
      control = baseclass(self, self.rootObject, window)
      window.finalize()
--- 189,196 ----
  
  
  
!   def addTool(self, id, title, baseclass):
!     GDebug.printMesg(2,'Adding tool %s [%s]' % (title,id))
      window = ToolFrame(self, title)
      control = baseclass(self, self.rootObject, window)
      window.finalize()
Index: gnue/designer/src/PropertyEditor.py
diff -c gnue/designer/src/PropertyEditor.py:1.20 
gnue/designer/src/PropertyEditor.py:1.21
*** gnue/designer/src/PropertyEditor.py:1.20    Mon Jan 14 15:29:54 2002
--- gnue/designer/src/PropertyEditor.py Tue Jan 22 13:17:14 2002
***************
*** 35,41 ****
  from Incubator import elements
  
  class PropertyEditor (wxPanel):
!   def __init__(self, parent, instance, root):
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
--- 35,41 ----
  from Incubator import elements
  
  class PropertyEditor (wxPanel):
!   def __init__(self, instance, root, parent):
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
***************
*** 471,477 ****
  #
  #
  class EventEditor (wxPanel): 
!   def __init__(self, parent, instance, root):
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
--- 471,477 ----
  #
  #
  class EventEditor (wxPanel): 
!   def __init__(self, instance, root, parent):
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
***************
*** 618,624 ****
      for key in keys: 
        self.objectList.append(nameMap[key])
        self.objectMap[nameMap[key]] = i
!       self.objectCombo.Append(nameMap[key].name) 
        i = i + 1
  
    def inventoryObject(self, object):
--- 618,624 ----
      for key in keys: 
        self.objectList.append(nameMap[key])
        self.objectMap[nameMap[key]] = i
!       self.objectCombo.Append(nameMap[key].name)
        i = i + 1
  
    def inventoryObject(self, object):
Index: gnue/designer/src/SchemaViewer.py
diff -c gnue/designer/src/SchemaViewer.py:1.1 
gnue/designer/src/SchemaViewer.py:1.2
*** gnue/designer/src/SchemaViewer.py:1.1       Mon Jan 21 15:33:48 2002
--- gnue/designer/src/SchemaViewer.py   Tue Jan 22 13:17:14 2002
***************
*** 34,40 ****
  import Incubator
  
  class SchemaViewer(wxPanel):
!   def __init__(self, parentWindow, instance, rootObject):
      wxPanel.__init__(self,parentWindow,-1)
      self.instance = instance
      self.rootObject = instance.rootObject
--- 34,40 ----
  import Incubator
  
  class SchemaViewer(wxPanel):
!   def __init__(self, instance, rootObject, parentWindow):
      wxPanel.__init__(self,parentWindow,-1)
      self.instance = instance
      self.rootObject = instance.rootObject
Index: gnue/designer/src/TriggerEditor.py
diff -c gnue/designer/src/TriggerEditor.py:1.13 
gnue/designer/src/TriggerEditor.py:1.14
*** gnue/designer/src/TriggerEditor.py:1.13     Tue Jan 15 18:12:56 2002
--- gnue/designer/src/TriggerEditor.py  Tue Jan 22 13:17:14 2002
***************
*** 40,46 ****
  
  
  class TriggerEditor (wxPanel):
!   def __init__(self, parent, instance, form):
      width  = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_X )/3)
      height = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_Y )/3)
  
--- 40,46 ----
  
  
  class TriggerEditor (wxPanel):
!   def __init__(self, instance, form, parent):
      width  = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_X )/3)
      height = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_Y )/3)
  
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.3 
gnue/designer/src/forms/Instance.py:1.4
*** gnue/designer/src/forms/Instance.py:1.3     Tue Jan 22 01:17:03 2002
--- gnue/designer/src/forms/Instance.py Tue Jan 22 13:17:14 2002
***************
*** 34,40 ****
  # Tool support...
  from LayoutEditor import LayoutEditor
  from gnue.designer.TreeView import TreeView
! from gnue.designer.PropertyEditor import PropertyToolFrame
  from gnue.designer.TriggerEditor import TriggerEditor
  from gnue.designer.DataSourceEditor import DataSourceEditor
  from gnue.designer.SchemaViewer import SchemaViewer
--- 34,40 ----
  # Tool support...
  from LayoutEditor import LayoutEditor
  from gnue.designer.TreeView import TreeView
! from gnue.designer.PropertyEditor import PropertyEditor
  from gnue.designer.TriggerEditor import TriggerEditor
  from gnue.designer.DataSourceEditor import DataSourceEditor
  from gnue.designer.SchemaViewer import SchemaViewer
***************
*** 94,100 ****
      return LayoutEditor(self, self)
  
  
!   def addTools(self):
      self.addTool('propertyEditor','Property Inspector', PropertyEditor)
      self.addTool('treeEditor','Object Navigator', TreeView)
      self.addTool('triggerEditor','Event Editor', TriggerEditor)
--- 94,100 ----
      return LayoutEditor(self, self)
  
  
!   def createTools(self):
      self.addTool('propertyEditor','Property Inspector', PropertyEditor)
      self.addTool('treeEditor','Object Navigator', TreeView)
      self.addTool('triggerEditor','Event Editor', TriggerEditor)
Index: gnue/designer/src/forms/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor.py:1.1 
gnue/designer/src/forms/LayoutEditor.py:1.2
*** gnue/designer/src/forms/LayoutEditor.py:1.1 Tue Jan 22 01:17:03 2002
--- gnue/designer/src/forms/LayoutEditor.py     Tue Jan 22 13:17:14 2002
***************
*** 76,90 ****
        self._notebookMap[object] = index
        self._notebookMap[index] = object
  
!       self.workspace = wxScrolledWindow(self.notebook, -1, pos=wxPoint(0,0),
           style=wxCLIP_CHILDREN|wxHSCROLL|wxVSCROLL|wxSUNKEN_BORDER)
  
        # TODO: self.workspace needs to have SetScrollbars called with
        # TODO: reasonable values based on size and position of self.panel
!       self.workspace.SetScrollbars(20,20,50,50)
        self.workspace.SetBackgroundColour(self.backcolor)
  
!       self.notebook.AddPage(self.workspace,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
  
--- 76,94 ----
        self._notebookMap[object] = index
        self._notebookMap[index] = object
  
!       self.workspacescroll = wxScrolledWindow(self.notebook, -1,
!          pos=wxPoint(0,0),
           style=wxCLIP_CHILDREN|wxHSCROLL|wxVSCROLL|wxSUNKEN_BORDER)
  
+       self.workspace = wxPanel(self.workspacescroll,-1)
+       self.workspace.SetSize((51*20,51*20))
+ 
        # TODO: self.workspace needs to have SetScrollbars called with
        # TODO: reasonable values based on size and position of self.panel
!       self.workspacescroll.SetScrollbars(20,20,50,50)
        self.workspace.SetBackgroundColour(self.backcolor)
  
!       self.notebook.AddPage(self.workspacescroll,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
  
***************
*** 481,487 ****
      event.Skip()
  
    def OnLeftDown(self, event):
! 
      self.mouseStartX, self.mouseStartY = event.GetPositionTuple()
  
      if not event.ShiftDown():
--- 485,491 ----
      event.Skip()
  
    def OnLeftDown(self, event):
!     pass
      self.mouseStartX, self.mouseStartY = event.GetPositionTuple()
  
      if not event.ShiftDown():