gnue/designer/src/forms/LayoutEditor LayoutEdit...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/09 00:24:09

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

Log message:
        Minor cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.47 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.48
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.47   Sat Dec  7 
03:31:45 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Mon Dec  9 
00:24:09 2002
***************
*** 75,80 ****
--- 75,81 ----
      self.page = None
      self.block = None
      self.lastBlock = None
+     self.blockMap = {}
      self.panel = None
      self._notebookMap = {}
      self._pageList = []  # Needed by UIwxpython
***************
*** 98,103 ****
--- 99,105 ----
                        })
  
      self.instance.rootObject.walk (self.inventoryObject)
+     self._rebuildBlockCombo()
      try:
        self._setCurrentPage(self._notebookMap[0])
      except KeyError:
***************
*** 130,138 ****
        self.notebook.AddPage(self.workspacescroll,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
!     elif object._type == 'GFBlock' and not self.block:
!       self._setCurrentBlock(object)
! 
  
    def onSetCurrentObject (self, event):
      object = event.object
--- 132,141 ----
        self.notebook.AddPage(self.workspacescroll,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
!     if object._type == 'GFBlock':
!       self.blockMap[block.name.lower()] = block
!       if not self.block:
!         self._setCurrentBlock
  
    def onSetCurrentObject (self, event):
      object = event.object
***************
*** 169,192 ****
      ft = ""
  
      if object:
!       try:
!         ft += 'Name: % (%s)' % (object.name, object._type[2:])
!       except:
!         pass
!       try:
!         ft += '   x: %s' % object.Char__x
!       except:
!         pass
  
!       try:
!         ft += '   y: %s' % object.Char__y
!       except:
!         pass
  
!       try:
!         ft += '   w: %s' % object.Char__width
!       except:
!         pass
  
        try:
          if object.Char__height > 1:
--- 172,188 ----
      ft = ""
  
      if object:
!       try:      ft += 'Name: % (%s)' % (object.name, object._type[2:])
!       except:   pass
  
!       try:      ft += '   x: %s' % object.Char__x
!       except:   pass
  
!       try:      ft += '   y: %s' % object.Char__y
!       except:   pass
! 
!       try:      ft += '   w: %s' % object.Char__width
!       except:   pass
  
        try:
          if object.Char__height > 1:
***************
*** 251,256 ****
--- 247,255 ----
  
        self.inventoryObject(object)
        self._setCurrentPage(origpage)
+     if object._type == 'GFBlock':
+       self.blockMap[block.name.lower()] = block
+       self._rebuildBlockCombo
  
  
    def onModifyObject (self, event):