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/04/27 17:04:30

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

Log message:
        * tooltips
        * menu helptext in statusbar

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/MenuBar.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/MenuBar.py
diff -c gnue/forms/src/uidrivers/win32/MenuBar.py:1.4 
gnue/forms/src/uidrivers/win32/MenuBar.py:1.5
*** gnue/forms/src/uidrivers/win32/MenuBar.py:1.4       Mon Mar 10 18:15:43 2003
--- gnue/forms/src/uidrivers/win32/MenuBar.py   Sun Apr 27 17:04:30 2003
***************
*** 71,76 ****
--- 71,77 ----
          pass
  
      id = getNextId()
+     self.container.addDescription(id, userAction.description or '')
      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)))
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.10 
gnue/forms/src/uidrivers/win32/ToolBar.py:1.11
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.10      Tue Apr 15 18:21:03 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py   Sun Apr 27 17:04:30 2003
***************
*** 92,98 ****
      addrText = buff.buffer_info()[0]
      format = "IIiIllllili"
      size = struct.calcsize(format)
!     ti = struct.pack(format, size, commctrl.TTF_IDISHWND, parent.GetHwnd(), 
0, 0, 0, 0, 0, 0, addrText, 0)
      win32gui.SendMessage(self._htt, commctrl.TTM_UPDATETIPTEXT , 0, ti)
  
      return (parent, id)
--- 92,98 ----
      addrText = buff.buffer_info()[0]
      format = "IIiIllllili"
      size = struct.calcsize(format)
!     ti = struct.pack(format, size, 0, self.toolbar.GetHwnd(), id, 0, 0, 0, 0, 
0, addrText, 0)
      win32gui.SendMessage(self._htt, commctrl.TTM_UPDATETIPTEXT , 0, ti)
  
      return (parent, id)
Index: gnue/forms/src/uidrivers/win32/UIdriver.py
diff -c gnue/forms/src/uidrivers/win32/UIdriver.py:1.9 
gnue/forms/src/uidrivers/win32/UIdriver.py:1.10
*** gnue/forms/src/uidrivers/win32/UIdriver.py:1.9      Sat Apr 26 17:22:45 2003
--- gnue/forms/src/uidrivers/win32/UIdriver.py  Sun Apr 27 17:04:30 2003
***************
*** 46,51 ****
--- 46,54 ----
  from gnue.forms.uidrivers.win32.common import _eventObjToWin32Window, 
setWidgetBaseFont
  
  
+ def OnWMMenuselect(hwnd, msg, wParam, lParam, widget):
+   return widget.OnWMMenuselect(hwnd, msg, wParam, lParam)
+ 
  def OnWMNotify(hwnd, msg, wParam, lParam, widget):
    return widget.OnWMNotify(hwnd, msg, wParam, lParam)
  
