gnue/forms/src/uidrivers qt/ToolBar.py wx/ToolB...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/10 11:24:39

Modified files:
        forms/src/uidrivers/qt: ToolBar.py 
        forms/src/uidrivers/wx: ToolBar.py 

Log message:
        fixes for icons

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

Patches:
Index: gnue/forms/src/uidrivers/qt/ToolBar.py
diff -c gnue/forms/src/uidrivers/qt/ToolBar.py:1.2 
gnue/forms/src/uidrivers/qt/ToolBar.py:1.3
*** gnue/forms/src/uidrivers/qt/ToolBar.py:1.2  Mon Mar  3 18:27:16 2003
--- gnue/forms/src/uidrivers/qt/ToolBar.py      Mon Mar 10 11:24:39 2003
***************
*** 41,47 ****
  
    # Add a menu item (action)
    def addAction(self, name, userAction):
!     iconloc = userAction.getIconLocation(size="32x32")
  
      # Set the action icon if available
      if iconloc:
--- 41,47 ----
  
    # Add a menu item (action)
    def addAction(self, name, userAction):
!     iconloc = userAction.getIconLocation(size="24x24")
  
      # Set the action icon if available
      if iconloc:
***************
*** 75,81 ****
    # Disable a menu item
    def disableItem(self, item): 
      item.enable(0)
!   
    def startingItem(self, item): 
      item.setOn(1)
  
--- 75,81 ----
    # Disable a menu item
    def disableItem(self, item): 
      item.enable(0)
! 
    def startingItem(self, item): 
      item.setOn(1)
  
Index: gnue/forms/src/uidrivers/wx/ToolBar.py
diff -c gnue/forms/src/uidrivers/wx/ToolBar.py:1.5 
gnue/forms/src/uidrivers/wx/ToolBar.py:1.6
*** gnue/forms/src/uidrivers/wx/ToolBar.py:1.5  Mon Mar 10 10:58:09 2003
--- gnue/forms/src/uidrivers/wx/ToolBar.py      Mon Mar 10 11:24:39 2003
***************
*** 47,84 ****
    # Add a menu item (action)
    def addAction(self, name, userAction):
      label = name
!     iconloc = userAction.getIconLocation(size="32x32")
!           
      id = wxNewId()
!     
      event = 'request%s' % userAction.event
      if userAction.canToggle:
!       EVT_MENU(self.driver._wxapp, id, 
!         lambda event, l=self.driver, 
                e=event, i=id,
                te='request%s' % userAction.canToggle,
!               s=self.toolbar.GetToolState, 
                f=self.form: l.dispatchEvent((s(i) and e or te),_form=f))
!     else: 
        EVT_MENU(self.driver._wxapp, id,
          lambda event, l=self.driver, e=event, f=self.form: 
l.dispatchEvent(e,_form=f))
!         
      # Set the action icon if available
!     if iconloc: 
!       try: 
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError: 
          icon = wxImage(iconloc, wxBITMAP_TYPE_PNG).ConvertToBitmap()
          _cachedIcons[iconloc] = icon
!     else: 
        print "** WARNING: Cannot add '%s' to toolbar; no icon" % 
userAction.event
        return
!         
!     
!     self.toolbar.AddSimpleTool(id, icon, userAction.description or '', 
!                                isToggle=userAction.canToggle)
!     
      self.toolbar.Realize()
      return id
  
--- 47,84 ----
    # Add a menu item (action)
    def addAction(self, name, userAction):
      label = name
!     iconloc = userAction.getIconLocation(size="24x24")
! 
      id = wxNewId()
! 
      event = 'request%s' % userAction.event
      if userAction.canToggle:
!       EVT_MENU(self.driver._wxapp, id,
!         lambda event, l=self.driver,
                e=event, i=id,
                te='request%s' % userAction.canToggle,
!               s=self.toolbar.GetToolState,
                f=self.form: l.dispatchEvent((s(i) and e or te),_form=f))
!     else:
        EVT_MENU(self.driver._wxapp, id,
          lambda event, l=self.driver, e=event, f=self.form: 
l.dispatchEvent(e,_form=f))
! 
      # Set the action icon if available
!     if iconloc:
!       try:
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError:
          icon = wxImage(iconloc, wxBITMAP_TYPE_PNG).ConvertToBitmap()
          _cachedIcons[iconloc] = icon
!     else:
        print "** WARNING: Cannot add '%s' to toolbar; no icon" % 
userAction.event
        return
! 
! 
!     self.toolbar.AddSimpleTool(id, icon, userAction.description or '',
!                                isToggle=(userAction.canToggle and 1 or 0))
! 
      self.toolbar.Realize()
      return id