gnue/designer/src Debugger.py Instance.py Layou...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/14 15:29:54

Modified files:
        designer/src   : Debugger.py Instance.py LayoutEditor.py 
                         MenuBar.py PopupMenu.py PropertyEditor.py 

Log message:
        renamed reference to the parent form from _form to rootObject

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Debugger.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/LayoutEditor.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/MenuBar.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PopupMenu.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/PropertyEditor.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: gnue/designer/src/Debugger.py
diff -c gnue/designer/src/Debugger.py:1.4 gnue/designer/src/Debugger.py:1.5
*** gnue/designer/src/Debugger.py:1.4   Mon Nov 19 10:04:24 2001
--- gnue/designer/src/Debugger.py       Mon Jan 14 15:29:54 2002
***************
*** 50,56 ****
        self._saveexit = sys.exit
        sys.exit = self.debugClosing
        debugInstance = DebugInstance(caller._app)
!       
debugInstance.setForm(GFParser.loadForm(StringIO(caller._form.dumpXML(treeDump=1)),
 debugInstance))
        debugInstance.activate()
        debugInstance._ui._debuginstance = self
      except: 
--- 50,56 ----
        self._saveexit = sys.exit
        sys.exit = self.debugClosing
        debugInstance = DebugInstance(caller._app)
!       
debugInstance.setForm(GFParser.loadForm(StringIO(caller.rootObject.dumpXML(treeDump=1)),
 debugInstance))
        debugInstance.activate()
        debugInstance._ui._debuginstance = self
      except: 
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.38 gnue/designer/src/Instance.py:1.39
*** gnue/designer/src/Instance.py:1.38  Mon Jan 14 01:17:10 2002
--- gnue/designer/src/Instance.py       Mon Jan 14 15:29:54 2002
***************
*** 107,113 ****
        else:
          self.__loadForm(location)
  
!     self._form.name = "Form"
  
      self.CreateStatusBar()
      self.SetStatusText('Waddaya mean "Baa! B-Baa! ! Baa!"?...."Sheep ya dern 
fool!"')
--- 107,113 ----
        else:
          self.__loadForm(location)
  
!     self.rootObject.name = "Form"
  
      self.CreateStatusBar()
      self.SetStatusText('Waddaya mean "Baa! B-Baa! ! Baa!"?...."Sheep ya dern 
fool!"')
***************
*** 119,130 ****
  #    vsplitter = wxSplitterWindow (self, -1, style=wxSP_3D|wxNO_3D)
  #    vsplitter.SetMinimumPaneSize (100)
  
!     self._form.walk(self.inventoryLoadedItems)
  
      # Create our tools
      self.objectListeners = ()
  
! #    self.tree = TreeView(self, self._form, vsplitter)
  
  #    self.layoutEditorWindow = ToolFrame(self, "Layout Editor")
      self.layoutEditorWindow = self
--- 119,130 ----
  #    vsplitter = wxSplitterWindow (self, -1, style=wxSP_3D|wxNO_3D)
  #    vsplitter.SetMinimumPaneSize (100)
  
!     self.rootObject.walk(self.inventoryLoadedItems)
  
      # Create our tools
      self.objectListeners = ()
  
! #    self.tree = TreeView(self, self.rootObject, vsplitter)
  
  #    self.layoutEditorWindow = ToolFrame(self, "Layout Editor")
      self.layoutEditorWindow = self
***************
*** 135,146 ****
  #    self.layoutEditorWindow.finalize()
  
      self.treeEditorWindow = ToolFrame(self, "Object Navigator")
!     self.treeEditor = TreeView(self, self._form, self.treeEditorWindow)
      self.treeEditorWindow.finalize()
      self.tree = self.treeEditor # TODO: This needs to be removed
  
      self.triggerEditorWindow = ToolFrame(self, "Event Editor")
!     self.triggerEditor = TriggerEditor(self.triggerEditorWindow, self, 
self._form)
      self.triggerEditorWindow.finalize()
  
      self.propertyEditorWindow = PropertyToolFrame(self, "Property Inspector")
--- 135,146 ----
  #    self.layoutEditorWindow.finalize()
  
      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, "Event Editor")
!     self.triggerEditor = TriggerEditor(self.triggerEditorWindow, self, 
self.rootObject)
      self.triggerEditorWindow.finalize()
  
      self.propertyEditorWindow = PropertyToolFrame(self, "Property Inspector")
***************
*** 163,169 ****
  #    vsplitter.SetSashPosition (
  #        RuntimeSettings.getint(self.runtime_section, 'vsash', 170), true)
  #    self.vsplitter = vsplitter
!     self.tree.Expand(self._form._treeItem)
  
      self._menubar.lastToolAdded()
  
--- 163,169 ----
  #    vsplitter.SetSashPosition (
  #        RuntimeSettings.getint(self.runtime_section, 'vsash', 170), true)
  #    self.vsplitter = vsplitter
!     self.tree.Expand(self.rootObject._treeItem)
  
      self._menubar.lastToolAdded()
  
***************
*** 182,188 ****
         RuntimeSettings.getint(self.runtime_section, 'x', -1),
         RuntimeSettings.getint(self.runtime_section, 'y', -1)))
  