***************
*** 75,80 ****
--- 78,84 ----
    _wndclass = None
    
    _message_map = {
+     win32con.WM_MENUSELECT : OnWMMenuselect,
      win32con.WM_NOTIFY : OnWMNotify,
      win32con.WM_DESTROY : OnWMDestroy,
      win32con.WM_CLOSE : OnWMClose,
***************
*** 180,185 ****
--- 184,190 ----
      for child in self._children:
        if child._form.name != formName:
          child.mainWindow.Enable(1)
+     win32gui.SetForegroundWindow(child.mainWindow.GetHwnd())
  
    def _beep(self):
      pass
Index: gnue/forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue/forms/src/uidrivers/win32/widgets/_base.py:1.12 
gnue/forms/src/uidrivers/win32/widgets/_base.py:1.13
*** gnue/forms/src/uidrivers/win32/widgets/_base.py:1.12        Sat Apr 26 
17:22:45 2003
--- gnue/forms/src/uidrivers/win32/widgets/_base.py     Sun Apr 27 17:04:30 2003
***************
*** 29,35 ****
  
  from types import StringType
  import win32api, win32gui, win32con, win32ui, commctrl
! import struct
  
  from gnue.common import events
  
--- 29,35 ----
  
  from types import StringType
  import win32api, win32gui, win32con, win32ui, commctrl
! import struct, array
  
  from gnue.common import events
  
***************
*** 267,304 ****
    def Connect(self, id, func):
      self._connectTable[id] = func
  
-   def OnWMClose(self, hwnd, msg, wParam, lParam):
-     return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
- 
-   def OnWMCommand(self, hwnd, msg, wParam, lParam):
-     return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
- 
-   def OnWMNotify(self, hwnd, msg, wParam, lParam):
-     return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
  
!   def OnWMSize(self, hwnd, msg, wParam, lParam):
!     return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
  
  
! class Win32Window(Win32Base):
  
    def OnWMClose(self, hwnd, msg, wParam, lParam):
!     self._uiDriver.dispatchEvent('requestEXIT',_form=self._uiDriver._form)
  
    def OnWMSize(self, hwnd, msg, wParam, lParam):
      for child in self._children:
        # resizing statusbar as needed
        if child._className == commctrl.STATUSCLASSNAME:
-         hStatusbar = win32gui.GetDlgItem(hwnd, child._id)
          (left, top, right, bottom) = win32gui.GetClientRect(hwnd)
          x = right - left
          statwidths = 
struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
!         win32gui.SendMessage(hStatusbar, commctrl.SB_SETPARTS, 5, statwidths)
!         win32gui.SendMessage(hStatusbar, win32con.WM_SIZE, 0, 0)
        # and toolbar too
        elif child._className == commctrl.TOOLBARCLASSNAME:
!         hToolbar = win32gui.GetDlgItem(hwnd, child._id)
!         win32gui.SendMessage(hToolbar, commctrl.TB_AUTOSIZE, 0, 0)
      
    def OnWMCommand(self, hwnd, msg, wParam, lParam):
      # menu/toolbar selection happend
--- 267,303 ----
    def Connect(self, id, func):
      self._connectTable[id] = func
  
  
! class Win32Window(Win32Base):
!   _descriptionTable = {}
!   _statusBar = None
  
+   def addDescription(self, id, description):
+     self._descriptionTable[id] = description
  
!   def OnWMMenuselect(self, hwnd, msg, wParam, lParam):
!     id = win32api.LOWORD(wParam)
!     if self._descriptionTable.has_key(id):
!       msg = self._descriptionTable[id]
!     else:
!       msg = ''
!     win32gui.SendMessage(self._statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0, 
msg)
  
    def OnWMClose(self, hwnd, msg, wParam, lParam):
!     self._uiDriver.dispatchEvent('requestEXIT', _form=self._uiDriver._form)
  
    def OnWMSize(self, hwnd, msg, wParam, lParam):
      for child in self._children:
        # resizing statusbar as needed
        if child._className == commctrl.STATUSCLASSNAME:
          (left, top, right, bottom) = win32gui.GetClientRect(hwnd)
          x = right - left
          statwidths = 
struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
!         win32gui.SendMessage(child.GetHwnd(), commctrl.SB_SETPARTS, 5, 
statwidths)
!         win32gui.SendMessage(child.GetHwnd(), win32con.WM_SIZE, 0, 0)
        # and toolbar too
        elif child._className == commctrl.TOOLBARCLASSNAME:
!         win32gui.SendMessage(child.GetHwnd(), commctrl.TB_AUTOSIZE, 0, 0)
      
    def OnWMCommand(self, hwnd, msg, wParam, lParam):
      # menu/toolbar selection happend
***************
*** 323,332 ****
        gfObject = self._uiDriver._IdToGFObj[id]
        uiObject = self._uiDriver._IdToUIObj[id]
        uiObject._uiForm._eventHandler('requestPAGE', pageId, 
_form=gfObject._form)
-     elif code == -718: #commctrl.TTN_NEEDTEXT
-       # TODO
-       window = self._uiDriver._IdToTkObj[hwndFrom]
-       #print 'ToolTip needs text !!!',lParam
  
  
  class Win32Entry(Win32Base):
--- 322,327 ----
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.12 
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.13
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.12  Sat Apr 26 
17:22:45 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py       Sun Apr 27 
17:04:30 2003
***************
*** 113,120 ****
        statwidths = 
struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
        win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETPARTS, 5, 
statwidths)
        win32gui.SendMessage(self.statusBar.GetHwnd(), win32con.WM_SIZE, 0, 0)
! 
! 
      self._eventHandler = event.eventHandler
  
      self._wrapper.finalize()
--- 113,119 ----
        statwidths = 
struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
        win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETPARTS, 5, 
statwidths)
        win32gui.SendMessage(self.statusBar.GetHwnd(), win32con.WM_SIZE, 0, 0)
!       self.mainWindow._statusBar = self.statusBar
      self._eventHandler = event.eventHandler
  
      self._wrapper.finalize()