commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Jason Cater
Subject: gnue/designer/src Designer.py base/Instance.py ...
Date: Wed, 28 May 2003 18:19:34 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/28 18:19:32

Modified files:
        designer/src   : Designer.py 
        designer/src/base: Instance.py MenuBar.py PrimaryToolBar.py 
                           TemplateParser.py 
        designer/src/forms/LayoutEditor: LayoutEditorTools.py 
        designer/src/forms/wizards: AddBlock.py AddBox.py AddButton.py 
                                    AddCheckbox.py AddDataSource.py 
                                    AddDropDown.py AddEntry.py 
                                    AddLabel.py AddPage.py 
                                    CreateSchema.py CreateWebForm.py 
        designer/src/schema/wizards: AddTable.py WriteSchema.py 
        designer/src/templates/forms: FormBuilder.py Simple.py 
        designer/src/templates/reports: Labels.py MailMerge.py 
                                        SimpleReport.py 
        designer/src/templates/schema: Introspection.py 

Log message:
        work on the menu structure and events system (WARNING: Breaking CVS for 
Designer)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MenuBar.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/PrimaryToolBar.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/TemplateParser.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddBlock.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddBox.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddButton.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddCheckbox.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddDataSource.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddDropDown.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddEntry.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddLabel.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddPage.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/CreateSchema.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/CreateWebForm.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/wizards/AddTable.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/wizards/WriteSchema.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/forms/FormBuilder.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/forms/Simple.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/Labels.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/MailMerge.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/SimpleReport.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/schema/Introspection.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.68 gnue/designer/src/Designer.py:1.69
*** gnue/designer/src/Designer.py:1.68  Fri Apr  4 15:56:55 2003
--- gnue/designer/src/Designer.py       Wed May 28 18:19:31 2003
***************
*** 126,131 ****
--- 126,142 ----
  
    def addInstance(self, instance):
      self._instances.append(instance)
+     instance.registerEventListeners({
+                        # Proxy for the main app
+                        'RequestNew'          : self.OnNew,
+                        'RequestSaveAll'      : self.OnSaveAll,
+                        'RequestAbout'        : self.OnAbout,
+                        'RequestNewWizard'    : self.OnWizard,
+                        'RequestOpenRecent'   : self.OnOpenRecent,
+                        'RequestExit'         : self.OnExit
+                     })
+ 
+ 
  
  
    def removeInstance(self, instance):
***************
*** 161,167 ****
        style = templateInformation['ProductStyle']
      except:
        style = None
