gnue designer/src/Instance.py designer/src/Menu...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/07/08 23:05:10

Modified files:
        designer/src   : Instance.py MenuBar.py 
        designer/src/forms: Instance.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        beginning of improved tools menu (with wizard support)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/MenuBar.py.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/Instance.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.181&tr2=1.182&r1=text&r2=text

Patches:
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.53 gnue/designer/src/Instance.py:1.54
*** gnue/designer/src/Instance.py:1.53  Wed Jul  3 11:49:48 2002
--- gnue/designer/src/Instance.py       Mon Jul  8 23:05:09 2002
***************
*** 199,204 ****
--- 199,207 ----
      self.__dict__[id] = control
      self.__objectListeners.append(control)
  
+   
+   def addToolCreate(self, title, method):
+     self._menubar.addToolCreate(title, method)
  
    def __loadFromFile(self, location):
      try:
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.22 gnue/designer/src/MenuBar.py:1.23
*** gnue/designer/src/MenuBar.py:1.22   Wed Jul  3 09:20:39 2002
--- gnue/designer/src/MenuBar.py        Mon Jul  8 23:05:09 2002
***************
*** 155,161 ****
       self._edit.Enable(ID_PASTE_SPECIAL,0)
       self._edit.Enable(ID_DELETE,0)
  
!      self._window = wxMenu()
  
       self._debug = wxMenu()
       self._debug.Append(ID_RUN, _('&Run'), _("Run the current form"))
--- 155,162 ----
       self._edit.Enable(ID_PASTE_SPECIAL,0)
       self._edit.Enable(ID_DELETE,0)
  
!      self._tools = wxMenu()
!      self._toolsCreate = None
  
       self._debug = wxMenu()
       self._debug.Append(ID_RUN, _('&Run'), _("Run the current form"))
***************
*** 164,183 ****
       self.Append(self._file, _('&File'))
       self.Append(self._edit, _('&Edit'))
       self.Append(self._debug, _('&Debug'))
!      self.Append(self._window, _('&Window'))
       self.Append(self._help, _('&Help'))
  
  
    def addTool(self, toolFrame, title):
  
      toolFrame._wxMenuID = wxNewId()
!     toolFrame._menu = wxMenuItem(self._window, toolFrame._wxMenuID,
            '&%s' % title, _("Show or hide the %s") % title, 1)
!     self._window.AppendItem(toolFrame._menu)
      EVT_MENU(self._frame, toolFrame._wxMenuID, toolFrame.OnMenuSelected)
  
  
    def lastToolAdded(self):
!    self._window.AppendSeparator()
  
  
--- 165,198 ----
       self.Append(self._file, _('&File'))
       self.Append(self._edit, _('&Edit'))
       self.Append(self._debug, _('&Debug'))
!      self.Append(self._tools, _('&Tools'))
       self.Append(self._help, _('&Help'))
  
  
    def addTool(self, toolFrame, title):
  
      toolFrame._wxMenuID = wxNewId()
!     toolFrame._menu = wxMenuItem(self._tools, toolFrame._wxMenuID,
            '&%s' % title, _("Show or hide the %s") % title, 1)
!     self._tools.AppendItem(toolFrame._menu)
      EVT_MENU(self._frame, toolFrame._wxMenuID, toolFrame.OnMenuSelected)
  
  
+   def addToolCreate(self, title, method):
+     if not self._toolsCreate:
+       wid = wxNewId()
+       self._toolsCreate = wxMenu()
+       self._tools.AppendSeparator()
+       self._tools.AppendMenu(wid, _('&Insert'), self._toolsCreate)
+ 
+     wid = wxNewId()
+     menu = wxMenuItem(self._toolsCreate, wid,
+           '&%s' % title)
+     self._toolsCreate.AppendItem(menu)
+     EVT_MENU(self._frame, wid, method)
+ 
+ 
    def lastToolAdded(self):
!    self._tools.AppendSeparator()
  
  
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.8 
gnue/designer/src/forms/Instance.py:1.9
*** gnue/designer/src/forms/Instance.py:1.8     Wed Jul  3 12:24:18 2002
--- gnue/designer/src/forms/Instance.py Mon Jul  8 23:05:09 2002
***************
*** 97,108 ****
  
  
    def createTools(self):
!     self.addTool(_('propertyEditor'), _('Property Inspector'), PropertyEditor)
!     self.addTool(_('treeEditor'), _('Object Navigator'), TreeView)
!     self.addTool(_('triggerEditor'), _('Event Editor'), TriggerEditor)
!     self.addTool(_('datasourceEditor'), _('Data Source Editor'), 
DataSourceEditor)
!     self.addTool(_('schemaViewer'), _('Schema Navigator'), SchemaViewer)
  
  
    def preSave(self):
  
--- 97,128 ----
  
  
    def createTools(self):
!     self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor)
!     self.addTool('treeEditor', _('Object Navigator'), TreeView)
!     self.addTool('triggerEditor', _('Event Editor'), TriggerEditor)
!     self.addTool('datasourceEditor', _('Data Source Editor'), 
DataSourceEditor)
!     self.addTool('schemaViewer', _('Schema Navigator'), SchemaViewer)
  
+     self.addToolCreate(_('DataSource'), self.insertDataSourceTool)
+     self.addToolCreate(_('Page'), self.insertPageTool)
+     self.addToolCreate(_('Block'), self.insertBlockTool)
+     self.addToolCreate(_('Field'), self.insertFieldTool)
+ 
+ 
+   def insertDataSourceTool(self, event=None, params=None):
+     pass
+ 
+   def insertPageTool(self, event=None, params=None):
+     pass
+ 
+   def insertBlockTool(self, event=None, params=None):
+     pass
+ 
+   def insertFieldTool(self, event=None, params=None):
+     pass
+ 
+   def insertDropdownTool(self, event=None, params=None):
+     pass
  
    def preSave(self):
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.181 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.182
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.181       Thu Jul  4 19:13:11 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Jul  8 23:05:09 2002
***************
*** 314,320 ****
      self.visiblePage = self._pageList[0]
  
      if self._notebook: # Adjust sizes
!       self._notebook.SetSize(formSize)
  
        child = self._notebook.GetParent()
        while child:
--- 314,320 ----
      self.visiblePage = self._pageList[0]
  
      if self._notebook: # Adjust sizes
!       self._notebook.SetClientSize(formSize)
  
        child = self._notebook.GetParent()
        while child: