[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers/win32 ToolBar.py widge...
|
From: |
Bajusz Tamás |
|
Subject: |
gnue/forms/src/uidrivers/win32 ToolBar.py widge... |
|
Date: |
Sat, 08 Mar 2003 14:59:07 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Bajusz Tamás <address@hidden> 03/03/08 14:59:07
Modified files:
forms/src/uidrivers/win32: ToolBar.py
forms/src/uidrivers/win32/widgets/form: widget.py wrappers.py
Log message:
starting tabbed pages
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.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/widgets/form/widget.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/widgets/form/wrappers.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.3
gnue/forms/src/uidrivers/win32/ToolBar.py:1.4
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.3 Tue Mar 4 07:49:36 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py Sat Mar 8 14:59:05 2003
***************
*** 102,109 ****
# Add a separator
def addSeparator(self):
# TODO: this doesn't work
! # tbb=struct.pack("iiiili", 0, 0, commctrl.TBSTATE_ENABLED,
commctrl.TBSTYLE_SEP, 0, 0)
! # win32gui.SendMessage(self._mainToolBar.GetId(),
commctrl.TB_ADDBUTTONS, 1, tbb)
return
self.toolbar.AddSeparator()
--- 102,109 ----
# Add a separator
def addSeparator(self):
# TODO: this doesn't work
! # tbb=struct.pack("iiiili", -1, 0, commctrl.TBSTATE_ENABLED,
commctrl.TBSTYLE_SEP, 0, 0)
! # win32gui.SendMessage(self.toolbar.GetId(), commctrl.TB_ADDBUTTONS, 1,
tbb)
return
self.toolbar.AddSeparator()
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.4
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.5
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.4 Mon Mar 3
16:30:05 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py Sat Mar 8
14:59:07 2003
***************
*** 77,84 ****
styleEx = 0
self.mainWindow = Win32Window(self._uiDriver, styleEx,
self._uiDriver._wndclass, str(self._form.title),
style, 0, 0,
! max(formWidth*self._uiDriver.widgetWidth+10, buttonbarWidth), # at
least buttonbar width
! formHeight*self._uiDriver.widgetHeight+100, # TODO: calculate +100 =
space for buttonbar and statusbar
0)
--- 77,84 ----
styleEx = 0
self.mainWindow = Win32Window(self._uiDriver, styleEx,
self._uiDriver._wndclass, str(self._form.title),
style, 0, 0,
! max(formWidth*self._uiDriver.widgetWidth+10, buttonbarWidth)+6, # at
least buttonbar width
! formHeight*self._uiDriver.widgetHeight+110+20, # TODO: calculate space
for buttonbar and statusbar and maybe for tabs
0)
***************
*** 88,95 ****
# self._scrollWindow.Show()
# The window in which pages will be rendered
! # TODO !!!
! if 0: #object._layout.tabbed:
self._wrapper = wrappers.TabbedWrapper(self)
else:
self._wrapper = wrappers.PlainWrapper(self)
--- 88,94 ----
# self._scrollWindow.Show()
# The window in which pages will be rendered
! if object._layout.tabbed:
self._wrapper = wrappers.TabbedWrapper(self)
else:
self._wrapper = wrappers.PlainWrapper(self)
Index: gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.2
gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.3
*** gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.2 Sun Mar 2
17:45:12 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py Sat Mar 8
14:59:07 2003
***************
*** 26,38 ****
#
# NOTES:
#
! import string
! import win32gui, win32con
from gnue.common import events
from gnue.common.apps import GDebug
from gnue.forms.uidrivers.win32.widgets._base import *
class ScrollableWrapper(Win32Window):
def __init__(self, uiform):
--- 26,39 ----
#
# NOTES:
#
! import string, struct, array
! import win32gui, win32con, win32api, commctrl
from gnue.common import events
from gnue.common.apps import GDebug
from gnue.forms.uidrivers.win32.widgets._base import *
+ from gnue.forms.uidrivers.win32.common import getNextId
class ScrollableWrapper(Win32Window):
def __init__(self, uiform):
***************
*** 45,58 ****
self.layoutSize = (formWidth*uiform._uiDriver.widgetWidth,
formHeight*uiform._uiDriver.widgetHeight)
! style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #|
win32con.WS_THICKFRAME
! #| win32con.WS_VSCROLL | win32con.WS_HSCROLL
styleEx = 0
self.sw=Win32Window(self.uiform._uiDriver, styleEx,
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
0,
! 33, # TODO: size of toolbar
! formWidth*uiform._uiDriver.widgetWidth,
! formHeight*uiform._uiDriver.widgetHeight,
frame)
# EVT_SIZE(self.frame, self.OnFrameSize)
--- 46,59 ----
self.layoutSize = (formWidth*uiform._uiDriver.widgetWidth,
formHeight*uiform._uiDriver.widgetHeight)
! style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| \
! #win32con.WS_VSCROLL | win32con.WS_HSCROLL
styleEx = 0
self.sw=Win32Window(self.uiform._uiDriver, styleEx,
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
0,
! 40, # TODO: size of toolbar
! formWidth*uiform._uiDriver.widgetWidth+6, # TODO
! formHeight*uiform._uiDriver.widgetHeight+24, # TODO
frame)
# EVT_SIZE(self.frame, self.OnFrameSize)
***************
*** 94,100 ****
#
class TabbedWrapper(ScrollableWrapper):
def __init__(self, *args, **parms):
! pass
# ScrollableWrapper.__init__(self, *args, **parms)
# tabstyle = _tabStyles[self.form._layout.tabbed]
# self.pane = notebook = wxNotebook(self,-1, #wxPoint(6,6),
--- 95,116 ----
#
class TabbedWrapper(ScrollableWrapper):
def __init__(self, *args, **parms):
! ScrollableWrapper.__init__(self, *args, **parms)
! 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
! id = getNextId()
! self.pane = Win32Window(self.uiform._uiDriver, styleEx,
commctrl.WC_TABCONTROL, "tabcontrol", style,
! 0,
! 0,
! formWidth*self.uiform._uiDriver.widgetWidth+6, # TODO
! formHeight*self.uiform._uiDriver.widgetHeight+22, # TODO
! self.sw, id, hinst)
!
! self.pane.Show()
! # pass
# ScrollableWrapper.__init__(self, *args, **parms)
# tabstyle = _tabStyles[self.form._layout.tabbed]
# self.pane = notebook = wxNotebook(self,-1, #wxPoint(6,6),
***************
*** 110,116 ****
# EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(),
self.notebookTabHandler)
def createPage(self, object):
! pass
# sizer = wxBoxSizer(wxVERTICAL)
# newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
# sizer.Add(newWidget, 0, wxCENTER)
--- 126,151 ----
# EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(),
self.notebookTabHandler)
def createPage(self, object):
! pszText = hasattr(object,'caption') and object.caption or object.name
! buff = array.array('c', pszText + "\0")
! addrText = buff.buffer_info()[0]
! tab=struct.pack("iilliii", commctrl.TCIF_TEXT | commctrl.TCIF_STATE, 0,
0, addrText, 0, 0, -1)
! icount = win32gui.SendMessage(self.pane.GetId(),
commctrl.TCM_GETITEMCOUNT, 0, 0)
! win32gui.SendMessage(self.pane.GetId(), 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, "createPage", style,
! 2, # TODO
! 28, # TODO
! formWidth*self.uiform._uiDriver.widgetWidth,
! formHeight*self.uiform._uiDriver.widgetHeight-10, # TODO
! self.pane)
! self._pageList.append(newWidget)
! return newWidget
! # pass
# sizer = wxBoxSizer(wxVERTICAL)
# newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
# sizer.Add(newWidget, 0, wxCENTER)
***************
*** 147,154 ****
# self.uiform._eventHandler(action)
def setPage(self, page):
! pass
! # pageId = self._pageList.index(page)
# self.pane.SetSelection(pageId)
--- 182,189 ----
# self.uiform._eventHandler(action)
def setPage(self, page):
! pageId = self._pageList.index(page)
! win32gui.SendMessage(self.pane.GetId(), commctrl.TCM_SETCURFOCUS, pageId,
0)
# self.pane.SetSelection(pageId)