gnue designer/src/forms/Instance.py designer/sr...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/19 01:06:08

Modified files:
        designer/src/forms: Instance.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
        forms/src/uidrivers/wx/widgets: _base.py 

Log message:
        misc designer bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/_base.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.33 
gnue/designer/src/forms/Instance.py:1.34
*** gnue/designer/src/forms/Instance.py:1.33    Sun Mar  9 15:17:40 2003
--- gnue/designer/src/forms/Instance.py Wed Mar 19 01:06:08 2003
***************
*** 91,98 ****
  
    def loadBuffer(self, buffer):
      form = GFParser.loadFile (buffer, self, initialize=0)
!     if not hasattr(form,'name') or not form.name:
!       form.name = 'form'
      return form
  
  
--- 91,98 ----
  
    def loadBuffer(self, buffer):
      form = GFParser.loadFile (buffer, self, initialize=0)
! ##    if not hasattr(form,'name') or not form.name:
! ##      form.name = 'form'
      return form
  
  
***************
*** 243,248 ****
--- 243,249 ----
    # Used by TemplateParser to build a wizard.current dict
    def buildWizardCurrentDict(self):
      baseForm = self._currentObject.findParentOfType('GFForm')
+     print self.visualEditor.block
      return {'form': baseForm,
              'logic': baseForm._logic,
              'layout': baseForm._layout,
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.63 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.64
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.63   Sun Mar  9 
17:49:34 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Wed Mar 19 
01:06:08 2003
***************
*** 61,66 ****
--- 61,75 ----
  
      self._app = self.instance._app
  
+     self.page = None
+     self.block = None
+     self.lastBlock = None
+     self.blockMap = {}
+     self.panel = None
+     self._notebookMap = {}
+     self.positionMappings = {}
+     self.widgetList = []
+ 
      self.uidriver = uidriver = UIwxpython.GFUserInterface(self.instance, 0)
  
      self.widgets = {}
***************
*** 78,92 ****
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
      EVT_SIZE(self, self.OnSize)
  
-     self.page = None
-     self.block = None
-     self.lastBlock = None
-     self.blockMap = {}
-     self.panel = None
-     self._notebookMap = {}
-     self.positionMappings = {}
-     self.widgetList = []
- 
      self._currentObject = None
      self.mode = 'move'
      self.__x = 0
--- 87,92 ----
***************
*** 111,122 ****
  
      self._setFeedback()
  
!     
      ## Stuff needed by UIwxpython
      self._pageList = []  # Needed by UIwxpython
  
!     
!     
  ## TODO: Fix me
      self.instance.SetToolBar(self.toolbar)
  ##
--- 111,122 ----
  
      self._setFeedback()
  
! 
      ## Stuff needed by UIwxpython
      self._pageList = []  # Needed by UIwxpython
  
! 
! 
  ## TODO: Fix me
      self.instance.SetToolBar(self.toolbar)
  ##
***************
*** 171,176 ****
--- 171,178 ----
          block = object._block
      if block:
        self.block = block
+       print self
+       print "Setting current block to %s" % self.block
        self.blockCombo.SetValue(block.name)
  ##      self._setFeedback()
  
***************
*** 229,235 ****
  
      if page != None and page != self.page:
        self.page = page
-       self.block = None
  
        self.notebook.SetSelection(self._notebookMap[page])
        try:
--- 231,236 ----
***************
*** 240,257 ****
          # our notebook for the first time.
          pass
  
-     block = isinstance(object, GFObjects.GFBlock) and object or \
-             object.findParentOfType('GFBlock')
- 
-     if block != None:
-       self.block = block
-     elif self.block is None and self.page is not None:
-       # Set block to the initial block
-       for child in self.page._children:
-         if isinstance(child,GFObjects.GFBlock):
-           self.block = child
-           break
- 
  
    def __setCurrentObject(self,object):
      if hasattr(object, '_widgetHandler'):
--- 241,246 ----
***************
*** 350,356 ****
            self.widgetList.pop(i)
            break
  
!       object._widget.cleanup(object)
        object._widget._object = None
        object._widget = None
        #object._widgetHandler.Destroy()
--- 339,345 ----
            self.widgetList.pop(i)
            break
  
! ##      object._widget.cleanup(object)
        object._widget._object = None
        object._widget = None
        #object._widgetHandler.Destroy()
Index: gnue/forms/src/uidrivers/wx/widgets/_base.py
diff -c gnue/forms/src/uidrivers/wx/widgets/_base.py:1.8 
gnue/forms/src/uidrivers/wx/widgets/_base.py:1.9
*** gnue/forms/src/uidrivers/wx/widgets/_base.py:1.8    Sat Mar 15 20:53:17 2003
--- gnue/forms/src/uidrivers/wx/widgets/_base.py        Wed Mar 19 01:06:08 2003
***************
*** 155,162 ****
    def cleanup(self, object):
      for widget in self.widgets[:]:
        id = widget.GetId()
!       del self._uiDriver._IdToTkObj[id]
!       del self._uiDriver._IdToGFObj[id]
!       del self._uiDriver._IdToUIObj[id]
        self.widgets.pop(0)
        self._deleteFromCrossRef(widget, object)
--- 155,165 ----
    def cleanup(self, object):
      for widget in self.widgets[:]:
        id = widget.GetId()
!       try:
!         del self._uiDriver._IdToTkObj[id]
!         del self._uiDriver._IdToGFObj[id]
!         del self._uiDriver._IdToUIObj[id]
!       except KeyError:
!         pass
        self.widgets.pop(0)
        self._deleteFromCrossRef(widget, object)