!     self.onSetCurrentObject(self._form, __name__)
  
      self.Refresh()
  
--- 182,188 ----
         RuntimeSettings.getint(self.runtime_section, 'x', -1),
         RuntimeSettings.getint(self.runtime_section, 'y', -1)))
  
!     self.onSetCurrentObject(self.rootObject, __name__)
  
      self.Refresh()
  
***************
*** 203,217 ****
      self._app.mru.addLocation(location)
  
    def __loadFormFromBuffer(self, fileHandle):
!     self._form = GFParser.loadForm (fileHandle, self, initialize=0)
  
    def __createEmptyForm(self):
!     self._form = GFForm.GFForm()
!     options = GFObjects.GFOptions(self._form)
!     self._form.title = "Untitled Form"
!     self._form.height = 12
!     self._form.width = 40
!     page = GFObjects.GFPage(self._form)
      GFObjects.GFBlock(page)
      self.makeClean()
      self._isNew = 1
--- 203,217 ----
      self._app.mru.addLocation(location)
  
    def __loadFormFromBuffer(self, fileHandle):
!     self.rootObject = GFParser.loadForm (fileHandle, self, initialize=0)
  
    def __createEmptyForm(self):
!     self.rootObject = GFForm.GFForm()
!     options = GFObjects.GFOptions(self.rootObject)
!     self.rootObject.title = "Untitled Form"
!     self.rootObject.height = 12
!     self.rootObject.width = 40
!     page = GFObjects.GFPage(self.rootObject)
      GFObjects.GFBlock(page)
      self.makeClean()
      self._isNew = 1
***************
*** 259,265 ****
    # until it is useful to us
    def inventoryLoadedItems (self, object):
  
