gnue/forms/src/uidrivers/win32 MenuBar.py ToolB...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/03/10 18:15:44

Modified files:
        forms/src/uidrivers/win32: MenuBar.py ToolBar.py 

Log message:
        * support for disable/enable menu/toolbar items
        * grayable BMP icons wanted !!!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/MenuBar.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/MenuBar.py
diff -c gnue/forms/src/uidrivers/win32/MenuBar.py:1.3 
gnue/forms/src/uidrivers/win32/MenuBar.py:1.4
*** gnue/forms/src/uidrivers/win32/MenuBar.py:1.3       Sun Mar  9 18:08:46 2003
--- gnue/forms/src/uidrivers/win32/MenuBar.py   Mon Mar 10 18:15:43 2003
***************
*** 28,55 ****
  #
  
  import string
! import win32api, win32gui, win32con, commctrl
  from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
  from gnue.forms.uidrivers.win32.common import getNextId
  from gnue.common.apps import GDebug
  from gnue.common import events
  
! _menustyle = win32con.MF_STRING | win32con.MF_POPUP
  
  class MenuBar(_BaseMenuBar):
  
    # Create the menu
    def init(self):
!     self.menu = win32gui.CreateMenu()
      return self.menu
  
    # Add a (sub)menu
    def addMenu(self, name, parent):
!     menu = win32gui.CreatePopupMenu()
!     win32gui.AppendMenu( parent, _menustyle, menu, name )
      # One would think this would go in init(),
      # but, no... win32 has to be a jerkoff.
!     win32gui.SetMenu(self.container.GetHwnd(), self.menu )
      return menu
  
    # Add a menu item (action)
--- 28,56 ----
  #
  
  import string
! import win32api, win32gui, win32ui, win32con, commctrl
  from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
  from gnue.forms.uidrivers.win32.common import getNextId
  from gnue.common.apps import GDebug
  from gnue.common import events
  
! _menustyle = win32con.MF_STRING
  
  class MenuBar(_BaseMenuBar):
  
    # Create the menu
    def init(self):
!     self.menu = win32ui.CreateMenu()
!     self._hmnu = self.menu.GetHandle()
      return self.menu
  
    # Add a (sub)menu
    def addMenu(self, name, parent):
!     menu = win32ui.CreatePopupMenu()
!     parent.AppendMenu(_menustyle | win32con.MF_POPUP, menu.GetHandle(), name )
      # One would think this would go in init(),
      # but, no... win32 has to be a jerkoff.
!     win32gui.SetMenu(self.container.GetHwnd(), self._hmnu )
      return menu
  
    # Add a menu item (action)
***************
*** 68,79 ****
          icon = _cachedIcons[iconloc]
        except KeyError:
          pass
- ##        icon = wxImage(iconloc, wxBITMAP_TYPE_PNG).ConvertToBitmap()
- ##        _cachedIcons[iconloc] = icon
-       ## TODO ## item.SetBitmap(icon)
  
      id = getNextId()
!     win32gui.AppendMenu(parent, win32con.MF_STRING, id, label)
      event = 'request' + userAction.event
      self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
  
--- 69,77 ----
          icon = _cachedIcons[iconloc]
        except KeyError:
          pass
  
      id = getNextId()
!     parent.AppendMenu(_menustyle, id, label)
      event = 'request' + userAction.event
      self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
  
***************
*** 82,98 ****
  
    # Add a separator
    def addSeparator(self, parent):
!     win32gui.AppendMenu(parent, win32con.MF_SEPARATOR, 0, "")
  
    # Enable a menu item
    def enableItem(self, item):
!     pass
!     #item.Enable(1)
  
    # Disable a menu item
    def disableItem(self, item):
!     pass
!     #item.Enable(0)
  
  _cachedIcons = {}
  
--- 80,96 ----
  
    # Add a separator
    def addSeparator(self, parent):
!     parent.AppendMenu(win32con.MF_SEPARATOR, 0, "")
  
    # Enable a menu item
    def enableItem(self, item):
!     parent, id = item
!     parent.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_ENABLED)
  
    # Disable a menu item
    def disableItem(self, item):
!     parent, id = item
!     parent.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_GRAYED)
  
  _cachedIcons = {}
  
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.5 
gnue/forms/src/uidrivers/win32/ToolBar.py:1.6
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.5       Sun Mar  9 18:08:46 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py   Mon Mar 10 18:15:43 2003
***************
*** 40,46 ****
    # Create the menu
    def init(self):
      hinst = win32api.GetModuleHandle(None)
!     style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS #| 
commctrl.TBSTYLE_FLAT
      styleEx = 0
      self.toolbar = mainToolBar = Win32Window(self.driver, styleEx, 
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
        style, 0, 0, 0, 0,
--- 40,46 ----
    # Create the menu
    def init(self):
      hinst = win32api.GetModuleHandle(None)
!     style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS
      styleEx = 0
      self.toolbar = mainToolBar = Win32Window(self.driver, styleEx, 
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
        style, 0, 0, 0, 0,
***************
*** 109,121 ****
  
    # Enable a menu item
    def enableItem(self, item):
!     return
!     self.toolbar.EnableTool(item, 1)
  
    # Disable a menu item
    def disableItem(self, item):
!     return
!     self.toolbar.EnableTool(item, 0)
  
    def startingItem(self, item):
      return
--- 109,121 ----
  
    # Enable a menu item
    def enableItem(self, item):
!     parent, id = item
!     win32gui.SendMessage(self.toolbar.GetHwnd(), commctrl.TB_ENABLEBUTTON, 
id, 1)
  
    # Disable a menu item
    def disableItem(self, item):
!     parent, id = item
!     win32gui.SendMessage(self.toolbar.GetHwnd(), commctrl.TB_ENABLEBUTTON, 
id, 0)
  
    def startingItem(self, item):
      return