[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers/qt widgets/button.py w...
|
From: |
Jason Cater |
|
Subject: |
gnue/forms/src/uidrivers/qt widgets/button.py w... |
|
Date: |
Sun, 02 Mar 2003 13:46:31 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/02 13:46:31
Modified files:
forms/src/uidrivers/qt/widgets: button.py
forms/src/uidrivers/qt/widgets/form: widget.py
Added files:
forms/src/uidrivers/qt: MenuBar.py ToolBar.py
Log message:
more QT-luvin goodness
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/MenuBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/ToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/button.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/form/widget.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/qt/widgets/button.py
diff -c gnue/forms/src/uidrivers/qt/widgets/button.py:1.2
gnue/forms/src/uidrivers/qt/widgets/button.py:1.3
*** gnue/forms/src/uidrivers/qt/widgets/button.py:1.2 Sat Feb 22 01:54:58 2003
--- gnue/forms/src/uidrivers/qt/widgets/button.py Sun Mar 2 13:46:31 2003
***************
*** 58,71 ****
# TODO: we need to listen for "clicked()" slot
! ## if event.initialize:
! ## self._eventHandler = event.eventHandler
! ## EVT_BUTTON(newWidget,newWidget.GetId(),self.buttonHandler)
! ## _setDefaultEventHandlers(newWidget, event.eventHandler,
event.initialize, self._uiDriver)
return newWidget
! ## def buttonHandler(self,event):
## if event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED:
## action = None
## object = _eventObjToQtWindow(event)
--- 58,70 ----
# TODO: we need to listen for "clicked()" slot
! if event.initialize:
! QObject.connect(newWidget, SIGNAL("clicked()"), self.buttonHandler)
return newWidget
! def buttonHandler(self):
! print "Button clicked"
## if event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED:
## action = None
## object = _eventObjToQtWindow(event)
Index: gnue/forms/src/uidrivers/qt/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.2
gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.3
*** gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.2 Sat Feb 22
01:54:58 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/widget.py Sun Mar 2 13:46:31 2003
***************
*** 33,38 ****
--- 33,40 ----
from gnue.forms.uidrivers.qt.common import *
from gnue.forms.uidrivers.qt.common import _eventObjToQtWindow
from gnue.forms.uidrivers.qt.widgets._base import UIHelper
+ from gnue.forms.uidrivers.qt.MenuBar import MenuBar
+ from gnue.forms.uidrivers.qt.ToolBar import ToolBar
import wrappers
***************
*** 47,75 ****
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):
! id = menu.insertItem(text)
! menu.setWhatsThis(id, help)
!
! ## if event:
! ## EVT_MENU(self._uiDriver._wxapp, id,
! ## lambda event, l=self._uiDriver, e=event, f=self._form:
l.dispatchEvent(events.Event(e,_form=f)))
! ## self.__eventMenuMapping[event] = id
!
! return id
!
! #
! # _menuExitEvent
! #
! # Catches the Exit event from the menu and make sure it closes in such a
way to
! # trigger the closeTrap method
! #
! def _menuExitEvent(self, event):
! self.mainWindow.close()
!
def _createWidget(self, event, spacer):
object = event.object
--- 49,55 ----
self._uiPageList=[]
UIHelper.__init__(self, event)
!
def _createWidget(self, event, spacer):
object = event.object
***************
*** 78,89 ****
#
self.menu_sb_space = 0
- ## TODO: This really isn't right...
- ## if not self._form._features['GUI:MENUBAR:SUPPRESS']:
- ## self.menu_sb_space += 2
- ## if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
- ## self.menu_sb_space += 2
-
formWidth = int(self._form._layout.Char__width)
formHeight = int(self._form._layout.Char__height)
self._visibleSize = (formWidth*self._uiDriver.widgetWidth,
--- 58,63 ----
***************
*** 95,106 ****
# The main frame of this form
self.mainWindow = QMainWindow()
- ###self.mainWindow.SetSize(formSize)
self.mainWindow.setCaption(str(self._form.title))
- ## EVT_CLOSE(self.mainWindow,self.closeTrap)
- ## initFont(self.mainWindow,1)
-
# The status bar
self.statusBar = self.mainWindow.statusBar()
self.statusFields = []
--- 69,76 ----
***************
*** 111,120 ****
## self.statusBar.SetStatusWidths([-1,50,50,75,75])
- # A window that provides the scrollbars
- ## self._scrollWindow = self.mainWindow.panel =
wxScrolledWindow(self.mainWindow,-1, wxDefaultPosition)
- ## self._scrollWindow.Show()
-
# The window in which pages will be rendered
if object._layout.tabbed:
self._wrapper = wrappers.TabbedWrapper(self)
--- 81,86 ----
***************
*** 125,246 ****
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']:
! menuBar = self.mainWindow.menuBar()
! # This will be a dict of the form { 'requestROLLBACK': 1001 }
! # where 1001 is the wxId associated with requestROLLBACK.
! self.__eventMenuMapping = {}
!
! fileMenu = QPopupMenu(menuBar)
! 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)
! fileMenu.insertSeparator()
!
! self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for
this form.'),'requestPRINTOUT', form=self._form)
! fileMenu.insertSeparator()
!
! id = self.__addMenuItem(fileMenu, _("E&xit"),_('Leave the
application.'), form=self._form)
! ## EVT_MENU(self._uiDriver._wxapp, id, self._menuExitEvent)
! self.__eventMenuMapping['_exit_'] = id
!
! editMenu = QPopupMenu(menuBar)
! 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 = QPopupMenu(menuBar)
! 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)
! 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)
!
! dataMenu.insertSeparator()
! 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)
!
! dataMenu.insertSeparator()
! 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 = QPopupMenu(menuBar)
! self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe
Forms.'),'requestABOUT', form=self._form)
!
! menuBar.insertItem( _("&File"), fileMenu)
! menuBar.insertItem( _("&Edit"), editMenu)
! menuBar.insertItem( _("&Data"), dataMenu )
! menuBar.insertItem( _("&Help"), helpMenu )
!
! self._menuBar = menuBar
!
- #
- # Build Toolbar
- #
- if 0: ## TODO ## not self._form._features['GUI:TOOLBAR:SUPPRESS']:
- #
- # There has got to be better way to call events to ride off the
EVT_MENU
- # Ok if i give buttons same id as menu's they share events
- # I dont know if this is horribly wrong or design
- #
- if sys.platform == 'win32':
- mainToolBar = wxToolBar(self.mainWindow, -1)
- else:
- mainToolBar = wxToolBar(self.mainWindow,-1,
style=wxTB_HORIZONTAL|wxTB_DOCKABLE)
-
- mainToolBar.SetToolBitmapSize(wxSize(24,24))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestCOMMIT'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_commit'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Save Changes"), _('Save all
changes to database.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEWRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_insert'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Insert Record"), _('Create a
new record for data input.'))
-
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestMARKFORDELETE'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_delete'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Delete Record"), _('Mark
record for removal at next commit.'))
- mainToolBar.AddSeparator()
-
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestFIRSTRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_first'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("First Record"),_('Navigate to
first record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestPREVRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_previous'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate
to previous record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEXTRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_next'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to
next record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_last'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to
last record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['_promptForRecord_'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_jump'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Jump to Record"),_('Navigate
to user specified record in memory.'))
- mainToolBar.AddSeparator()
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestENTERQUERY'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query_prep'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to
input query mask mode.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestEXECQUERY'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Execute Query"), _('Execute
query using current mask.'))
- mainToolBar.AddSeparator()
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestROLLBACK'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_rollback'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['_exit_'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_exit'),
-
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Exit Form"), _('Exit Form'))
-
- self._mainToolBar = mainToolBar
- self.mainWindow.SetToolBar( mainToolBar );
- self._mainToolBar.Realize()
-
self._eventHandler = event.eventHandler
-
self._wrapper.finalize()
- print "*************\n" * 4 + "I AM HERE\n" + "*************\n" * 4
-
return newWidget
--- 91,108 ----
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)
!
self._eventHandler = event.eventHandler
self._wrapper.finalize()
return newWidget
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src/uidrivers/qt widgets/button.py w...,
Jason Cater <=