!     
      instance = self.newInstance(product, style=style)
  
      if not TemplateParser.TemplateParser(instance, instance.rootObject,
--- 172,178 ----
        style = templateInformation['ProductStyle']
      except:
        style = None
! 
      instance = self.newInstance(product, style=style)
  
      if not TemplateParser.TemplateParser(instance, instance.rootObject,
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.96 
gnue/designer/src/base/Instance.py:1.97
*** gnue/designer/src/base/Instance.py:1.96     Sun May 25 11:55:49 2003
--- gnue/designer/src/base/Instance.py  Wed May 28 18:19:31 2003
***************
*** 133,138 ****
--- 133,146 ----
      self.globalAcceleratorListeners = []
  
      self.registerEventListeners({
+                        # Menu/Toolbar stuff
+                        'RequestSave'         : self.OnSave,
+                        'RequestSaveAs'       : self.OnSaveAs,
+                        'RequestClose'        : self.OnClose,
+                        'RequestNew'          : self.OnNew,  # TODO: should be 
in Designer.py
+                        'RequestConnect'      : self.OnConnectTo, # TODO: 
Designer.py??
+ 
+                        # Object stuff
                         'ObjectSelected'      : self.__onSetCurrentObject,
                         'ObjectCreated'       : self.__onCreateObject,
                         'ObjectModified'      : self.__onModifyObject,
***************
*** 151,157 ****
  
        if not os.access (location, os.R_OK):
          self.Show(1)
!         if wxMessageDialog(self, 
            _('The requested file does not exist.\n') +
            _('Do you want to create this file?') +
            _('\n\nFile: %s') \
--- 159,165 ----
  
        if not os.access (location, os.R_OK):
          self.Show(1)
!         if wxMessageDialog(self,
            _('The requested file does not exist.\n') +
            _('Do you want to create this file?') +
            _('\n\nFile: %s') \
***************
*** 513,519 ****
  
    def OnConnectTo(self, event):
      # connectionMap is built by MenuBar
!     conn = self.connectionMap[event.GetId()]
      tempDO = self.connections.getDataObject(conn, 'object')
      try:
        self.connections.requestConnection(tempDO, conn)
--- 521,527 ----
  
    def OnConnectTo(self, event):
      # connectionMap is built by MenuBar
!     conn = event.connection
      tempDO = self.connections.getDataObject(conn, 'object')
      try:
        self.connections.requestConnection(tempDO, conn)
***************
*** 523,530 ****
        print _("Unable to connect to %s") % conn
  
  
!   def OnNew(self, event):    
!     self._app.newInstance(self._fileNewMap[event.GetId()])
  
  
    def OnSave(self, event):
--- 531,538 ----
        print _("Unable to connect to %s") % conn
  
  
!   def OnNew(self, event):
!     self._app.newInstance(event.type)
  
  
    def OnSave(self, event):
Index: gnue/designer/src/base/MenuBar.py
diff -c gnue/designer/src/base/MenuBar.py:1.44 
gnue/designer/src/base/MenuBar.py:1.45
*** gnue/designer/src/base/MenuBar.py:1.44      Fri May 23 23:19:49 2003
--- gnue/designer/src/base/MenuBar.py   Wed May 28 18:19:31 2003
***************
*** 45,51 ****
       # So we can honor the module's requested order for the tool menu
       self._toolMenuOrder = []
  
!      self._frame = frame
  
    def addWizardLocation(self, location, template):
      #print "Adding %s" % location
--- 45,51 ----
       # So we can honor the module's requested order for the tool menu
       self._toolMenuOrder = []
  
!      self._frame = self.instance = frame
  
    def addWizardLocation(self, location, template):
      #print "Adding %s" % location
***************
*** 58,86 ****
    # Called after all the addWizardLocation's have been run
    def buildMenu(self):
       frame = self._frame
-      # File menu
-      ID_NEW = wxNewId()
-      ID_OPEN = wxNewId()
-      ID_OPEN_RECENT = wxNewId()
-      ID_SAVE = wxNewId()
-      ID_SAVE_AS = wxNewId()
-      ID_SAVE_ALL = wxNewId()
-      ID_CONNECT = wxNewId()
-      ID_CLOSE = wxNewId()
-      ID_RELOAD = wxNewId()
-      ID_EXIT = wxNewId()
- 
-      # FileNew menu
-      ID_NEW_FORM = wxNewId()
-      ID_NEW_REPORT = wxNewId()
-      ID_NEW_WIZARD = wxNewId()
- 
-      # Edit menu
-      ID_CUT = wxNewId()
-      ID_COPY = wxNewId()
-      ID_PASTE = wxNewId()
-      ID_PASTE_SPECIAL = wxNewId()
-      ID_DELETE = wxNewId()
  
  ##     # Project menu
  ##     ID_NEW_PROJECT = wxNewId()
--- 58,63 ----
***************
*** 97,178 ****
  
  
  
       self._file = wxMenu()
       self._fileNew = wxMenu()
       self._fileRecent = wxMenu()
       self._fileConnect = wxMenu()
  
       self._file.AppendMenu(ID_NEW, _("&New"), self._fileNew, _("Create a new 
object"))
!      self._file.Append(ID_OPEN, _("&Open...\tCtrl+O"), _("Open an existing 
object"))
       self._file.AppendMenu(ID_OPEN_RECENT, _("Open &Recent"), 
self._fileRecent,
                             _("Open an existing object"))
       self._file.AppendSeparator()
!      self._file.Append(ID_SAVE, _("&Save\tCtrl+S"), _("Save the current 
object"))
!      self._file.Append(ID_SAVE_AS, _("Save &As..."),
                         _("Save the current form under a new name"))
!      self._file.Append(ID_SAVE_ALL, _("Save A&ll"),
                         _("Save all open objects"))
       self._file.AppendSeparator()
       self._file.AppendMenu(ID_CONNECT, _("Connect &to"), self._fileConnect,
                             _("Connect to a database"))
       self._file.AppendSeparator()
!      self._file.Append(ID_RELOAD, _("Reload"),
          _("Reload the current object as of its last save (abandoning any 
changes)"))
       self._file.AppendSeparator()
!      self._file.Append(ID_CLOSE, _("&Close\tCtrl+W"), _("Close the current 
object"))
       self._file.AppendSeparator()
!      self._file.Append(ID_EXIT, _("E&xit"), _("Exit GNUe Designer"))
  
  
-      self.__addMenuEvent('File|New|Wizard', ID_NEW_WIZARD, 
frame._app.OnWizard)
-      self.__addMenuEvent('File|Open', ID_OPEN, frame._app.OnOpen)
-      self.__addMenuEvent('File|Save', ID_SAVE, frame.OnSave)
-      self.__addMenuEvent('File|Save As', ID_SAVE_AS, frame.OnSaveAs)
-      self.__addMenuEvent('File|Save All', ID_SAVE_ALL, frame._app.OnSaveAll)
-      self.__addMenuEvent('File|Close', ID_CLOSE, frame.OnClose)
-      self.__addMenuEvent('File|Exit', ID_EXIT, frame._app.OnExit)
- 
       # Set up our MRU list
       frame._app.mru.addMenu(self._fileRecent, frame)
  
  
       frame._fileNewMap = {}
       for tool in SupportedTools:
-        id = wxNewId()
         frame._fileNewMap[id] = tool.properties.module
!        self._fileNew.Append(id, '&%s' % tool.properties.nickname,
!          _('Create a new %s') % string.lower(tool.properties.nickname))
!        self.__addMenuEvent('File|New|%s' % tool.properties.nickname, id, 
frame.OnNew)
  
  
       self._fileNew.AppendSeparator()
!      self._fileNew.Append(ID_NEW_WIZARD,_('from &Wizard...'), \
                            _("Create a new object from a wizard"))
  
       # Build a connection list
       frame.connectionMap = {}
       for conn in frame.connections.getAllConnectionParameters().keys():
         id = wxNewId()
!        self._fileConnect.Append(id, conn, _("Login to %s connection") % conn)
         frame.connectionMap[id] = conn
-        self.__addMenuEvent('File|Connect To|%s' % conn, id, frame.OnConnectTo)
  
  
       self._file.Enable(ID_RELOAD,0)
  
       self._help = wxMenu()
!      self._help.Append(ID_ABOUT, _("&About..."), _("More information about 
GNUe Designer"))
!      self.__addMenuEvent('Help|About', ID_ABOUT, frame._app.OnAbout)
  
       self._edit = wxMenu()
!      self._edit.Append(ID_CUT, _("C&ut"), _("Cut the current object and move 
to the clipboard"))
!      self._edit.Append(ID_COPY, _("&Copy"), _("Copy the current object to the 
clipboard"))
!      self._edit.Append(ID_PASTE, _("&Paste"), _("Paste the current object on 
the clipboard"))
!      self._edit.Append(ID_PASTE_SPECIAL, _("Paste &Special..."), _("Paste the 
current object on the clipboard with special attributes"))
       self._edit.AppendSeparator()
!      self._edit.Append(ID_DELETE, _("&Delete"), _("Delete the current 
object"))
  
       # TODO: Implement clipboard
       self._edit.Enable(ID_CUT,0)
       self._edit.Enable(ID_COPY,0)
       self._edit.Enable(ID_PASTE,0)
--- 74,155 ----
  
  
  
+      ID_NEW = wxNewId()
+      ID_OPEN_RECENT = wxNewId()
+      ID_CONNECT = wxNewId()
+ 
+ 
       self._file = wxMenu()
       self._fileNew = wxMenu()
       self._fileRecent = wxMenu()
       self._fileConnect = wxMenu()
  
       self._file.AppendMenu(ID_NEW, _("&New"), self._fileNew, _("Create a new 
object"))
!      self.__addItem(self._file, 'RequestOpen', _("&Open...\tCtrl+O"), _("Open 
an existing object"))
       self._file.AppendMenu(ID_OPEN_RECENT, _("Open &Recent"), 
self._fileRecent,
                             _("Open an existing object"))
       self._file.AppendSeparator()
!      self.__addItem(self._file, 'RequestSave', _("&Save\tCtrl+S"), _("Save 
the current object"))
!      self.__addItem(self._file, 'RequestAs', _("Save &As..."),
                         _("Save the current form under a new name"))
!      self.__addItem(self._file, 'RequestSaveAll', _("Save A&ll"),
                         _("Save all open objects"))
       self._file.AppendSeparator()
       self._file.AppendMenu(ID_CONNECT, _("Connect &to"), self._fileConnect,
                             _("Connect to a database"))
       self._file.AppendSeparator()
!      ID_RELOAD = self.__addItem(self._file, 'RequestRevert', _("Reload"),
          _("Reload the current object as of its last save (abandoning any 
changes)"))
       self._file.AppendSeparator()
!      self.__addItem(self._file, 'RequestClose', _("&Close\tCtrl+W"), _("Close 
the current object"))
       self._file.AppendSeparator()
!      self.__addItem(self._file, 'RequestExit', _("E&xit"), _("Exit GNUe 
Designer"))
  
  
       # Set up our MRU list
       frame._app.mru.addMenu(self._fileRecent, frame)
  
  
       frame._fileNewMap = {}
       for tool in SupportedTools:
         frame._fileNewMap[id] = tool.properties.module
!        self.__addItem(self._fileNew, 'RequestNew','&%s' % 
tool.properties.nickname,
!          _('Create a new %s') % string.lower(tool.properties.nickname), 
{'type': tool.properties.module })
  
  
       self._fileNew.AppendSeparator()
!      self.__addItem(self._fileNew, 'RequestNewWizard',_('from &Wizard...'), \
                            _("Create a new object from a wizard"))
  
+ 
       # Build a connection list
       frame.connectionMap = {}
       for conn in frame.connections.getAllConnectionParameters().keys():
         id = wxNewId()
!        self.__addItem(self._fileConnect, 'RequestConnect', conn,
!                _("Login to %s connection") % conn, {'connection': conn})
         frame.connectionMap[id] = conn
  
  
       self._file.Enable(ID_RELOAD,0)
  
       self._help = wxMenu()
!      self.__addItem(self._help, 'RequestAbout', _("&About..."), _("More 
information about GNUe Designer"))
  
       self._edit = wxMenu()
!      ID_UNDO = self.__addItem(self._edit, 'RequestUndo', _("&Undo\tCtrl+Z"), 
_("Undo the last action"))
!      ID_REDO = self.__addItem(self._edit, 'RequestRedo', _("&Redo\tCtrl+Y"), 
_("Redo the last undo action"))
!      self._edit.AppendSeparator()
!      ID_CUT = self.__addItem(self._edit, 'RequestCut', _("Cu&t"), _("Cut the 
current object and move to the clipboard"))
!      ID_COPY = self.__addItem(self._edit, 'RequestCopy', _("&Copy"), _("Copy 
the current object to the clipboard"))
!      ID_PASTE = self.__addItem(self._edit, 'RequestPaste', _("&Paste"), 
_("Paste the current object on the clipboard"))
!      ID_PASTE_SPECIAL = self.__addItem(self._edit, 'RequestPasteSpecial', 
_("Paste &Special..."), _("Paste the current object on the clipboard with 
special attributes"))
       self._edit.AppendSeparator()
!      ID_DELETE = self.__addItem(self._edit, 'RequestDelete', _("&Delete"), 
_("Delete the current object"))
  
       # TODO: Implement clipboard
+      self._edit.Enable(ID_UNDO,0)
+      self._edit.Enable(ID_REDO,0)
       self._edit.Enable(ID_CUT,0)
       self._edit.Enable(ID_COPY,0)
       self._edit.Enable(ID_PASTE,0)
***************
*** 304,312 ****
        return None
  
  
!   def simulateMenuEvent(self, location):
!     method, id = self._eventMappings[location]
!     method(fakeWxEvent(id))
  
  
  
--- 281,289 ----
        return None
  
  
! ##  def simulateMenuEvent(self, location):
! ##    method, id = self._eventMappings[location]
! ##    method(fakeWxEvent(id))
  
  
  
***************
*** 327,332 ****
--- 304,321 ----
      self.Append(menu, text)
  
  
+   def __addItem(menu, event, text, descr, eventExtra={}, canToggle=0, 
canDisable=0):
+     id = wxNewId()
+     menu.Append(id, text, descr)
+     EVT_MENU(self.instance._app, id,
+       lambda event, l=self.instance, e=event, x=extra: l.dispatchEvent(e, 
**x))
+ ##    if canDisable:
+ ##      for evt in ('Enable:%s' % event, 'Disable:%s' % event):
+ ##        EVT_MENU(self.instance._app, id,
+ ##          lambda event, l=self.instance, e=event, x=extra: 
l.dispatchEvent(e, **x))
+ 
+     return id
+ 
  
  class ToolRunner:
    def __init__(self, toolFrame, title, hotkey, enabled):
***************
*** 357,359 ****
--- 346,350 ----
      self.id=id
    def GetId(self):
      return self.id
+ 
+ 
Index: gnue/designer/src/base/PrimaryToolBar.py
diff -c gnue/designer/src/base/PrimaryToolBar.py:1.3 
gnue/designer/src/base/PrimaryToolBar.py:1.4
*** gnue/designer/src/base/PrimaryToolBar.py:1.3        Wed May 28 17:08:26 2003
--- gnue/designer/src/base/PrimaryToolBar.py    Wed May 28 18:19:31 2003
***************
*** 28,39 ****
  
  from gnue.designer.base.ToolBar import BaseToolBar
  
! ToolbarMapping = 'File|New|Form,tb_new.png;'   \
!                + 'File|Open,tb_open.png;' \
!                + 'File|Save,tb_save.png;' \
!                + 'File|Save As,tb_save_as.png;' \
                 + ';' \
!                + 'File|Exit,tb_exit.png;'
  
  
  class PrimaryToolBar(BaseToolBar):
--- 28,39 ----
  
  from gnue.designer.base.ToolBar import BaseToolBar
  
! ToolbarMapping = 'RequestNewForm,tb_new.png;'   \
!                + 'RequestOpen,tb_open.png;' \
!                + 'RequestSave,tb_save.png;' \
!                + 'RequestSaveAs,tb_save_as.png;' \
                 + ';' \
!                + 'RequestExit,tb_exit.png;'
  
  
  class PrimaryToolBar(BaseToolBar):
Index: gnue/designer/src/base/TemplateParser.py
diff -c gnue/designer/src/base/TemplateParser.py:1.30 
gnue/designer/src/base/TemplateParser.py:1.31
*** gnue/designer/src/base/TemplateParser.py:1.30       Fri Apr  4 22:41:55 2003
--- gnue/designer/src/base/TemplateParser.py    Wed May 28 18:19:31 2003
***************
*** 639,644 ****
--- 639,647 ----
       except KeyError:
         self.tooltip = ""
  
+      instance.registerEventListeners(
+          { 'RunWizard:%s' % template['BaseID']: self.run } )
+ 
    def run(self, event):
      self.instance.dispatchEvent(Event('BeginWizard', template=self.template))
      TemplateParser(self.instance, self.instance.rootObject,
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.23 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.24
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.23      Sat May 
24 16:13:04 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Wed May 28 
18:19:31 2003
***************
*** 29,43 ****
  from gnue.designer.base.ToolBar import BaseToolBar
  
  
! ToolbarMapping = 'Edit|Insert|Block,deslay_block.png;' \
!                + 'Edit|Insert|Blank Page,deslay_page.png;' \
                 + ';' \
!                + 'Edit|Insert|Label,deslay_label.png;' \
!                + 'Edit|Insert|Unbound Entry,deslay_entrytext.png;'   \
!                + 'Edit|Insert|Drop Down Entry,deslay_entrydrop.png;' \
!                + 'Edit|Insert|Checkbox Entry,deslay_entrycheck.png;' \
!                + 'Edit|Insert|Button,deslay_button.png;' \
!                + 'Edit|Insert|Box,deslay_box.png'
  
  
  class LayoutEditorTools(BaseToolBar):
--- 29,43 ----
  from gnue.designer.base.ToolBar import BaseToolBar
  
  
! ToolbarMapping = 'RunWizard:AddBlock,deslay_block.png;' \
!                + 'RunWizard:AddPage,deslay_page.png;' \
                 + ';' \
!                + 'RunWizard:AddLabel,deslay_label.png;' \
!                + 'RunWizard:AddEntry,deslay_entrytext.png;'   \
!                + 'RunWizard:AddDropDown,deslay_entrydrop.png;' \
!                + 'RunWizard:AddCheckbox,deslay_entrycheck.png;' \
!                + 'RunWizard:AddButton,deslay_button.png;' \
!                + 'RunWizard:AddBox,deslay_box.png'
  
  
  class LayoutEditorTools(BaseToolBar):
Index: gnue/designer/src/forms/wizards/AddBlock.py
diff -c gnue/designer/src/forms/wizards/AddBlock.py:1.11 
gnue/designer/src/forms/wizards/AddBlock.py:1.12
*** gnue/designer/src/forms/wizards/AddBlock.py:1.11    Fri May 23 19:04:45 2003
--- gnue/designer/src/forms/wizards/AddBlock.py Wed May 28 18:19:31 2003
***************
*** 212,217 ****
--- 212,218 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddBlock',
      'BaseClass' : AddBlockWizard,
      'Name' : 'Add Block',
      'Description' : 'Inserts a Block',
Index: gnue/designer/src/forms/wizards/AddBox.py
diff -c gnue/designer/src/forms/wizards/AddBox.py:1.5 
gnue/designer/src/forms/wizards/AddBox.py:1.6
*** gnue/designer/src/forms/wizards/AddBox.py:1.5       Thu Mar  6 01:58:21 2003
--- gnue/designer/src/forms/wizards/AddBox.py   Wed May 28 18:19:31 2003
***************
*** 78,83 ****
--- 78,84 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddBox',
      'BaseClass' : AddBoxWizard,
      'Name' : 'Add Box',
      'Description' : 'Inserts a basic box',
Index: gnue/designer/src/forms/wizards/AddButton.py
diff -c gnue/designer/src/forms/wizards/AddButton.py:1.7 
gnue/designer/src/forms/wizards/AddButton.py:1.8
*** gnue/designer/src/forms/wizards/AddButton.py:1.7    Wed May 21 18:18:50 2003
--- gnue/designer/src/forms/wizards/AddButton.py        Wed May 28 18:19:31 2003
***************
*** 158,180 ****
  
  
  
- ############
- #
- # Basic information about this template
- #
- TemplateInformation = {
-     'Product': 'forms',
-     'BaseClass' : AddButtonWizard,
-     'Name' : 'Add Button',
-     'Description' : 'Inserts a button bound to an event',
-     'Version' : VERSION,
-     'Author' : 'The GNUe Designer Team',
-     'Behavior': WIZARD,
-     'Location' : 'Edit|Insert|Button'
- }
- 
- 
- 
  triggerTemplates = {
  't': """\
  ##
--- 158,163 ----
***************
*** 218,221 ****
--- 201,222 ----
  """
  
  }
+ 
+ 
+ ############
+ #
+ # Basic information about this template
+ #
+ TemplateInformation = {
+     'Product': 'forms',
+     'BaseID' : 'AddButton',
+     'BaseClass' : AddButtonWizard,
+     'Name' : 'Add Button',
+     'Description' : 'Inserts a button bound to an event',
+     'Version' : VERSION,
+     'Author' : 'The GNUe Designer Team',
+     'Behavior': WIZARD,
+     'Location' : 'Edit|Insert|Button'
+ }
+ 
  
Index: gnue/designer/src/forms/wizards/AddCheckbox.py
diff -c gnue/designer/src/forms/wizards/AddCheckbox.py:1.1 
gnue/designer/src/forms/wizards/AddCheckbox.py:1.2
*** gnue/designer/src/forms/wizards/AddCheckbox.py:1.1  Sat May 24 16:13:04 2003
--- gnue/designer/src/forms/wizards/AddCheckbox.py      Wed May 28 18:19:31 2003
***************
*** 88,93 ****
--- 88,94 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddCheckbox',
      'BaseClass' : AddCheckboxWizard,
      'Name' : 'Add Checkbox Entry',
      'Description' : 'Inserts a basic unbound checkbox entry',
Index: gnue/designer/src/forms/wizards/AddDataSource.py
diff -c gnue/designer/src/forms/wizards/AddDataSource.py:1.8 
gnue/designer/src/forms/wizards/AddDataSource.py:1.9
*** gnue/designer/src/forms/wizards/AddDataSource.py:1.8        Fri Apr  4 
21:30:07 2003
--- gnue/designer/src/forms/wizards/AddDataSource.py    Wed May 28 18:19:31 2003
***************
*** 165,170 ****
--- 165,171 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddDataSource',
      'BaseClass' : AddDataSourceWizard,
      'Name' : 'Add a new Data Source',
      'Description' : 'Inserts a new DataSource',
Index: gnue/designer/src/forms/wizards/AddDropDown.py
diff -c gnue/designer/src/forms/wizards/AddDropDown.py:1.17 
gnue/designer/src/forms/wizards/AddDropDown.py:1.18
*** gnue/designer/src/forms/wizards/AddDropDown.py:1.17 Fri Apr  4 21:30:07 2003
--- gnue/designer/src/forms/wizards/AddDropDown.py      Wed May 28 18:19:31 2003
***************
*** 330,335 ****
--- 330,336 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddDropDown',
      'BaseClass' : AddDropDownWizard,
      'Name' : 'Add Bound Drop Down',
      'Description' : 'Inserts a bound dropdown',
Index: gnue/designer/src/forms/wizards/AddEntry.py
diff -c gnue/designer/src/forms/wizards/AddEntry.py:1.7 
gnue/designer/src/forms/wizards/AddEntry.py:1.8
*** gnue/designer/src/forms/wizards/AddEntry.py:1.7     Thu Mar  6 01:58:21 2003
--- gnue/designer/src/forms/wizards/AddEntry.py Wed May 28 18:19:31 2003
***************
*** 87,92 ****
--- 87,93 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddEntry',
      'BaseClass' : AddEntryWizard,
      'Name' : 'Add Entry',
      'Description' : 'Inserts a basic unbound entry',
Index: gnue/designer/src/forms/wizards/AddLabel.py
diff -c gnue/designer/src/forms/wizards/AddLabel.py:1.6 
gnue/designer/src/forms/wizards/AddLabel.py:1.7
*** gnue/designer/src/forms/wizards/AddLabel.py:1.6     Thu Mar  6 01:58:21 2003
--- gnue/designer/src/forms/wizards/AddLabel.py Wed May 28 18:19:31 2003
***************
*** 79,84 ****
--- 79,85 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'AddLabel',
      'BaseClass' : AddLabelWizard,
      'Name' : 'Add Label',
      'Description' : 'Inserts a basic label',
Index: gnue/designer/src/forms/wizards/AddPage.py
diff -c gnue/designer/src/forms/wizards/AddPage.py:1.10 
gnue/designer/src/forms/wizards/AddPage.py:1.11
*** gnue/designer/src/forms/wizards/AddPage.py:1.10     Fri May 23 19:49:58 2003
--- gnue/designer/src/forms/wizards/AddPage.py  Wed May 28 18:19:31 2003
***************
*** 138,143 ****
--- 138,144 ----
  TemplateInformation = {
      'Product': 'forms',
      'BaseClass' : AddPageWizard,
+     'BaseID' : 'AddPage',
      'Name' : 'Add Page',
      'Description' : 'Inserts a blank page',
      'Version' : VERSION,
Index: gnue/designer/src/forms/wizards/CreateSchema.py
diff -c gnue/designer/src/forms/wizards/CreateSchema.py:1.12 
gnue/designer/src/forms/wizards/CreateSchema.py:1.13
*** gnue/designer/src/forms/wizards/CreateSchema.py:1.12        Fri Apr  4 
21:48:17 2003
--- gnue/designer/src/forms/wizards/CreateSchema.py     Wed May 28 18:19:31 2003
***************
*** 315,320 ****
--- 315,321 ----
  # TODO: Needs some overhauling to be compatable w/0.5
  __DISABLE__TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'CreateSchema',
      'BaseClass' : CreateSchemaWizard,
      'Name' : 'Create Schema Definition',
      'Description' : 'create a gnue schema definition file',
Index: gnue/designer/src/forms/wizards/CreateWebForm.py
diff -c gnue/designer/src/forms/wizards/CreateWebForm.py:1.2 
gnue/designer/src/forms/wizards/CreateWebForm.py:1.3
*** gnue/designer/src/forms/wizards/CreateWebForm.py:1.2        Tue Apr 29 
16:36:12 2003
--- gnue/designer/src/forms/wizards/CreateWebForm.py    Wed May 28 18:19:32 2003
***************
*** 571,576 ****
--- 571,577 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'CreateWebForm',
      'BaseClass' : CreateWebFormWizard,
      'Name' : 'Compile Form for GNUe JsForms',
      'Description' : 'create a intermediate html+java for the jsForms client',
Index: gnue/designer/src/schema/wizards/AddTable.py
diff -c gnue/designer/src/schema/wizards/AddTable.py:1.1 
gnue/designer/src/schema/wizards/AddTable.py:1.2
*** gnue/designer/src/schema/wizards/AddTable.py:1.1    Tue Mar 11 14:15:39 2003
--- gnue/designer/src/schema/wizards/AddTable.py        Wed May 28 18:19:32 2003
***************
*** 94,99 ****
--- 94,100 ----
  #
  TemplateInformation = {
      'Product': 'schema',
+     'BaseID' : 'AddTable',
      'BaseClass' : AddTableWizard,
      'Name' : 'Add Table',
      'Description' : 'Creates a Table',
Index: gnue/designer/src/schema/wizards/WriteSchema.py
diff -c gnue/designer/src/schema/wizards/WriteSchema.py:1.4 
gnue/designer/src/schema/wizards/WriteSchema.py:1.5
*** gnue/designer/src/schema/wizards/WriteSchema.py:1.4 Tue Mar 11 14:15:39 2003
--- gnue/designer/src/schema/wizards/WriteSchema.py     Wed May 28 18:19:32 2003
***************
*** 115,120 ****
--- 115,121 ----
  
  ZZZ_TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'WriteSchema',
      'BaseClass' : WriteSchemaWizard,
      'Name' : 'Write Schema Definition',
      'Description' : 'write a gnue schema definition to the database',
Index: gnue/designer/src/templates/forms/FormBuilder.py
diff -c gnue/designer/src/templates/forms/FormBuilder.py:1.13 
gnue/designer/src/templates/forms/FormBuilder.py:1.14
*** gnue/designer/src/templates/forms/FormBuilder.py:1.13       Tue Jan 21 
00:02:41 2003
--- gnue/designer/src/templates/forms/FormBuilder.py    Wed May 28 18:19:32 2003
***************
*** 614,619 ****
--- 614,620 ----
  #
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'FormBuilder',
      'BaseClass' : FormBuilderTemplate,
      'Name' : 'Multi-Block, Page form building template',
      'Description' : 'Creates forms containing arbitrary number of 
pages/blocks',
Index: gnue/designer/src/templates/forms/Simple.py
diff -c gnue/designer/src/templates/forms/Simple.py:1.17 
gnue/designer/src/templates/forms/Simple.py:1.18
*** gnue/designer/src/templates/forms/Simple.py:1.17    Fri Apr  4 18:05:32 2003
--- gnue/designer/src/templates/forms/Simple.py Wed May 28 18:19:32 2003
***************
*** 401,406 ****
--- 401,407 ----
  
  TemplateInformation = {
      'Product': 'forms',
+     'BaseID' : 'Simple',
      'BaseClass' : SimpleFormTemplate,
      'Name' : 'Simple form wizard',
      'Description' : 'Creates a simple single-source entry table.',
Index: gnue/designer/src/templates/reports/Labels.py
diff -c gnue/designer/src/templates/reports/Labels.py:1.6 
gnue/designer/src/templates/reports/Labels.py:1.7
*** gnue/designer/src/templates/reports/Labels.py:1.6   Wed Jan  1 19:45:47 2003
--- gnue/designer/src/templates/reports/Labels.py       Wed May 28 18:19:32 2003
***************
*** 196,201 ****
--- 196,202 ----
  TemplateInformation = {
      'Product': 'reports',
      'ProductStyle': 'GNUe:Reports:Labels',
+     'BaseID' : 'Labels',
      'BaseClass' : SimpleReportTemplate,
      'Name' : 'Labels wizard',
      'Description' : 'Creates a labels report.',
Index: gnue/designer/src/templates/reports/MailMerge.py
diff -c gnue/designer/src/templates/reports/MailMerge.py:1.6 
gnue/designer/src/templates/reports/MailMerge.py:1.7
*** gnue/designer/src/templates/reports/MailMerge.py:1.6        Wed Jan  1 
19:45:47 2003
--- gnue/designer/src/templates/reports/MailMerge.py    Wed May 28 18:19:32 2003
***************
*** 193,198 ****
--- 193,199 ----
  TemplateInformation = {
      'Product': 'reports',
      'ProductStyle': 'GNUe:Reports:MailMerge',
+     'BaseID' : 'MailMerge',
      'BaseClass' : SimpleReportTemplate,
      'Name' : 'Mailmerge wizard',
      'Description' : 'Creates a mailmerge report.',
Index: gnue/designer/src/templates/reports/SimpleReport.py
diff -c gnue/designer/src/templates/reports/SimpleReport.py:1.8 
gnue/designer/src/templates/reports/SimpleReport.py:1.9
*** gnue/designer/src/templates/reports/SimpleReport.py:1.8     Wed Jan  1 
19:45:47 2003
--- gnue/designer/src/templates/reports/SimpleReport.py Wed May 28 18:19:32 2003
***************
*** 219,224 ****
--- 219,225 ----
  TemplateInformation = {
      'Product': 'reports',
      'ProductStyle': 'GNUe:Reports:SimpleTabulation',
+     'BaseID' : 'SimpleReport',
      'BaseClass' : SimpleReportTemplate,
      'Name' : 'Simple report wizard',
      'Description' : 'Creates a simple single-source report.',
Index: gnue/designer/src/templates/schema/Introspection.py
diff -c gnue/designer/src/templates/schema/Introspection.py:1.8 
gnue/designer/src/templates/schema/Introspection.py:1.9
*** gnue/designer/src/templates/schema/Introspection.py:1.8     Wed Jan  1 
19:45:47 2003
--- gnue/designer/src/templates/schema/Introspection.py Wed May 28 18:19:32 2003
***************
*** 188,193 ****
--- 188,194 ----
  #
  TemplateInformation = {
      'Product': 'schema',
+     'BaseID' : 'Introspection',
      'BaseClass' : SchemaIntrospectionTemplate,
      'Name' : 'Introspection-based Schema Builder',
      'Description' : 'Creates a schema definition based on an existing 
database.',




reply via email to

[Prev in Thread] Current Thread [Next in Thread]