gnue/forms/src/uidrivers/win32 ToolBar.py widge...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/03 16:30:05

Modified files:
        forms/src/uidrivers/win32: ToolBar.py 
        forms/src/uidrivers/win32/widgets/form: widget.py 

Log message:
        converted win32 driver to new MenuBar and ToolBar interface (more 
cleanup)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.1 
gnue/forms/src/uidrivers/win32/ToolBar.py:1.2
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.1       Mon Mar  3 16:28:07 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py   Mon Mar  3 16:30:05 2003
***************
*** 52,57 ****
--- 52,59 ----
      win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBUTTONSIZE, 0, 
0x00180018);  # 24x24
      win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_AUTOSIZE, 0, 0)
  
+     self.toolbar.Show()
+ 
      return self.toolbar
  
    # Add a menu item (action)
***************
*** 98,103 ****
--- 100,108 ----
  
    # Add a separator
    def addSeparator(self):
+ # TODO: this doesn't work
+ #      tbb=struct.pack("iiiili", 0, 0, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_SEP, 0, 0)
+ #      win32gui.SendMessage(self._mainToolBar.GetId(), 
commctrl.TB_ADDBUTTONS, 1, tbb)
      return
      self.toolbar.AddSeparator()
  
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.3 
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.4
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.3   Mon Mar  3 
16:28:07 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py       Mon Mar  3 
16:30:05 2003
***************
*** 50,84 ****
      self._uiPageList=[]
      UIHelper.__init__(self, event)
  
-   def __addTBButton(self, idCommand, image, tip, text):
-       hIcon = win32gui.LoadImage(0, self._uiDriver.images_dir+image, 
win32con.IMAGE_BITMAP, 24, 24, win32con.LR_LOADFROMFILE)
-       tbab = struct.pack("ii", 0, hIcon)
-       iBitmap = win32gui.SendMessage(self._mainToolBar.GetId(), 
commctrl.TB_ADDBITMAP, 1, tbab)
- 
- #    TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
-       tbb=struct.pack("iiiili", iBitmap, idCommand, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_BUTTON, 0, 0)
-       win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDBUTTONS, 
1, tbb)
- 
-       win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDSTRING, 
0, tip);
- 
-   def __enableTBButton(self,index):
-       win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_HIDEBUTTON, 
0, index);
- 
-   def __addTBSeparator(self):
-     pass
- # TODO: this doesn't work
- #      tbb=struct.pack("iiiili", 0, 0, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_SEP, 0, 0)
- #      win32gui.SendMessage(self._mainToolBar.GetId(), 
commctrl.TB_ADDBUTTONS, 1, tbb)
- 
-   #
-   # _menuExitEvent
-   #
-   # Catches the Exit event from the menu and make sure it closes in such a 
way to
-   # trigger the closeTrap method
-   #
-   def _menuExitEvent(self):
- #    pass
-     self.mainWindow.Destroy()
  
    def _createWidget(self, event, spacer):
      object = event.object
--- 50,55 ----
***************
*** 133,184 ****
      # and the Toolbar
      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
        ToolBar(self._uiDriver, self.mainWindow, self._form)
- 
-     #
-     # Build Toolbar
-     #
-     if 0: # not self._form._features['GUI:TOOLBAR:SUPPRESS']:
- 
-       hinst = win32api.GetModuleHandle(None)
-       style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS #| 
commctrl.TBSTYLE_FLAT
-       styleEx = 0
-       self._mainToolBar = mainToolBar = Win32Window(self._uiDriver, styleEx, 
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
-         style, 0, 0, 0, 0,
-         self.mainWindow, 8002, hinst)
- 
-       win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_BUTTONSTRUCTSIZE, 
12, 0);
-       win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBITMAPSIZE, 0, 
0x00180018); # 24x24
-       win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBUTTONSIZE, 0, 
0x00180018);  # 24x24
-       win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_AUTOSIZE, 0, 0)
- 
-       self.__addTBButton(self.__eventMenuMapping["requestCOMMIT"], 
"tb_save.bmp",
-                                  _("Save  Changes"), _('Save all changes to 
database.'))
-       self.__addTBButton(self.__eventMenuMapping["requestNEWRECORD"], 
"tb_new.bmp",
-                                  _("Insert Record"), _('Create a new record 
for data input.'))
-       self.__addTBButton(self.__eventMenuMapping["requestMARKFORDELETE"], 
"tb_trash.bmp",
-                                  _("Delete Record"), _('Mark record for 
removal at next commit.'))
-       self.__addTBSeparator()
-       self.__addTBButton(self.__eventMenuMapping["requestFIRSTRECORD"], 
"tb_top.bmp",
-                                  _("First Record"),_('Navigate to first 
record in memory.'))
-       self.__addTBButton(self.__eventMenuMapping["requestPREVRECORD"], 
"tb_up_arrow.bmp",
-                                  _("Previous Record"),_('Navigate to previous 
record in memory.'))
-       self.__addTBButton(self.__eventMenuMapping["requestNEXTRECORD"], 
"tb_down_arrow.bmp",
-                                  _("Next Record"),_('Navigate to next record 
in memory.'))
-       self.__addTBButton(self.__eventMenuMapping["requestLASTRECORD"], 
"tb_bottom.bmp",
-                                  _("Last Record"),_('Navigate to last record 
in memory.'))
-       self.__addTBButton(self.__eventMenuMapping["_promptForRecord_"], 
"tb_jump-to.bmp",
-                                  _("Jump to Record"),_('Navigate to user 
specified record in memory.'))
-       self.__addTBSeparator()
-       self.__addTBButton(self.__eventMenuMapping["requestENTERQUERY"], 
"tb_search.bmp",
-                                  _("Prepare Query"), _('Switch to input query 
mask mode.'))
-       self.__addTBButton(self.__eventMenuMapping["requestEXECQUERY"], 
"tb_exec.bmp",
-                                  _("Execute Query"), _('Execute query using 
current mask.'))
-       self.__addTBSeparator()
-       self.__addTBButton(self.__eventMenuMapping["requestROLLBACK"], 
"tb_undo.bmp",
-                                  _("Clear Form"), _('Clear Form'))
-       self.__addTBButton(self.__eventMenuMapping["_exit_"], "tb_exit.bmp",
-                                  _("Exit Form"), _('Exit Form'))
-       mainToolBar.Show()
  
  
      if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
--- 104,109 ----