gnue/designer/src EventEditor.py forms/Incubato...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/06 19:55:25

Modified files:
        designer/src   : EventEditor.py 
        designer/src/forms: Incubator.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
                                         LayoutEditorTools.py 
                                         PropertyBar.py 

Log message:
        experimentation with block feedback in the layout editor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/EventEditor.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Incubator.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/PropertyBar.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/designer/src/EventEditor.py
diff -c gnue/designer/src/EventEditor.py:1.5 
gnue/designer/src/EventEditor.py:1.6
*** gnue/designer/src/EventEditor.py:1.5        Sat Nov 30 18:00:35 2002
--- gnue/designer/src/EventEditor.py    Fri Dec  6 19:55:25 2002
***************
*** 105,112 ****
        # Create the number of rows we'll need
        self.grid.InsertRows(0,len(self.rowList))
  
!       self.triggerTypes = {'':'(None)',
!                            '(Custom Trigger)':'(Custom Trigger)'}
        self.triggerMap = {}
  
        for name in self.namedMap.keys():
--- 105,112 ----
        # Create the number of rows we'll need
        self.grid.InsertRows(0,len(self.rowList))
  
!       self.triggerTypes = {'':_('(None)'),
!                            '(Custom Trigger)':_('(Custom Trigger)')}
        self.triggerMap = {}
  
        for name in self.namedMap.keys():
Index: gnue/designer/src/forms/Incubator.py
diff -c gnue/designer/src/forms/Incubator.py:1.7 
gnue/designer/src/forms/Incubator.py:1.8
*** gnue/designer/src/forms/Incubator.py:1.7    Fri Dec  6 01:55:36 2002
--- gnue/designer/src/forms/Incubator.py        Fri Dec  6 19:55:25 2002
***************
*** 1,5 ****
  #
!         # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
  # and/or modify it under the terms of the GNU General Public
--- 1,5 ----
  #
! # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
  # and/or modify it under the terms of the GNU General Public
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.45 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.46
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.45   Fri Dec  6 
01:55:36 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Fri Dec  6 
19:55:25 2002
***************
*** 65,71 ****
  
      self.notebook = wxNotebook(self, -1, pos=wxPoint(4, 4), 
size=wxSize(32,32))
      self.backcolor = wxWHITE
!     self.propBar = PropertyBar(self)
      self.toolbar = LayoutEditorTools(self, self.frame)
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
--- 65,71 ----
  
      self.notebook = wxNotebook(self, -1, pos=wxPoint(4, 4), 
size=wxSize(32,32))
      self.backcolor = wxWHITE
!     #self.propBar = PropertyBar(self)
      self.toolbar = LayoutEditorTools(self, self.frame)
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
***************
*** 425,434 ****
        self.widgetList.append(object)
  
    def OnSize(self, event):
!     self.propBar.SetSize(wxSize(self.GetClientSize().x, 
self.propBar.GetSize().y))
!     self.propBar.SetPosition(wxPoint(0, self.GetClientSize().y - 
self.propBar.GetSize().y))
!     self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8 - self.propBar.GetSize().y))
! #    self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8))# - self.propBar.GetSize().y))
  
    def OnPageSelected(self, event):
      p = self._notebookMap[event.GetSelection()]
--- 425,434 ----
        self.widgetList.append(object)
  
    def OnSize(self, event):
! ##    self.propBar.SetSize(wxSize(self.GetClientSize().x, 
self.propBar.GetSize().y))
! ##    self.propBar.SetPosition(wxPoint(0, self.GetClientSize().y - 
self.propBar.GetSize().y))
! ##    self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8 - self.propBar.GetSize().y))
!     self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8))# - self.propBar.GetSize().y))
  
    def OnPageSelected(self, event):
      p = self._notebookMap[event.GetSelection()]
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.13 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.14
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.13      Sat Nov 
30 18:00:36 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Fri Dec  6 
19:55:25 2002
***************
*** 87,93 ****
  
          EVT_TOOL(self, id, self.OnButtonSelected)
  
!       wxToolBar.Realize(self)
  
    def resetTool(self, mode):
      if self.mapping.has_key(mode):
--- 87,98 ----
  
          EVT_TOOL(self, id, self.OnButtonSelected)
  
!     self.AddSeparator()
!     self.AddControl(wxStaticText(self,-1,_("Block: ")))
!     self.blockControl = wxComboBox(self, -1)
!     self.AddControl(self.blockControl)
! 
!     wxToolBar.Realize(self)
  
    def resetTool(self, mode):
      if self.mapping.has_key(mode):
Index: gnue/designer/src/forms/LayoutEditor/PropertyBar.py
diff -c gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.5 
gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.6
*** gnue/designer/src/forms/LayoutEditor/PropertyBar.py:1.5     Wed Dec  4 
19:45:17 2002
--- gnue/designer/src/forms/LayoutEditor/PropertyBar.py Fri Dec  6 19:55:25 2002
***************
*** 38,56 ****
      wxPanel.__init__(self, parent, -1, style=wxCLIP_CHILDREN)
      self.parent = parent
      self.object = None
!     self.nameLabel = wxStaticText(self, -1, "Current Object:", 
pos=wxPoint(6,4))
!     self.nameEditor = wxTextCtrl(self, -1,
!           pos=calcRelPos(self.nameLabel, dx=6, absy=4))
!     self.nameEditor.SetEditable(0)
  
      self.blockLabel = wxStaticText(self, -1, "Current Block:",
!           pos=calcRelPos(self.nameEditor, dx=6, absy=4))
      self.blockEditor = wxComboBox(self, -1,
            pos=calcRelPos(self.blockLabel, dx=6, absy=4))
  
      self.SetSize((100,8 + max(self.blockEditor.GetSizeTuple()[1],
!         self.nameEditor.GetSizeTuple()[1],
!         self.nameEditor.GetSizeTuple()[1])))
  
  ##    self.typeLabel = wxStaticText(self, -1, "Class:",
  ##          pos=calcRelPos(self.nameEditor, absx=4, dy=8))
--- 38,57 ----
      wxPanel.__init__(self, parent, -1, style=wxCLIP_CHILDREN)
      self.parent = parent
      self.object = None
! #    self.nameLabel = wxStaticText(self, -1, "Current Object:", 
pos=wxPoint(6,4))
! #    self.nameEditor = wxTextCtrl(self, -1,
! #          pos=calcRelPos(self.nameLabel, dx=6, absy=4))
! #    self.nameEditor.SetEditable(0)
  
      self.blockLabel = wxStaticText(self, -1, "Current Block:",
!           pos=wxPoint(6,4))
! #          pos=calcRelPos(self.nameEditor, dx=6, absy=4))
      self.blockEditor = wxComboBox(self, -1,
            pos=calcRelPos(self.blockLabel, dx=6, absy=4))
  
      self.SetSize((100,8 + max(self.blockEditor.GetSizeTuple()[1],
! #        self.nameEditor.GetSizeTuple()[1],
!         self.blockLabel.GetSizeTuple()[1])))
  
  ##    self.typeLabel = wxStaticText(self, -1, "Class:",
  ##          pos=calcRelPos(self.nameEditor, absx=4, dy=8))