!     if object != self._form:
        if hasattr(object, 'name'):
          if (object.name == None or ( \
              object.name[:3] == "__<" and \
--- 259,265 ----
    # until it is useful to us
    def inventoryLoadedItems (self, object):
  
!     if object != self.rootObject:
        if hasattr(object, 'name'):
          if (object.name == None or ( \
              object.name[:3] == "__<" and \
***************
*** 268,274 ****
          self.nameMappings[object.name] = object
  
      if isinstance(object, GFObjects.GFPage) and \
!         object._parent == self._form:
        self._pages.append(object)
  
      object._popupMenu = ObjectMenu(self, object)
--- 268,274 ----
          self.nameMappings[object.name] = object
  
      if isinstance(object, GFObjects.GFPage) and \
!         object._parent == self.rootObject:
        self._pages.append(object)
  
      object._popupMenu = ObjectMenu(self, object)
***************
*** 300,306 ****
      while i < len(object._parent._children) and \
         object._parent._children[i] != object:
        i = i + 1
!     if object._parent._children[i] == object: 
        object._parent._children.pop(i)
  
      self.makeDirty()
--- 300,306 ----
      while i < len(object._parent._children) and \
         object._parent._children[i] != object:
        i = i + 1
!     if object._parent._children[i] == object:
        object._parent._children.pop(i)
  
      self.makeDirty()
***************
*** 346,352 ****
      pages = []
      other = []
  
!     for child in self._form._children:
        if isinstance(child, GFObjects.GFOptions):
          options.append(child)
        elif isinstance(child, GFLibrary.GFImport):
--- 346,352 ----
      pages = []
      other = []
  
!     for child in self.rootObject._children:
        if isinstance(child, GFObjects.GFOptions):
          options.append(child)
        elif isinstance(child, GFLibrary.GFImport):
***************
*** 368,386 ****
  
  
      # Reorder the children so items of same class are grouped
!     self._form._children = []
      for child in options:
!       self._form._children.append(child)
      for child in imports:
!       self._form._children.append(child)
      for child in datasources:
!       self._form._children.append(child)
      for child in triggers:
!       self._form._children.append(child)
      for child in pages:
!       self._form._children.append(child)
      for child in other:
!       self._form._children.append(child)
  
      fileHandle = open(location,'w')
      if sys.getdefaultencoding() == 'ascii':
--- 368,386 ----
  
  
      # Reorder the children so items of same class are grouped
!     self.rootObject._children = []
      for child in options:
!       self.rootObject._children.append(child)
      for child in imports:
!       self.rootObject._children.append(child)
      for child in datasources:
!       self.rootObject._children.append(child)
      for child in triggers:
!       self.rootObject._children.append(child)
      for child in pages:
!       self.rootObject._children.append(child)
      for child in other:
!       self.rootObject._children.append(child)
  
      fileHandle = open(location,'w')
      if sys.getdefaultencoding() == 'ascii':
***************
*** 392,398 ****
      fileHandle.write('<!--  %s (%s)\n      Saved on: %s  -->\n\n' \
         % (TITLE, VERSION, \
            time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(time.time()))))
!     fileHandle.write(self._form.dumpXML(treeDump=1))
      fileHandle.close()
  
      self.makeClean()
--- 392,398 ----
      fileHandle.write('<!--  %s (%s)\n      Saved on: %s  -->\n\n' \
         % (TITLE, VERSION, \
            time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(time.time()))))
!     fileHandle.write(self.rootObject.dumpXML(treeDump=1))
      fileHandle.close()
  
      self.makeClean()
Index: gnue/designer/src/LayoutEditor.py
diff -c gnue/designer/src/LayoutEditor.py:1.30 
gnue/designer/src/LayoutEditor.py:1.31
*** gnue/designer/src/LayoutEditor.py:1.30      Tue Nov 20 14:53:01 2001
--- gnue/designer/src/LayoutEditor.py   Mon Jan 14 15:29:54 2002
***************
*** 37,43 ****
      wxPanel.__init__(self,parentWindow,-1)
      self.panelColor = self.GetBackgroundColour()
      self._instance = instance
!     self._form = instance._form
      self._app = instance._app
      self.widgets = {}
      self.widgets.update(UIwxpython.WIDGETS)
--- 37,43 ----
      wxPanel.__init__(self,parentWindow,-1)
      self.panelColor = self.GetBackgroundColour()
      self._instance = instance
!     self.rootObject = instance.rootObject
      self._app = instance._app
      self.widgets = {}
      self.widgets.update(UIwxpython.WIDGETS)
***************
*** 57,63 ****
      self.positionMappings = {}
      self.widgetList = []
  
!     instance._form.walk (self.inventoryObject)
  
  
    def inventoryObject(self, object): 
--- 57,63 ----
      self.positionMappings = {}
      self.widgetList = []
  
!     instance.rootObject.walk (self.inventoryObject)
  
  
    def inventoryObject(self, object): 
***************
*** 145,151 ****
          if page: 
            self._setCurrentPage(page)
          
!       if object in (self._form, self.page) or object in self.widgetList: 
          self.refreshPage(self.page)
  
  
--- 145,151 ----
          if page: 
            self._setCurrentPage(page)
          
!       if object in (self.rootObject, self.page) or object in self.widgetList: 
          self.refreshPage(self.page)
  
  
***************
*** 206,213 ****
        self.borderPercentage = (int(GConfig.get('borderPercentage')) / 100.0)
        self.textPercentage = (int(GConfig.get('textPercentage')) / 100.0)
  
!       width = self._form.width
!       height = self._form.height
  
        self.widgetWidth = (self.charWidth * self.borderPercentage)
        self.widgetHeight = (self.charHeight * self.borderPercentage) + 3
--- 206,213 ----
        self.borderPercentage = (int(GConfig.get('borderPercentage')) / 100.0)
        self.textPercentage = (int(GConfig.get('textPercentage')) / 100.0)
  
!       width = self.rootObject.width
!       height = self.rootObject.height
  
        self.widgetWidth = (self.charWidth * self.borderPercentage)
        self.widgetHeight = (self.charHeight * self.borderPercentage) + 3
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.14 gnue/designer/src/MenuBar.py:1.15
*** gnue/designer/src/MenuBar.py:1.14   Mon Nov 26 12:40:32 2001
--- gnue/designer/src/MenuBar.py        Mon Jan 14 15:29:54 2002
***************
*** 98,104 ****
       EVT_MENU (frame, ID_CLOSE, frame.OnClose)
       EVT_MENU (frame, ID_EXIT, frame._app.OnExit)
  
!     
       # Set up out MRU list
       frame._app.mru.addMenu(self._fileRecent, frame)
  
--- 98,104 ----
       EVT_MENU (frame, ID_CLOSE, frame.OnClose)
       EVT_MENU (frame, ID_EXIT, frame._app.OnExit)
  
! 
       # Set up out MRU list
       frame._app.mru.addMenu(self._fileRecent, frame)
  
***************
*** 113,119 ****
       self._file.Enable(ID_RELOAD,0)
  
       self._help = wxMenu()
!      self._help.Append(ID_ABOUT, "&About...", "More information about GNUe 
Forms Designer")
       EVT_MENU (frame, ID_ABOUT, frame._app.OnAbout)
  
       self._edit = wxMenu()
--- 113,119 ----
       self._file.Enable(ID_RELOAD,0)
  
       self._help = wxMenu()
!      self._help.Append(ID_ABOUT, "&About...", "More information about GNUe 
Designer")
       EVT_MENU (frame, ID_ABOUT, frame._app.OnAbout)
  
       self._edit = wxMenu()
***************
*** 152,157 ****
--- 152,158 ----
      self._window.AppendItem(toolFrame._menu)
      EVT_MENU(self._frame, toolFrame._wxMenuID, toolFrame.OnMenuSelected)
  
+     
    def lastToolAdded(self):
     self._window.AppendSeparator()
  
Index: gnue/designer/src/PopupMenu.py
diff -c gnue/designer/src/PopupMenu.py:1.8 gnue/designer/src/PopupMenu.py:1.9
*** gnue/designer/src/PopupMenu.py:1.8  Tue Nov 20 11:28:46 2001
--- gnue/designer/src/PopupMenu.py      Mon Jan 14 15:29:54 2002
***************
*** 121,141 ****
    def OnCreateObject(self, event):
      tag = self._newMap[event.GetId()]
      GDebug.printMesg(4,'Creating object %s with id %s'%(tag, event.GetId()))
!     Incubator.createObject(self.__instance, self.__instance._form, tag, 
        parentHint=self._object, 
        attributes=hasattr(self,'x') and {'x': self.x, 'y': self.y} or {} )
  
    def OnCreateDataSource(self, event):
!     Incubator.createObject(self.__instance, self.__instance._form, 
'datasource')
  
    def OnCreateNamedTrigger(self, event):
!     Incubator.createObject(self.__instance, self.__instance._form, 'trigger')
  
    def OnCreatePage(self, event):
!     Incubator.createObject(self.__instance, self.__instance._form, 'page')
  
    def OnDeleteObject(self, event):
!     Incubator.deleteObject(self.__instance, self.__instance._form, 
self._object)
  
    def OnReorderLayout(self, event):
      unqId = 0 
--- 121,141 ----
    def OnCreateObject(self, event):
      tag = self._newMap[event.GetId()]
      GDebug.printMesg(4,'Creating object %s with id %s'%(tag, event.GetId()))
!     Incubator.createObject(self.__instance, self.__instance.rootObject, tag,
        parentHint=self._object, 
        attributes=hasattr(self,'x') and {'x': self.x, 'y': self.y} or {} )
  
    def OnCreateDataSource(self, event):
!     Incubator.createObject(self.__instance, self.__instance.rootObject, 
'datasource')
  
    def OnCreateNamedTrigger(self, event):
!     Incubator.createObject(self.__instance, self.__instance.rootObject, 
'trigger')
  
    def OnCreatePage(self, event):
!     Incubator.createObject(self.__instance, self.__instance.rootObject, 
'page')
  
    def OnDeleteObject(self, event):
!     Incubator.deleteObject(self.__instance, self.__instance.rootObject, 
self._object)
  
    def OnReorderLayout(self, event):
      unqId = 0 
Index: gnue/designer/src/PropertyEditor.py
diff -c gnue/designer/src/PropertyEditor.py:1.19 
gnue/designer/src/PropertyEditor.py:1.20
*** gnue/designer/src/PropertyEditor.py:1.19    Thu Dec 20 22:53:21 2001
--- gnue/designer/src/PropertyEditor.py Mon Jan 14 15:29:54 2002
***************
*** 35,47 ****
  from Incubator import elements
  
  class PropertyEditor (wxPanel):
!   def __init__(self, parent, instance, form):
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
      self.parent = parent
      self.instance = instance
!     self.form = form
      self.object = None
      self.objectList = []
      self.objectMap = {}
--- 35,47 ----
  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))
  
      self.parent = parent
      self.instance = instance
!     self.rootObject = root
      self.object = None
      self.objectList = []
      self.objectMap = {}
***************
*** 62,68 ****
      if handler != __name__:
        self.object = object
  
!       try:       
          self.attributes = 
elements[string.lower(object.getObjectType()[2:])]['Attributes']
        except KeyError:
          self.attributes = {}
--- 62,68 ----
      if handler != __name__:
        self.object = object
  
!       try:
          self.attributes = 
elements[string.lower(object.getObjectType()[2:])]['Attributes']
        except KeyError:
          self.attributes = {}
***************
*** 406,412 ****
  
  
  class BoolCellEditor (CharCellEditor):
!   def __init__(self, grid, attributes): 
      CharCellEditor.__init__(self, grid, attributes)
        
      self.selectionList = ['FALSE','TRUE']
--- 406,412 ----
  
  
  class BoolCellEditor (CharCellEditor):
!   def __init__(self, grid, attributes):
      CharCellEditor.__init__(self, grid, attributes)
        
      self.selectionList = ['FALSE','TRUE']
***************
*** 471,483 ****
  #
  #
  class EventEditor (wxPanel): 
!   def __init__(self, parent, instance, form): 
      wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
      self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
  
      self.parent = parent
      self.instance = instance
!     self.form = form
      self.objectList = []
      self.objectMap = {}
      self.object = None
--- 471,483 ----
  #
  #
  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))
  
      self.parent = parent
      self.instance = instance
