[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers/win32 UIdriver.py widg...
|
From: |
Bajusz Tamás |
|
Subject: |
gnue/forms/src/uidrivers/win32 UIdriver.py widg... |
|
Date: |
Tue, 18 Mar 2003 16:27:04 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Bajusz Tamás <address@hidden> 03/03/18 16:27:04
Modified files:
forms/src/uidrivers/win32: UIdriver.py
forms/src/uidrivers/win32/widgets: _base.py
forms/src/uidrivers/win32/widgets/form: widget.py wrappers.py
Log message:
more event work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.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/wrappers.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/win32/UIdriver.py
diff -c gnue/forms/src/uidrivers/win32/UIdriver.py:1.6
gnue/forms/src/uidrivers/win32/UIdriver.py:1.7
*** gnue/forms/src/uidrivers/win32/UIdriver.py:1.6 Sun Mar 16 18:57:28 2003
--- gnue/forms/src/uidrivers/win32/UIdriver.py Tue Mar 18 16:27:04 2003
***************
*** 29,35 ****
import sys
import string
! import win32gui, win32con, afxres
from gnue.common import events
from gnue.common.apps import GDebug
--- 29,35 ----
import sys
import string
! import win32gui, win32con, afxres, commctrl
from gnue.common import events
from gnue.common.apps import GDebug
***************
*** 45,66 ****
from gnue.forms.uidrivers.win32.widgets._base import *
from gnue.forms.uidrivers.win32.common import _eventObjToWin32Window,
setWidgetBaseFont
- #from common import *
- def treeShow(object, uiDriver):
- try:
- print "Object ",object, object.Show(), object.GetParent(),
uiDriver._IdToGFObj[object.GetId()]
- except KeyError:
- print "Object ",object, object.Show(), object.GetParent(),
"NONE!!!!!!!!!!!!!"
-
- for child in object.GetChildren():
- treeShow(child, uiDriver)
-
-
- def OnWMLButtonDown(hwnd, msg, wParam, lParam, widget):
- return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
-
def OnWMNotify(hwnd, msg, wParam, lParam, widget):
return widget.OnWMNotify(hwnd, msg, wParam, lParam)
--- 45,52 ----
***************
*** 90,96 ****
_wndclass = None
_message_map = {
- win32con.WM_LBUTTONDOWN : OnWMLButtonDown,
win32con.WM_NOTIFY : OnWMNotify,
win32con.WM_DESTROY : OnWMDestroy,
win32con.WM_CLOSE : OnWMClose,
--- 76,81 ----
***************
*** 119,125 ****
def _wndproc(self, hwnd, msg, wParam, lParam):
try:
widget = self._IdToTkObj[hwnd]
- #print "idget calling _wndproc", widget, hwnd
except:
return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
try:
--- 104,109 ----
***************
*** 183,198 ****
# Tells the application to close it's main window
#
def _exit(self,formName):
exitApp = 1
for child in self._children:
if child._form.name == formName:
child.mainWindow.Hide()
! exitApp = exitApp and not child.mainWindow.IsShown()
if exitApp:
for child in self._children:
! child.mainWindow.Close(true)
def _beep(self):
pass
--- 167,184 ----
# Tells the application to close it's main window
#
def _exit(self,formName):
+ print "_exit !!!", formName, self._children
exitApp = 1
for child in self._children:
+ print "child._form.name=",child._form.name
if child._form.name == formName:
child.mainWindow.Hide()
! exitApp = exitApp and not
win32gui.IsWindowVisible(child.mainWindow.GetHwnd())
if exitApp:
for child in self._children:
! child.mainWindow.Destroy()
def _beep(self):
pass
***************
*** 221,229 ****
# a line of text
#
def formAlert(self, event):
! pass
! # wxBell()
! self.statusBar.SetStatusText(event.data,0)
#
# Called whenever forms goes into a "wait" state in which user cannot
--- 207,215 ----
# a line of text
#
def formAlert(self, event):
! self._beep()
! ui = self._gfObjToUIWidget[event._form]
! win32gui.SendMessage(ui.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
str(event.data))
#
# Called whenever forms goes into a "wait" state in which user cannot
Index: gnue/forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue/forms/src/uidrivers/win32/widgets/_base.py:1.6
gnue/forms/src/uidrivers/win32/widgets/_base.py:1.7
*** gnue/forms/src/uidrivers/win32/widgets/_base.py:1.6 Sun Mar 16 18:57:28 2003
--- gnue/forms/src/uidrivers/win32/widgets/_base.py Tue Mar 18 16:27:04 2003
***************
*** 63,69 ****
self._uiDriver = uidriver
uidriver._IdToTkObj[self._hwnd] = self
! if type(className) == StringType: # STATIC BUTTON COMBOBOX EDIT
self.Show()
# i don't know how to get the adress of a wndproc func
# for global subclassing with
--- 63,69 ----
self._uiDriver = uidriver
uidriver._IdToTkObj[self._hwnd] = self
! if className in ['STATIC', 'BUTTON', 'COMBOBOX', 'EDIT']:
self.Show()
# i don't know how to get the adress of a wndproc func
# for global subclassing with
***************
*** 73,79 ****
print windowTitle,className,self._id,self._hwnd
def _wndproc(self, hwnd, msg, wParam, lParam):
! if msg == win32con.WM_KEYDOWN:
keycode = wParam
if keycode in NOT_WM_CHAR_KEYS:
object = self._uiDriver._IdToGFObj[self._id]
--- 73,95 ----
print windowTitle,className,self._id,self._hwnd
def _wndproc(self, hwnd, msg, wParam, lParam):
! if msg == win32con.WM_LBUTTONDOWN:
! print "OnWMLButtonDown"
! gfObject = self._uiDriver._IdToGFObj[self._id]
! uiobject = self._uiDriver._IdToUIObj[self._id]
!
! if 1: #not self.hasFocus():
! # Request Focus
! uiobject._eventHandler('requestFOCUS',gfObject,_form=gfObject._form)
! count = uiobject.widgets.index(self)
! uiobject._eventHandler('requestJUMPRECORD',count -
gfObject._visibleIndex,_form=gfObject._form)
!
! #pos = win32gui.SendMessage(hwnd, win32con.EM_GETSEL, 0, 0)
! #print "cursorPosition=", pos
!
#uiobject._eventHandler('requestCURSORMOVE',position=cursorPosition,_form=gfObject._form)
! return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam,
lParam)
!
! elif msg == win32con.WM_KEYDOWN:
keycode = wParam
if keycode in NOT_WM_CHAR_KEYS:
object = self._uiDriver._IdToGFObj[self._id]
***************
*** 154,159 ****
--- 170,176 ----
action = events.Event('request%s' % command)
elif object._type == 'GFButton':
+ print "elif GFButton"
action = events.Event('buttonActivated',object)
elif object.style == 'checkbox' and object._type == 'GFEntry':
***************
*** 263,268 ****
--- 280,286 ----
self._connectTable[wParam]()
def OnWMNotify(self, hwnd, msg, wParam, lParam):
+ ###print "OnWMNotify Win32Window"
# handling tabbed pages
format = "iiiiiiiiiii"
buf = win32gui.PyMakeBuffer(struct.calcsize(format), lParam)
***************
*** 317,323 ****
class Win32Button(Win32Base):
def OnWMCommand(self, hwnd, msg, wParam, lParam):
! ###print 'OnWMCommand in Win32Button', hwnd, msg, wParam, lParam
print self._connectTable[wParam]
self._connectTable[wParam](wParam)
--- 335,341 ----
class Win32Button(Win32Base):
def OnWMCommand(self, hwnd, msg, wParam, lParam):
! print 'OnWMCommand in Win32Button', hwnd, msg, wParam, lParam
print self._connectTable[wParam]
self._connectTable[wParam](wParam)
***************
*** 329,337 ****
window = self._uiDriver._IdToTkObj[lParam]
window.OnWMCommand(hwnd, msg, wParam, lParam)
! def OnWMNotify(self, hwnd, msg, wParam, lParam):
! print "OnWMNotify Win32Page", hwnd, msg, wParam, lParam
! self._uiDriver._IdToTkObj[lParam].Show()
#
--- 347,355 ----
window = self._uiDriver._IdToTkObj[lParam]
window.OnWMCommand(hwnd, msg, wParam, lParam)
! # def OnWMNotify(self, hwnd, msg, wParam, lParam):
! # print "OnWMNotify Win32Page", hwnd, msg, wParam, lParam
! # self._uiDriver._IdToTkObj[lParam].Show()
#
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.9
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.10
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.9 Sun Mar 16
18:57:28 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py Tue Mar 18
16:27:04 2003
***************
*** 72,78 ****
# TODO: calculate
buttonbarWidth = 12*(24+8)
! style = win32con.WS_OVERLAPPEDWINDOW | win32con.WS_CLIPCHILDREN
styleEx = 0
self.mainWindow = Win32Window(self._uiDriver, styleEx,
self._uiDriver._wndclass, str(self._form.title),
style, 0, 0,
--- 72,81 ----
# TODO: calculate
buttonbarWidth = 12*(24+8)
! if self._form.style == 'dialog':
! style = win32con.WS_OVERLAPPED | win32con.WS_CAPTION |
win32con.WS_CLIPCHILDREN | win32con.WS_SYSMENU
! else:
! style = win32con.WS_OVERLAPPEDWINDOW | win32con.WS_CLIPCHILDREN
styleEx = 0
self.mainWindow = Win32Window(self._uiDriver, styleEx,
self._uiDriver._wndclass, str(self._form.title),
style, 0, 0,
***************
*** 99,105 ****
ToolBar(self._uiDriver, self.mainWindow, self._form)
! if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | win32con.WS_VISIBLE |
commctrl.SBARS_SIZEGRIP
styleEx = 0
--- 102,109 ----
ToolBar(self._uiDriver, self.mainWindow, self._form)
! # if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
! if self._form.style != 'dialog':
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | win32con.WS_VISIBLE |
commctrl.SBARS_SIZEGRIP
styleEx = 0
***************
*** 145,172 ****
#
def gotoPage(self,event):
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
- print "gotoPage event=",event
- # if not self._notebook:
- # for page in self._uiPageList:
- # if page != uiPage:
- # page.hide()
- # else:
- # page.show()
- # else:
- # uiPage widgets only contain 1 item
-
- # pageId = uiPage.widgets[0].GetId()
- # for count in range(self._notebook.GetPageCount()):
- # if pageId == self._notebook.GetPage(count).GetId():
- # self._notebook.SetSelection(count)
-
-
#
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
if tip != None:
win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
str(tip))
--- 149,166 ----
#
def gotoPage(self,event):
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
#
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
+ try:
+ self.statusBar
+ except:
+ print "no statusBar here"
+ return
+
if tip != None:
win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
str(tip))
Index: gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.4
gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.5
*** gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.4 Sun Mar 9
18:08:46 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py Tue Mar 18
16:27:04 2003
***************
*** 175,199 ****
# self.frame.SetClientSize(self.GetSize())
self._fitted = 1
- def notebookTabHandler(self,event):
- pass
- # if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
- # #object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]
- # action = None
- # if self.__notebookLoopTrap == 0:
- # action = events.Event('requestPAGE',event.GetSelection(),
_form=self.form)
- # self.__notebookLoopTrap = 1
- # else:
- # self.__notebookLoopTrap = 0
- # if action:
- # self.uiform._eventHandler(action)
-
def setPage(self, page):
pageId = self._pageList.index(page)
win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_SETCURSEL, pageId,
0)
! # self.pane.SetSelection(pageId)
!
!
#
# Single pages win32con.CW_USEDEFAULT,
#
--- 175,192 ----
# self.frame.SetClientSize(self.GetSize())
self._fitted = 1
def setPage(self, page):
pageId = self._pageList.index(page)
win32gui.SendMessage(self.pane.GetHwnd(), commctrl.TCM_SETCURSEL, pageId,
0)
!
! print "setPage",page,self._pageList
! for p in self._pageList:
! if p != page:
! p.Hide()
! else:
! p.Show()
!
!
#
# Single pages win32con.CW_USEDEFAULT,
#