[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms src/uidrivers/win32/common.py src/ui...
|
From: |
Jason Cater |
|
Subject: |
gnue/forms src/uidrivers/win32/common.py src/ui... |
|
Date: |
Mon, 03 Mar 2003 16:28:08 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/03 16:28:07
Modified files:
forms/src/uidrivers/win32: common.py
forms/src/uidrivers/win32/widgets/form: widget.py
forms/src/uidrivers/wx/widgets: _base.py page.py
Added files:
forms/images : commit-24x24.bmp enterquery-24x24.bmp
execquery-24x24.bmp exit-24x24.bmp
firstrecord-24x24.bmp jumpprompt-24x24.bmp
lastrecord-24x24.bmp markfordelete-24x24.bmp
newrecord-24x24.bmp nextrecord-24x24.bmp
prevrecord-24x24.bmp rollback-24x24.bmp
forms/src/uidrivers/win32: MenuBar.py ToolBar.py
Log message:
converted win32 driver to new MenuBar and ToolBar interface
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/commit-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/enterquery-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/execquery-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/exit-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/firstrecord-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/jumpprompt-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/lastrecord-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/markfordelete-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/newrecord-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/nextrecord-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/prevrecord-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/rollback-24x24.bmp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/MenuBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/common.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/_base.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/page.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/win32/common.py
diff -c gnue/forms/src/uidrivers/win32/common.py:1.2
gnue/forms/src/uidrivers/win32/common.py:1.3
*** gnue/forms/src/uidrivers/win32/common.py:1.2 Sun Mar 2 17:45:12 2003
--- gnue/forms/src/uidrivers/win32/common.py Mon Mar 3 16:28:07 2003
***************
*** 26,33 ****
#FIX# 'cp1250': wxFONTENCODING_CP1250,
#FIX# 'cp1251': wxFONTENCODING_CP1251,
#FIX# 'cp1252': wxFONTENCODING_CP1252
! '':''
}
disabledColour = 0 # wxLIGHT_GREY
--- 26,40 ----
#FIX# 'cp1250': wxFONTENCODING_CP1250,
#FIX# 'cp1251': wxFONTENCODING_CP1251,
#FIX# 'cp1252': wxFONTENCODING_CP1252
! '':''
}
+
+ _idPos = 1000
+
+ def getNextId():
+ global _idPos
+ _idPos += 1
+ return _idPos
disabledColour = 0 # wxLIGHT_GREY
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.2
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.3
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.2 Sun Mar 2
17:45:12 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py Mon Mar 3
16:28:07 2003
***************
*** 33,43 ****
from gnue.forms.uidrivers.win32.common import *
from gnue.forms.uidrivers.win32.common import _eventObjToWin32Window
from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
import wrappers
- idPos = 1001
-
#
# UIForm
#
--- 33,43 ----
from gnue.forms.uidrivers.win32.common import *
from gnue.forms.uidrivers.win32.common import _eventObjToWin32Window
from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
+ from gnue.forms.uidrivers.win32.MenuBar import MenuBar
+ from gnue.forms.uidrivers.win32.ToolBar import ToolBar
import wrappers
#
# UIForm
#
***************
*** 45,85 ****
#
class UIForm(UIHelper):
!
def __init__(self, event):
self._uiPageList=[]
UIHelper.__init__(self, event)
- #
- # Internal helper function to add a menu item and an event
- #
-
- def __addMenuItem(self, menu, text, help, event=None, form=None):
- global idPos
- id = idPos
- win32gui.AppendMenu(menu, win32con.MF_STRING, id, text)
- if event:
- # self.mainWindow.Connect(id, lambda event, l=self._uiDriver, e=event,
f=self._form: l.dispatchEvent(events.Event(e,_form=f)))
- self.mainWindow.Connect(id, lambda l=self._uiDriver, e=event,
f=self._form: l.dispatchEvent(events.Event(e,_form=f)))
- self.__eventMenuMapping[event] = id
- idPos +=1
- return id
-
- def __appendSeparator(self, menu):
- win32gui.AppendMenu(menu, win32con.MF_SEPARATOR, 0, "")
def __addTBButton(self, idCommand, image, tip, text):
hIcon = win32gui.LoadImage(0, self._uiDriver.images_dir+image,
win32con.IMAGE_BITMAP, 24, 24, win32con.LR_LOADFROMFILE)
tbab = struct.pack("ii", 0, hIcon)
iBitmap = win32gui.SendMessage(self._mainToolBar.GetId(),
commctrl.TB_ADDBITMAP, 1, tbab)
!
# TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
tbb=struct.pack("iiiili", iBitmap, idCommand, commctrl.TBSTATE_ENABLED,
commctrl.TBSTYLE_BUTTON, 0, 0)
win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDBUTTONS,
1, tbb)
! win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDSTRING,
0, tip);
def __enableTBButton(self,index):
! win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_HIDEBUTTON,
0, index);
def __addTBSeparator(self):
pass
--- 45,68 ----
#
class UIForm(UIHelper):
!
def __init__(self, event):
self._uiPageList=[]
UIHelper.__init__(self, event)
def __addTBButton(self, idCommand, image, tip, text):
hIcon = win32gui.LoadImage(0, self._uiDriver.images_dir+image,
win32con.IMAGE_BITMAP, 24, 24, win32con.LR_LOADFROMFILE)
tbab = struct.pack("ii", 0, hIcon)
iBitmap = win32gui.SendMessage(self._mainToolBar.GetId(),
commctrl.TB_ADDBITMAP, 1, tbab)
!
# TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
tbb=struct.pack("iiiili", iBitmap, idCommand, commctrl.TBSTATE_ENABLED,
commctrl.TBSTYLE_BUTTON, 0, 0)
win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDBUTTONS,
1, tbb)
! win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_ADDSTRING,
0, tip);
def __enableTBButton(self,index):
! win32gui.SendMessage(self._mainToolBar.GetId(), commctrl.TB_HIDEBUTTON,
0, index);
def __addTBSeparator(self):
pass
***************
*** 102,113 ****
#
# Size based upon the form definition
#
!
formWidth = int(self._form._layout.Char__width)
formHeight = int(self._form._layout.Char__height)
self._visibleSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
!
self._formSize = formSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
--- 85,96 ----
#
# Size based upon the form definition
#
!
formWidth = int(self._form._layout.Char__width)
formHeight = int(self._form._layout.Char__height)
self._visibleSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
!
self._formSize = formSize = (formWidth*self._uiDriver.widgetWidth,
formHeight*self._uiDriver.widgetHeight)
***************
*** 119,125 ****
# 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,
--- 102,108 ----
# 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,
***************
*** 143,229 ****
newWidget = self._wrapper.pane
self._containerToolkitWidget = newWidget
- ## # TODO: Scrollbar width adjustment?
- ## tempx,tempy = self.mainWindow.GetSizeTuple()
- ## mainWindowSize = wxSize(20+tempx, 20+tempy)
- ## self.mainWindow.SetSize(mainWindowSize)
-
- #
# Add the menu
- #
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
! # This will be a dict of the form { 'requestROLLBACK': 1001 }
! # where 1001 is the wxId associated with requestROLLBACK.
! self.__eventMenuMapping = {}
!
! fileMenu = win32gui.CreatePopupMenu()
! self.__addMenuItem(fileMenu,_("&Save\tF6"),_('Save all changes to
database.'),'requestCOMMIT', form=self._form)
! self.__addMenuItem(fileMenu,_("&Clear Form\tF11"),_('Clear
Form'),'requestROLLBACK', form=self._form)
! self.__appendSeparator(fileMenu)
!
! self.__addMenuItem(fileMenu,_("&Print"),_('Perform print routine for
this form.'),'requestPRINTOUT', form=self._form)
! self.__appendSeparator(fileMenu)
!
! id = self.__addMenuItem(fileMenu,_("E&xit"),_('Leave the
application.'), form=self._form)
! # EVT_MENU(self._uiDriver._wxapp, id, self._menuExitEvent)
! self.mainWindow.Connect(id, self._menuExitEvent)
! self.__eventMenuMapping['_exit_'] = id
!
! editMenu = win32gui.CreatePopupMenu()
! self.__addMenuItem(editMenu,_("C&ut"),_("Cut the selected
text"),'requestCUT', form=self._form)
! self.__addMenuItem(editMenu,_("&Copy"),_("Copy the selected text"),
'requestCOPY', form=self._form)
! self.__addMenuItem(editMenu,_("&Paste"),_("Paste text"),'requestPASTE',
form=self._form)
!
! dataMenu = win32gui.CreatePopupMenu()
! self.__addMenuItem(dataMenu,_("&First Record\tCtrl+Up"),_('Navigate to
first record in memory.'),'requestFIRSTRECORD', form=self._form)
! self.__addMenuItem(dataMenu,_("&Previous Record\tUp"),_('Navigate to
previous record in memory.'),'requestPREVRECORD', form=self._form)
! self.__addMenuItem(dataMenu,_("&Next Record\tDown"),_('Navigate to next
record in memory.'),'requestNEXTRECORD', form=self._form)
! self.__addMenuItem(dataMenu,_("&Last Record\tCtrl+Down"),_('Navigate to
last record in memory.'),'requestLASTRECORD', form=self._form)
! id = self.__addMenuItem(dataMenu,_("&Jump to Record...\tF2"),_('Prompts
for a record number to which the system should jump.'), form=self._form)
!
! #EVT_MENU(self._uiDriver._wxapp, id, _PROMPTFORRECORD)
! # TODO:
! #self.mainWindow.Connect(id, _PROMPTFORRECORD)
! self.__eventMenuMapping['_promptForRecord_'] = id
!
! self.__addMenuItem(dataMenu,_("N&ew Record\tF12"),_('Create a new
record for data input.'),'requestNEWRECORD', form=self._form)
! self.__addMenuItem(dataMenu,_("Mark Record for &Delete\tF5"),_('Mark
record for removal at next commit.'),'requestMARKFORDELETE', form=self._form)
!
! self.__appendSeparator(dataMenu)
! self.__addMenuItem(dataMenu,_("Next &Block\tPgDn"),_('Navigate to next
data block.'),'requestNEXTBLOCK', form=self._form)
! self.__addMenuItem(dataMenu,_("P&revious Block\tPgUp"),_('Navigate to
previous data block.'),'requestPREVBLOCK', form=self._form)
!
! self.__appendSeparator(dataMenu)
! self.__addMenuItem(dataMenu,_("&Enter Query\tF8"),_('Switch to input
query mask mode.'),'requestENTERQUERY', form=self._form)
! self.__addMenuItem(dataMenu,_("Execute &Query\tF9"), _('Execute query
using current mask.'),'requestEXECQUERY', form=self._form)
!
! helpMenu = win32gui.CreatePopupMenu()
! self.__addMenuItem(helpMenu,_("&About..."), _('Display info about GNUe
Forms.'),'requestABOUT', form=self._form)
!
! menuBar = win32gui.CreateMenu()
!
! style = win32con.MF_STRING | win32con.MF_POPUP
! win32gui.AppendMenu( menuBar, style, fileMenu, _("&File") )
! win32gui.AppendMenu( menuBar, style, editMenu, _("&Edit") )
! win32gui.AppendMenu( menuBar, style, dataMenu, _("&Data") )
! win32gui.AppendMenu( menuBar, style, helpMenu, _("&Help") )
! self._menuBar = menuBar
! win32gui.SetMenu(self.mainWindow.GetId(), self._menuBar )
#
# Build Toolbar
#
! if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS #|
commctrl.TBSTYLE_FLAT
styleEx = 0
! self._mainToolBar = mainToolBar = Win32Window(self._uiDriver, styleEx,
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
style, 0, 0, 0, 0,
self.mainWindow, 8002, hinst)
! win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_BUTTONSTRUCTSIZE,
12, 0);
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBITMAPSIZE, 0,
0x00180018); # 24x24
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBUTTONSIZE, 0,
0x00180018); # 24x24
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_AUTOSIZE, 0, 0)
--- 126,152 ----
newWidget = self._wrapper.pane
self._containerToolkitWidget = newWidget
# Add the menu
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
! MenuBar(self._uiDriver, self.mainWindow, self._form)
! # and the Toolbar
! if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
! ToolBar(self._uiDriver, self.mainWindow, self._form)
#
# Build Toolbar
#
! if 0: # not self._form._features['GUI:TOOLBAR:SUPPRESS']:
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS #|
commctrl.TBSTYLE_FLAT
styleEx = 0
! self._mainToolBar = mainToolBar = Win32Window(self._uiDriver, styleEx,
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
style, 0, 0, 0, 0,
self.mainWindow, 8002, hinst)
! win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_BUTTONSTRUCTSIZE,
12, 0);
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBITMAPSIZE, 0,
0x00180018); # 24x24
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_SETBUTTONSIZE, 0,
0x00180018); # 24x24
win32gui.SendMessage(mainToolBar.GetId(), commctrl.TB_AUTOSIZE, 0, 0)
***************
*** 262,268 ****
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | win32con.WS_VISIBLE |
commctrl.SBARS_SIZEGRIP
styleEx = 0
! self.statusBar = Win32Window(self._uiDriver, styleEx,
commctrl.STATUSCLASSNAME, "",
style, 0, 0, 0, 0,
self.mainWindow, 8001, hinst)
x=formWidth*self._uiDriver.widgetWidth
--- 185,191 ----
hinst = win32api.GetModuleHandle(None)
style = win32con.WS_CHILD | win32con.WS_VISIBLE |
commctrl.SBARS_SIZEGRIP
styleEx = 0
! self.statusBar = Win32Window(self._uiDriver, styleEx,
commctrl.STATUSCLASSNAME, "",
style, 0, 0, 0, 0,
self.mainWindow, 8001, hinst)
x=formWidth*self._uiDriver.widgetWidth
Index: gnue/forms/src/uidrivers/wx/widgets/_base.py
diff -c gnue/forms/src/uidrivers/wx/widgets/_base.py:1.3
gnue/forms/src/uidrivers/wx/widgets/_base.py:1.4
*** gnue/forms/src/uidrivers/wx/widgets/_base.py:1.3 Mon Mar 3 11:31:11 2003
--- gnue/forms/src/uidrivers/wx/widgets/_base.py Mon Mar 3 16:28:07 2003
***************
*** 77,89 ****
# Override the base UIWidget functions
#
def show(self):
- print "showing", self.widgets
for widget in self.widgets:
widget.Show(1)
widget.Raise()
def hide(self):
- print "hiding", self.widgets
for widget in self.widgets:
widget.Show(0)
--- 77,87 ----
Index: gnue/forms/src/uidrivers/wx/widgets/page.py
diff -c gnue/forms/src/uidrivers/wx/widgets/page.py:1.1
gnue/forms/src/uidrivers/wx/widgets/page.py:1.2
*** gnue/forms/src/uidrivers/wx/widgets/page.py:1.1 Mon Feb 10 21:01:49 2003
--- gnue/forms/src/uidrivers/wx/widgets/page.py Mon Mar 3 16:28:07 2003
***************
*** 50,56 ****
class UIPage(UIHelper):
def _createWidget(self, event, spacer):
- print "The page sill get stuck in ", event.container
object = event.object
newWidget = self._uiForm._wrapper.createPage(object)
--- 50,55 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms src/uidrivers/win32/common.py src/ui...,
Jason Cater <=