!     self.rootObject = root
      self.objectList = []
      self.objectMap = {}
      self.object = None
***************
*** 492,498 ****
      if handler != __name__:
        self.object = object
  
!       try:       
          self.attributes = 
elements[string.lower(object.getObjectType()[2:])]['Attributes']
        except KeyError: 
          self.attributes = {}
--- 492,498 ----
      if handler != __name__:
        self.object = object
  
!       try:
          self.attributes = 
elements[string.lower(object.getObjectType()[2:])]['Attributes']
        except KeyError: 
          self.attributes = {}
***************
*** 579,588 ****
      self.notebook = wxNotebook(self.backpanel, -1, pos=wxPoint(6, 37), 
size=wxSize(32,32))
  
      self.propertyEditor = PropertyEditor(
!          self.notebook, instance, instance._form)
  
      self.eventEditor = EventEditor(
!          self.notebook, instance, instance._form)
  
      self.notebook.AddPage(self.propertyEditor, 'Properties')
      self.notebook.AddPage(self.eventEditor, 'Events')
--- 579,588 ----
      self.notebook = wxNotebook(self.backpanel, -1, pos=wxPoint(6, 37), 
size=wxSize(32,32))
  
      self.propertyEditor = PropertyEditor(
!          self.notebook, instance, instance.rootObject)
  
      self.eventEditor = EventEditor(
!          self.notebook, instance, instance.rootObject)
  
      self.notebook.AddPage(self.propertyEditor, 'Properties')
      self.notebook.AddPage(self.eventEditor, 'Events')
***************
*** 597,605 ****
  
      EVT_SIZE(self, self.onSize)
  
!     self.objectList = [instance._form]
  
!     instance._form.walk (self.inventoryObject)
      self.generateObjectMap()
  
    def generateObjectMap(self): 
--- 597,605 ----
  
      EVT_SIZE(self, self.onSize)
  
!     self.objectList = [instance.rootObject]
  
!     instance.rootObject.walk (self.inventoryObject)
      self.generateObjectMap()
  
    def generateObjectMap(self): 
***************
*** 621,627 ****
        self.objectCombo.Append(nameMap[key].name) 
        i = i + 1
  
!   def inventoryObject(self, object): 
      if hasattr(object, 'name'):
        self.objectList.append(object)
  
--- 621,627 ----
        self.objectCombo.Append(nameMap[key].name) 
        i = i + 1
  
!   def inventoryObject(self, object):
      if hasattr(object, 'name'):
        self.objectList.append(object)