[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers/win32 TODO UIdriver.py...
From: |
Bajusz Tamás |
Subject: |
gnue/forms/src/uidrivers/win32 TODO UIdriver.py... |
Date: |
Wed, 28 May 2003 17:54:58 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Bajusz Tamás <address@hidden> 03/05/28 17:54:57
Modified files:
forms/src/uidrivers/win32: TODO UIdriver.py
forms/src/uidrivers/win32/widgets: entry.py
forms/src/uidrivers/win32/widgets/form: widget.py wrappers.py
Log message:
minor cosmetic changes (XP theme differs from classic, grrrr)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/TODO.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/entry.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/form/widget.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/win32/TODO
diff -c gnue/forms/src/uidrivers/win32/TODO:1.3
gnue/forms/src/uidrivers/win32/TODO:1.4
*** gnue/forms/src/uidrivers/win32/TODO:1.3 Thu May 8 16:14:07 2003
--- gnue/forms/src/uidrivers/win32/TODO Wed May 28 17:54:57 2003
***************
*** 1,9 ****
* scrollable windows for image widgets
* scrollbar widget
* splash screen
- * cut/copy/paste/select all support with Ctrl-X/C/V/A
* textencoding support
* handle key events when no entry in focus
* multi-line edit CR/LF issues
! * remove all hardcoded positioning/sizeing
--- 1,9 ----
* scrollable windows for image widgets
* scrollbar widget
* splash screen
* textencoding support
* handle key events when no entry in focus
* multi-line edit CR/LF issues
! * remove hardcoded positioning/sizing from UILoginHandler.py
! * fix image widget painting bug, when stepping back to prev record
Index: gnue/forms/src/uidrivers/win32/UIdriver.py
diff -c gnue/forms/src/uidrivers/win32/UIdriver.py:1.15
gnue/forms/src/uidrivers/win32/UIdriver.py:1.16
*** gnue/forms/src/uidrivers/win32/UIdriver.py:1.15 Sat May 24 11:20:07 2003
--- gnue/forms/src/uidrivers/win32/UIdriver.py Wed May 28 17:54:57 2003
***************
*** 102,108 ****
wc.lpszClassName = "GNUeWindow"
wc.hCursor = win32gui.LoadCursor( 0, win32con.IDC_ARROW )
wc.hIcon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
! wc.hbrBackground = win32con.COLOR_WINDOW
wc.lpfnWndProc = self._wndproc
self.__class__._wndclass = win32gui.RegisterClass(wc)
--- 102,108 ----
wc.lpszClassName = "GNUeWindow"
wc.hCursor = win32gui.LoadCursor( 0, win32con.IDC_ARROW )
wc.hIcon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
! wc.hbrBackground = win32con.COLOR_BTNSHADOW #win32con.COLOR_WINDOW
wc.lpfnWndProc = self._wndproc
self.__class__._wndclass = win32gui.RegisterClass(wc)
***************
*** 155,161 ****
# Close dummy window so app doesn't hang when all other windows closed
#
# dummyWindow.Close()
!
#############################################################################
--- 155,161 ----
# Close dummy window so app doesn't hang when all other windows closed
#
# dummyWindow.Close()
! dummyWindow.ReleaseDC(dc)
#############################################################################
Index: gnue/forms/src/uidrivers/win32/widgets/entry.py
diff -c gnue/forms/src/uidrivers/win32/widgets/entry.py:1.9
gnue/forms/src/uidrivers/win32/widgets/entry.py:1.10
*** gnue/forms/src/uidrivers/win32/widgets/entry.py:1.9 Sat May 24 11:20:07 2003
--- gnue/forms/src/uidrivers/win32/widgets/entry.py Wed May 28 17:54:57 2003
***************
*** 67,74 ****
width = height
else: # Normal text box
! style = win32con.WS_CHILD | win32con.ES_NOHIDESEL | \
! win32con.WS_BORDER #| win32con.ES_AUTOHSCROLL
if hasattr(object,'Char__height') and object.Char__height > 1:
style = style | win32con.ES_MULTILINE | win32con.ES_AUTOVSCROLL | \
--- 67,74 ----
width = height
else: # Normal text box
! style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| \
! #win32con.WS_BORDER #| win32con.ES_AUTOHSCROLL
if hasattr(object,'Char__height') and object.Char__height > 1:
style = style | win32con.ES_MULTILINE | win32con.ES_AUTOVSCROLL | \
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.16
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.17
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.16 Sat May 24
07:11:03 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py Wed May 28
17:54:57 2003
***************
*** 86,93 ****
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)+6,
!
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+75,
0)
if self._form.style == 'dialog':
--- 86,93 ----
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)
if self._form.style == 'dialog':
Index: gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.8
gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.9
*** gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.8 Sat May 24
07:11:03 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py Wed May 28
17:54:57 2003
***************
*** 28,34 ****
#
import string, struct, array
! import win32gui, win32con, win32api, commctrl
from gnue.common import events
from gnue.common.apps import GDebug
--- 28,34 ----
#
import string, struct, array
! import win32gui, win32con, win32api, commctrl, win32ui
from gnue.common import events
from gnue.common.apps import GDebug
***************
*** 50,59 ****
#win32con.WS_VSCROLL | win32con.WS_HSCROLL
styleEx = 0
self.sw=Win32Window(self.uiform._uiDriver, styleEx,
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
! 0,
self.uiform.buttonbarHeight+4,
! formWidth*uiform._uiDriver.widgetWidth+6,
! formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
frame)
self._fitted = 0
--- 50,59 ----
#win32con.WS_VSCROLL | win32con.WS_HSCROLL
styleEx = 0
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)
self._fitted = 0
***************
*** 77,82 ****
--- 77,84 ----
# Notebook pages
#
class TabbedWrapper(ScrollableWrapper):
+ tabHeight = 0
+
def __init__(self, *args, **parms):
ScrollableWrapper.__init__(self, *args, **parms)
formWidth = int(self.form._layout.Char__width)
***************
*** 85,98 ****
style = win32con.WS_CHILD | commctrl.TCS_TABS #| win32con.WS_BORDER
styleEx = 0
self.pane = Win32Window(self.uiform._uiDriver, styleEx,
commctrl.WC_TABCONTROL, "tabcontrol", style,
! 0,
! 0,
formWidth*self.uiform._uiDriver.widgetWidth+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")
--- 87,105 ----
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")
***************
*** 101,115 ****
icount = win32gui.SendMessage(self.pane.GetHwnd(),
commctrl.TCM_GETITEMCOUNT, 0, 0)
win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_INSERTITEM,
icount, tab)
! 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,
self.pane, getNextId())
# Only show first page
--- 108,135 ----
icount = win32gui.SendMessage(self.pane.GetHwnd(),
commctrl.TCM_GETITEMCOUNT, 0, 0)
win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_INSERTITEM,
icount, tab)
! 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src/uidrivers/win32 TODO UIdriver.py...,
Bajusz Tamás <=