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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/07 03:31:45

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

Log message:
        more work on block combo in layout editor

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

Patches:
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.46 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.47
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.46   Fri Dec  6 
19:55:25 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Sat Dec  7 
03:31:45 2002
***************
*** 67,72 ****
--- 67,73 ----
      self.backcolor = wxWHITE
      #self.propBar = PropertyBar(self)
      self.toolbar = LayoutEditorTools(self, self.frame)
+     self.blockCombo = self.toolbar.blockCombo
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
      EVT_SIZE(self, self.OnSize)
***************
*** 129,136 ****
        self.notebook.AddPage(self.workspacescroll,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
!     elif object._type == 'GFEntry' and not self.block:
!       self.block = object._block
  
  
    def onSetCurrentObject (self, event):
--- 130,137 ----
        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):
***************
*** 157,162 ****
--- 158,164 ----
          block = object._block
      if block:
        self.block = block
+       self.blockCombo.SetValue(block.name)
  ##      self._setFeedback()
  
  
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.14 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.15
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.14      Fri Dec 
 6 19:55:25 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Sat Dec  7 
03:31:45 2002
***************
*** 89,96 ****
  
      self.AddSeparator()
      self.AddControl(wxStaticText(self,-1,_("Block: ")))
!     self.blockControl = wxComboBox(self, -1)
!     self.AddControl(self.blockControl)
  
      wxToolBar.Realize(self)
  
--- 89,96 ----
  
      self.AddSeparator()
      self.AddControl(wxStaticText(self,-1,_("Block: ")))
!     self.blockCombo = wxComboBox(self, -1)
!     self.AddControl(self.blockCombo)
  
      wxToolBar.Realize(self)