gnue/designer/src/base Instance.py MultiObjectG...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/25 11:55:49

Modified files:
        designer/src/base: Instance.py MultiObjectGridEditor.py 
                           ToolDock.py ToolFrame.py ToolPanel.py 

Log message:
        some statusbar fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.95&tr2=1.96&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MultiObjectGridEditor.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolDock.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolFrame.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolPanel.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.95 
gnue/designer/src/base/Instance.py:1.96
*** gnue/designer/src/base/Instance.py:1.95     Fri May 23 23:23:56 2003
--- gnue/designer/src/base/Instance.py  Sun May 25 11:55:49 2003
***************
*** 175,181 ****
        else:
          self.__loadFromFile(location)
  
!     self.CreateStatusBar()
      self.SetStatusText('Welcome to GNUe Designer. Watch your step and try not 
to get hurt.')
      self._menubar = MainMenuBar(self)
      self.SetMenuBar(self._menubar)
--- 175,181 ----
        else:
          self.__loadFromFile(location)
  
!     self.statusbar = self.CreateStatusBar()
      self.SetStatusText('Welcome to GNUe Designer. Watch your step and try not 
to get hurt.')
      self._menubar = MainMenuBar(self)
      self.SetMenuBar(self._menubar)
***************
*** 251,261 ****
  
          if pos not in ('left','right'):  # i.e., 'frame' or something old
            # Frame type
!           window = ToolFrame(self, title)
            control = baseclass(self, self.rootObject, window)
            window.control = control
            window.dock = 'frame'
            enableMenu = 1
          else:
            # Docked type
            pane = DockedToolPane(self.__horizSplitter, self)
--- 251,263 ----
  
          if pos not in ('left','right'):  # i.e., 'frame' or something old
            # Frame type
!           window = ToolFrame(self, title, baseclass.uses_feedback_bar)
            control = baseclass(self, self.rootObject, window)
            window.control = control
            window.dock = 'frame'
            enableMenu = 1
+           if baseclass.uses_feedback_bar:
+             frame.setStatusBar(frame.statusbar)
          else:
            # Docked type
            pane = DockedToolPane(self.__horizSplitter, self)
***************
*** 264,275 ****
--- 266,280 ----
              window = leftWin
            elif pos == 'right':
              window = rightWin
+           pane.setStatusBar(self.statusbar)
+ 
  
            window.add(pane, indx)
            enableMenu = 0
  
          # Add ourselves to the Window menu
          control._menutool = self._menubar.addTool(window, title, hotkey, 
enableMenu)
+         window.finalize()
  
          self.__dict__["%sWindow" % id] = window
          self.__dict__[id] = control
Index: gnue/designer/src/base/MultiObjectGridEditor.py
diff -c gnue/designer/src/base/MultiObjectGridEditor.py:1.2 
gnue/designer/src/base/MultiObjectGridEditor.py:1.3
*** gnue/designer/src/base/MultiObjectGridEditor.py:1.2 Fri May 23 20:02:31 2003
--- gnue/designer/src/base/MultiObjectGridEditor.py     Sun May 25 11:55:49 2003
***************
*** 35,50 ****
  from gnue.common import events
  from gnue.designer.base.ToolBase import ToolBase
  
! class DataSourceEditor(ToolBase):
  
!   runtime_section = "DataSourceEditor"
! 
!   def init(self):
!     self.connections = self.instance._app.connections
! 
!     self.combopanel = wxPanel(self, -1, pos=wxPoint(0,0))
!     self.splitter = wxSplitterWindow(self, -1, style=wxSP_3D)
! ##    self.toolBar = ToolBar(self, parentWindow)
  
      self.list = wxListCtrl(self.splitter, -1, pos=wxPoint(0,0),
               style=wxLC_REPORT| # wxLC_EDIT_LABELS|
--- 35,43 ----
  from gnue.common import events
  from gnue.designer.base.ToolBase import ToolBase
  
! class MultiObjectGridEditor:
  
!   def __init__(self):
  
      self.list = wxListCtrl(self.splitter, -1, pos=wxPoint(0,0),
               style=wxLC_REPORT| # wxLC_EDIT_LABELS|
Index: gnue/designer/src/base/ToolDock.py
diff -c gnue/designer/src/base/ToolDock.py:1.8 
gnue/designer/src/base/ToolDock.py:1.9
*** gnue/designer/src/base/ToolDock.py:1.8      Sat May 24 14:01:08 2003
--- gnue/designer/src/base/ToolDock.py  Sun May 25 11:55:49 2003
***************
*** 233,238 ****
--- 233,240 ----
      else:
        self.minimize(panel)
  
+   def finalize(self):
+     pass
  
  ######################################################################
  #
Index: gnue/designer/src/base/ToolFrame.py
diff -c gnue/designer/src/base/ToolFrame.py:1.18 
gnue/designer/src/base/ToolFrame.py:1.19
*** gnue/designer/src/base/ToolFrame.py:1.18    Fri May 23 20:02:31 2003
--- gnue/designer/src/base/ToolFrame.py Sun May 25 11:55:49 2003
***************
*** 43,49 ****
    default_height = 150
    default_visible = 0
  
!   def __init__(self, instance, title):
      if sys.platform[:3] == 'win':
        style = wxFRAME_TOOL_WINDOW|wxMINIMIZE_BOX|wxRESIZE_BORDER| \
                wxCAPTION|wxFRAME_FLOAT_ON_PARENT|wxSYSTEM_MENU
--- 43,49 ----
    default_height = 150
    default_visible = 0
  
!   def __init__(self, instance, title, statusbar=0):
      if sys.platform[:3] == 'win':
        style = wxFRAME_TOOL_WINDOW|wxMINIMIZE_BOX|wxRESIZE_BORDER| \
                wxCAPTION|wxFRAME_FLOAT_ON_PARENT|wxSYSTEM_MENU
***************
*** 55,60 ****
--- 55,62 ----
      self.title = title
      self.runtime_section = "ToolFrame-%s" % string.replace(self.title,' ','')
      self.instance = instance
+     if statusbar:
+       self.statusbar = self.CreateStatusBar()
  
      EVT_CLOSE(self, self.OnClose)
  ##    EVT_SIZE(self, self.OnSize)
***************
*** 101,113 ****
        self.hide()
  
    def show(self):
!     self.control._menutool.menu.SetHelp(_("Hide the %s window")  % self.title)
!     self.control._menutool.menu.Check(1)
      self.Show(1)
  
    def hide(self):
!     self.control._menutool.menu.SetHelp(_("Show the %s window") % self.title)
!     self.control._menutool.menu.Check(0)
      self.Show(0)
  
    def OnClose(self, event):
--- 103,115 ----
        self.hide()
  
    def show(self):
! ##    self.control._menutool.menu.SetHelp(_("Hide the %s window")  % 
self.title)
! ##    self.control._menutool.menu.Check(1)
      self.Show(1)
  
    def hide(self):
! ##    self.control._menutool.menu.SetHelp(_("Show the %s window") % 
self.title)
! ##    self.control._menutool.menu.Check(0)
      self.Show(0)
  
    def OnClose(self, event):
Index: gnue/designer/src/base/ToolPanel.py
diff -c gnue/designer/src/base/ToolPanel.py:1.12 
gnue/designer/src/base/ToolPanel.py:1.13
*** gnue/designer/src/base/ToolPanel.py:1.12    Sat May 24 14:01:08 2003
--- gnue/designer/src/base/ToolPanel.py Sun May 25 11:55:49 2003
***************
*** 80,91 ****
--- 80,95 ----
      wxSashWindow.__init__(self, parent, -1, style=wxSW_3DSASH|wxCLIP_CHILDREN)
      ToolPanel.__init__(self, parent, menutool)
      self.manager = None
+     self.statusbar = None
      EVT_SIZE(self, self.__OnSize)
      EVT_SASH_DRAGGED(self, self.GetId(), self.__OnDrag)
  
    def SetManager(self, manager):
      self.manager = manager
  
+   def setStatusBar(self, bar):
+     self.statusbar = bar
+ 
    def AddTool(self, title, baseclass, rootObject, instance):
      self.control = control = baseclass(instance, rootObject, self)
  
***************
*** 114,123 ****
      if control.uses_toolbar:
        sizer.Add(control.createToolbar(self), 0, wxEXPAND)
  
-     if control.uses_feedback_bar:
-       self.statusText = wxStaticText(tp,-1, "", 
wxPoint(x+tt.GetSizeTuple()[1] + 12,1))
-       self.control.setFeedback = self.setFeedback
- 
      sizer.Add(control, 1, wxEXPAND)
      self.SetAutoLayout(true)
      self.SetSizer(sizer)
--- 118,123 ----
***************
*** 126,132 ****
      return control
  
    def setFeedback(self, text):
!     self.statusText.SetLabel(text)
  
    def __LeftDClick(self, event):
      if self.manager:
--- 126,133 ----
      return control
  
    def setFeedback(self, text):
!     if self.statusbar:
!       self.statusbar.SetStatusText(text)
  
    def __LeftDClick(self, event):
      if self.manager: