gnue-forms/src/uidrivers/win32/widgets/form wid...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/06/23 03:41:56

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

Log message:
        adding tab styles to tabbed forms

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue-forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue-forms/src/uidrivers/win32/widgets/form/widget.py:1.18 
gnue-forms/src/uidrivers/win32/widgets/form/widget.py:1.19
*** gnue-forms/src/uidrivers/win32/widgets/form/widget.py:1.18  Fri Jun  6 
20:51:41 2003
--- gnue-forms/src/uidrivers/win32/widgets/form/widget.py       Mon Jun 23 
03:41:56 2003
***************
*** 76,83 ****
--- 76,85 ----
  
      if object._layout.tabbed != 'none':
        self.tabHeight = self._uiDriver.widgetHeight + 8
+       self.tabWidth = self._uiDriver.widgetWidth + 10
      else:
        self.tabHeight = 0
+       self.tabWidth = 0
  
      if self._form.style == 'dialog':
        style = win32con.WS_POPUP | win32con.WS_CAPTION | 
win32con.WS_CLIPCHILDREN | win32con.WS_SYSMENU #| win32con.WS_OVERLAPPED
***************
*** 86,92 ****
      styleEx = 0
      self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, str(self._form.title),
        style, win32con.CW_USEDEFAULT, 0,
!       max(formWidth*self._uiDriver.widgetWidth+10, self.buttonbarWidth)+10,
        
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+90,
        0)
  
--- 88,94 ----
      styleEx = 0
      self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, str(self._form.title),
        style, win32con.CW_USEDEFAULT, 0,
!       max(formWidth*self._uiDriver.widgetWidth+10, 
self.buttonbarWidth)+self.tabWidth+10,
        
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+90,
        0)
  
Index: gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
diff -c gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py:1.9 
gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py:1.10
*** gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py:1.9 Wed May 28 
17:54:57 2003
--- gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py     Mon Jun 23 
03:41:56 2003
***************
*** 52,58 ****
      self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
          2, 
          self.uiform.buttonbarHeight+4,
!         formWidth*uiform._uiDriver.widgetWidth+8,
          formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight+6,
          frame)
  
--- 52,58 ----
      self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
          2, 
          self.uiform.buttonbarHeight+4,
!         formWidth*uiform._uiDriver.widgetWidth+self.uiform.tabWidth+8,
          formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight+6,
          frame)
  
***************
*** 84,105 ****
      formWidth = int(self.form._layout.Char__width)
      formHeight = int(self.form._layout.Char__height)
      hinst = win32api.GetModuleHandle(None)
!     style = win32con.WS_CHILD | commctrl.TCS_TABS #| win32con.WS_BORDER
      styleEx = 0
      self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
          2, 
          2,
!         formWidth*self.uiform._uiDriver.widgetWidth+6,
          formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
          self.sw, getNextId(), hinst)
  
      self.pane.Show()
  
- #    _PyCWnd = win32ui.CreateWindowFromHandle(self.pane.GetHwnd())
- #    dc = _PyCWnd.GetDC()
- #    dc.SetBkColor(16)
- #    _PyCWnd.ReleaseDC(dc)
- 
    def createPage(self, object): 
      pszText = hasattr(object,'caption') and object.caption or object.name
      buff = array.array('c', pszText + "\0")
--- 84,101 ----
      formWidth = int(self.form._layout.Char__width)
      formHeight = int(self.form._layout.Char__height)
      hinst = win32api.GetModuleHandle(None)
!     tabstyle  = _tabStyles[self.form._layout.tabbed]
!     style = win32con.WS_CHILD | commctrl.TCS_TABS | tabstyle #| 
win32con.WS_BORDER
      styleEx = 0
      self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
          2, 
          2,
!         formWidth*self.uiform._uiDriver.widgetWidth+self.uiform.tabWidth+6,
          formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
          self.sw, getNextId(), hinst)
  
      self.pane.Show()
  
    def createPage(self, object): 
      pszText = hasattr(object,'caption') and object.caption or object.name
      buff = array.array('c', pszText + "\0")
***************
*** 110,135 ****
  
      l,t,r,b = win32gui.GetWindowRect(self.pane.GetHwnd())
      
!     if not self.tabHeight:
!       buff = array.array('i', [0,0,0,0])
!       addrBuff = buff.buffer_info()[0]
!       win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_GETITEMRECT, 1, 
addrBuff)
!       self.tabHeight = buff[3]
!       
! ##    formWidth = int(self.form._layout.Char__width)
! ##    formHeight = int(self.form._layout.Char__height)
  
      style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
      styleEx = 0
      newWidget = Win32Page(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "tabbedPage", style,
! ##        2,
! ##        self.uiform.tabHeight,
! ##        formWidth*self.uiform._uiDriver.widgetWidth,
! ##        formHeight*self.uiform._uiDriver.widgetHeight,
!         2,
!         self.tabHeight+3,
!         r-l-5,
!         b-t-self.tabHeight-6,
          self.pane, getNextId())
  
      # Only show first page
--- 106,137 ----
  
      l,t,r,b = win32gui.GetWindowRect(self.pane.GetHwnd())
      
!     buff = array.array('i', [0,0,0,0])
!     addrBuff = buff.buffer_info()[0]
!     win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_GETITEMRECT, 1, 
addrBuff)
!     self.tabWidth = buff[2]-buff[0]
!     self.tabHeight = buff[3]-buff[1]
! 
!     if self.form._layout.tabbed == 'top':
!       x, y, w, h = 2, self.tabHeight+3, r-l-5, b-t-self.tabHeight-6
! 
!     elif self.form._layout.tabbed == 'bottom':
!       x, y, w, h = 2, 2, r-l-5, b-t-self.tabHeight-6
! 
!     elif self.form._layout.tabbed == 'left':
!       x, y, w, h = self.tabWidth+3, 3, r-l-30, b-t-6
! 
!     elif self.form._layout.tabbed == 'right':
!       x, y, w, h = 2, 2, r-l-30, b-t-6
! 
  
      style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
      styleEx = 0
      newWidget = Win32Page(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "tabbedPage", style,
!         x,
!         y,
!         w,
!         h,
          self.pane, getNextId())
  
      # Only show first page
***************
*** 211,213 ****
--- 213,221 ----
          p.Hide()
        else:
          p.Show()
+ 
+ _tabStyles = {'left':commctrl.TCS_MULTILINE | commctrl.TCS_VERTICAL,
+                     'right':commctrl.TCS_MULTILINE | commctrl.TCS_VERTICAL | 
commctrl.TCS_RIGHT,
+                     'bottom':commctrl.TCS_BOTTOM,
+                     'top':0,
+                    }