gnue/designer/src base/ToolDock.py base/ToolPan...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/22 19:17:17

Modified files:
        designer/src/base: ToolDock.py ToolPanel.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
                                         LayoutEditorTools.py 
Added files:
        designer/src/base: MultiObjectGridEditor.py 

Log message:
        * Cosmetic improvements to docked tools
        * Start of a generic object attribute editor
        * Added support for tool-specific toolbars

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MultiObjectGridEditor.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolDock.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolPanel.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.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/ToolDock.py
diff -c gnue/designer/src/base/ToolDock.py:1.4 
gnue/designer/src/base/ToolDock.py:1.5
*** gnue/designer/src/base/ToolDock.py:1.4      Wed Jan  1 19:45:46 2003
--- gnue/designer/src/base/ToolDock.py  Thu May 22 19:17:17 2003
***************
*** 28,33 ****
--- 28,39 ----
  
  from wxPython.wx import *
  
+ TITLEBAR_ACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHT)
+ TITLETEXT_ACTIVE = 
wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT)
+ #TITLEBAR_INACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
+ #TITLETEXT_INACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
+ 
+ 
  class ToolDock:
    def __init__(self, parent, instance):
      self.parent = parent
***************
*** 110,134 ****
    def __init__(self, parent, menutool):
      wxPanel.__init__(self, parent, -1)
      ToolDock.__init__(self, parent, menutool)
!     EVT_SIZE(self, self.OnSize)
  
    def AddTool(self, title, baseclass, rootObject, instance):
!     self.control = baseclass(instance, rootObject, self)
!     self.titlePanel = wxPanel(self,-1, wxPoint(2,2))#, style=wxSIMPLE_BORDER)
  
!     self.titleText = wxStaticText(self.titlePanel,-1,title,wxPoint(2,1))
!     font = self.titleText.GetFont()
      font.SetWeight(wxBOLD)
!     self.titleText.SetFont(font)
!     y = self.titleText.GetSizeTuple()
!     x,y = self.titleText.GetSizeTuple()
!     self.y = y + 6
  
!     if self.control.uses_feedback_header:
!       self.statusText = wxStaticText(self.titlePanel,-1, "", 
wxPoint(x+self.titleText.GetSizeTuple()[1] + 12,1))
        self.control.setHeaderText = self.setHeaderText
!     self.control.Move((0,self.y))
!     return self.control
  
    def setHeaderText(self, text):
      self.statusText.SetLabel(text)
--- 116,153 ----
    def __init__(self, parent, menutool):
      wxPanel.__init__(self, parent, -1)
      ToolDock.__init__(self, parent, menutool)
! ##    EVT_SIZE(self, self.OnSize)
  
    def AddTool(self, title, baseclass, rootObject, instance):
!     self.control = control = baseclass(instance, rootObject, self)
! 
!     sizer = wxBoxSizer(wxVERTICAL)
! 
!     tp = self.__titlePanel = wxPanel(self,-1, wxPoint(2,2))#, 
style=wxSIMPLE_BORDER)
!     tp.SetBackgroundColour(TITLEBAR_ACTIVE)
!     sizer.Add(tp,0, wxALL|wxEXPAND, border=2)
  
!     tt = self.__titleText = wxStaticText(tp,-1,title,wxPoint(4,1))
!     tt.SetForegroundColour(TITLETEXT_ACTIVE)
!     font = tt.GetFont()
      font.SetWeight(wxBOLD)
!     tt.SetFont(font)
!     x, y = tt.GetSizeTuple()
  
!     if control.uses_toolbar:
!       sizer.Add(control.createToolbar(self), 0, wxEXPAND)
! 
!     if control.uses_feedback_header:
!       self.statusText = wxStaticText(tp,-1, "", 
wxPoint(x+tt.GetSizeTuple()[1] + 12,1))
        self.control.setHeaderText = self.setHeaderText
! 
!     sizer.Add(control, 1, wxEXPAND)
!     self.SetAutoLayout(true)
!     self.SetSizer(sizer)
!     self.Layout()
! 
!     return control
! 
  
    def setHeaderText(self, text):
      self.statusText.SetLabel(text)
***************
*** 136,140 ****
    def OnSize(self, event):
      x,y = self.GetClientSizeTuple()
      self.control.SetSize(wxSize(x,y-self.y))
!     self.titlePanel.SetSize(wxSize(x-4,self.y-3))
  
--- 155,159 ----
    def OnSize(self, event):
      x,y = self.GetClientSizeTuple()
      self.control.SetSize(wxSize(x,y-self.y))
!     self.__titlePanel.SetSize(wxSize(x-4,self.y-3))
  
Index: gnue/designer/src/base/ToolPanel.py
diff -c gnue/designer/src/base/ToolPanel.py:1.7 
gnue/designer/src/base/ToolPanel.py:1.8
*** gnue/designer/src/base/ToolPanel.py:1.7     Mon Feb 17 02:32:51 2003
--- gnue/designer/src/base/ToolPanel.py Thu May 22 19:17:17 2003
***************
*** 43,48 ****
--- 43,49 ----
    default_dock = DOCK_FRAME
    runtime_section = ""
    uses_feedback_header = 0
+   uses_toolbar = 0
  
    def __init__(self, instance, rootObject, parentWindow):
      wxPanel.__init__(self,parentWindow,-1)
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.71 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.72
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.71   Fri Apr  4 
23:29:23 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Thu May 22 
19:17:17 2003
***************
*** 50,55 ****
--- 50,57 ----
    runtime_section = "FormsLayoutEditor"
    default_dock = DOCK_TOPRIGHT
    uses_feedback_header = 1
+   uses_toolbar = 1
+ 
  
    def init(self):
  
***************
*** 86,94 ****
      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)
-     self.blockCombo = self.toolbar.blockCombo
-     EVT_COMBOBOX(self.toolbar, self.blockCombo.GetId(), self.OnBlockSelected)
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
      EVT_SIZE(self, self.OnSize)
--- 88,93 ----
***************
*** 112,118 ****
                        })
  
      self.instance.rootObject.walk (self.inventoryObject)
-     self._rebuildBlockCombo()
      try:
        self._setCurrentPage(self._notebookMap[0])
      except KeyError:
--- 111,116 ----
***************
*** 125,134 ****
      self._pageList = []  # Needed by UIwxpython
  
  
! 
! ## TODO: Fix me
!     self.instance.SetToolBar(self.toolbar)
! ##
  
    def inventoryObject(self, object):
      if object._type == 'GFPage':
--- 123,134 ----
      self._pageList = []  # Needed by UIwxpython
  
  
!   def createToolbar(self, parent):
!     self.toolbar = LayoutEditorTools(self, parent)
!     self.blockCombo = self.toolbar.blockCombo
!     EVT_COMBOBOX(self.toolbar, self.blockCombo.GetId(), self.OnBlockSelected)
!     self._rebuildBlockCombo()
!     return self.toolbar
  
    def inventoryObject(self, object):
      if object._type == 'GFPage':
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.19 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.20
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.19      Sat Apr 
 5 00:24:04 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Thu May 22 
19:17:17 2003
***************
*** 92,98 ****
      self.blockCombo = wxComboBox(self, -1)
      self.AddControl(self.blockCombo)
  
!     wxToolBar.Realize(self)
  
    def resetTool(self, mode):
      if self.mapping.has_key(mode):
--- 92,98 ----
      self.blockCombo = wxComboBox(self, -1)
      self.AddControl(self.blockCombo)
  
!     self.Realize()
  
    def resetTool(self, mode):
      if self.mapping.has_key(mode):