[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8523 - in trunk/gnue-forms/src: . input/displayHandlers uidriver
|
From: |
reinhard |
|
Subject: |
[gnue] r8523 - in trunk/gnue-forms/src: . input/displayHandlers uidrivers/_base uidrivers/_commonGuiToolkit uidrivers/curses uidrivers/curses/widgets uidrivers/gtk2 uidrivers/gtk2/widgets/form uidrivers/html uidrivers/qt uidrivers/qt/widgets/form uidrivers/win32 uidrivers/win32/widgets/form uidrivers/wx uidrivers/wx/widgets/form uidrivers/wx26 uidrivers/wx26/widgets |
|
Date: |
Thu, 29 Jun 2006 16:16:39 -0500 (CDT) |
Author: reinhard
Date: 2006-06-29 16:16:34 -0500 (Thu, 29 Jun 2006)
New Revision: 8523
Modified:
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/input/displayHandlers/Cursor.py
trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/html/UIdriver.py
trunk/gnue-forms/src/uidrivers/qt/UIdriver.py
trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Cleanup for user feedback functions.
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2006-06-29 20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/GFForm.py 2006-06-29 21:16:34 UTC (rev 8523)
@@ -547,6 +547,28 @@
# -------------------------------------------------------------------------
+ # Show a message with a beep
+ # -------------------------------------------------------------------------
+
+ def alert_message(self, message):
+
+ self.status_message(message)
+ self.beep()
+
+
+ # -------------------------------------------------------------------------
+ # Beep
+ # -------------------------------------------------------------------------
+
+ def beep(self):
+ """
+ Makes a noise.
+ """
+ if self.uiWidget:
+ self.uiWidget._ui_beep_()
+
+
+ # -------------------------------------------------------------------------
# Write a message to the status bar
# -------------------------------------------------------------------------
@@ -644,18 +666,6 @@
record_number, record_count, page_number, page_count)
- # -------------------------------------------------------------------------
- # Beep
- # -------------------------------------------------------------------------
-
- def beep(self):
- """
- Makes a noise.
- """
-
- self.dispatchEvent('formBEEP', _form=self)
-
-
# =========================================================================
# Focus functions
# =========================================================================
@@ -883,7 +893,8 @@
if hasattr(self._currentEntry, '_displayHandler'):
# FIXME: what if this fails?
self._currentEntry._displayHandler.updateFieldValue()
- self.dispatchEvent('beginWAIT', _form=self);
+ if self.uiWidget:
+ self.uiWidget._ui_begin_wait_()
# -------------------------------------------------------------------------
@@ -906,7 +917,8 @@
"""
if not self._exiting:
- self.dispatchEvent('endWAIT', _form=self);
+ if self.uiWidget:
+ self.uiWidget._ui_end_wait_()
self.refreshDisplay(self)
@@ -1551,8 +1563,7 @@
self._currentEntry.endEdit()
return True
except errors.UserError, e:
- self.status_message(e.getMessage())
- self.beep()
+ self.alert_message(e.getMessage())
return False
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2006-06-29 20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/GFInstance.py 2006-06-29 21:16:34 UTC (rev 8523)
@@ -849,14 +849,12 @@
"""
if event._form.readonly:
- self.dispatchEvent ('formALERT', _('Form is readonly'),
- _form = event._form)
+ event._form.alert_message(u_("Form is readonly"))
elif not event._form._currentBlock.deletable:
- self.dispatchEvent ('formALERT', _('Block does not allow delete'),
- _form = event._form)
+ event._form.alert_message(u_("Block does not allow delete"))
else:
- event._form.deleteRecord ()
- event._form.update_record_status()
+ event._form.deleteRecord()
+ event._form.update_record_status()
# ---------------------------------------------------------------------------
@@ -885,14 +883,12 @@
return
if event._form.readonly:
- self.dispatchEvent ('formALERT', _('Form is readonly'),
- _form = event._form)
+ event._form.alert_message(u_("Form is readonly"))
elif event._form._currentBlock.editable not in ('Y', 'new'):
- self.dispatchEvent ('formALERT', _('Block does not allow insert'),
- _form = event._form)
+ event._form.alert_message(u_('Block does not allow insert'))
else:
- event._form.newRecord ()
- self._entryUpdated (event._form)
+ event._form.newRecord()
+ self._entryUpdated(event._form)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -182,8 +182,7 @@
"""
Generates an event requesting that the UI beep.
"""
- #TODO: Beep not working atm.
- self.dispatchEvent(events.Event('formBEEP'))
+ self.entry._form.beep()
def isPending(self):
"""
Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -193,12 +193,6 @@
'exitApplication' : self.exitApplication,
'setTitle' : self.setTitle,
- # User feedback events from the virtual form to the UI
- 'beginWAIT' : self.beginWait,
- 'endWAIT' : self.endWait,
- 'formALERT' : self.formAlert,
- 'formBEEP' : self.formBeep,
-
# Clipboard contents
'setCLIPBOARD' : self.setClipboardContents,
'getCLIPBOARD' : self.getClipboardContents,
@@ -459,29 +453,6 @@
# ---------------------------------------------------------------------------
- # Enter wait state
- # ---------------------------------------------------------------------------
-
- def beginWait (self, event):
- """
- Called whenever forms goes into a "wait" state in which user cannot
- interact with interface (e.g., while waiting for a query or a commit)
- """
- pass
-
-
- # ---------------------------------------------------------------------------
- # Leave wait state
- # ---------------------------------------------------------------------------
-
- def endWait (self, event):
- """
- Called whenever forms leaves a wait state
- """
- pass
-
-
- # ---------------------------------------------------------------------------
# Form has told the application to close so call the UIs private exit routine
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
2006-06-29 20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
2006-06-29 21:16:34 UTC (rev 8523)
@@ -80,26 +80,3 @@
event.eventHandler = self.dispatchEvent
event.ui = self
return event
-
-
- #############################################################################
- #
- # Incoming Event Processors
- #
- # Processes the incoming events from other objects
- # From here down should be nothing but eventListeners listed
-
- def formAlert(self, event):
- """
- Rings a bell and alters the statusbar to display
- a line of text
- """
- self._beep()
- self.statusBar.SetStatusText(event.data,0)
-
- def formBeep(self, event):
- """
- Rings the system bell
- """
- self._beep()
-
Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -218,42 +218,6 @@
uiForm.setTitle (event.title)
# ---------------------------------------------------------------------------
- # Display warning message
- # ---------------------------------------------------------------------------
-
- def formAlert (self, event):
-
- # Exactly this should actually be done by the base ui driver
- uiForm = self._gfObjToUIWidget [event._form]
- uiForm.statusMessage (event.data)
-
- # Curses specific
- curses.beep ()
-
- # ---------------------------------------------------------------------------
- # Cause console to beep
- # ---------------------------------------------------------------------------
-
- def formBeep (self, event):
- curses.beep ()
-
- # ---------------------------------------------------------------------------
- # Indicate start of nonresponsive phase
- # ---------------------------------------------------------------------------
-
- def beginWait (self, event):
-
- self.__currentForm.statusMessage (u_("processing..."))
-
- # ---------------------------------------------------------------------------
- # Indicate end of nonresponsive phase
- # ---------------------------------------------------------------------------
-
- def endWait (self, event):
-
- self.__currentForm.statusMessage (None)
-
- # ---------------------------------------------------------------------------
# Show a message
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -83,9 +83,24 @@
self.__window.refresh (0, 0, 0, 0, 0, x)
# ---------------------------------------------------------------------------
- # Set status bar
+ # User feedback functions
# ---------------------------------------------------------------------------
+ def _ui_begin_wait_(self):
+ self.statusMessage(u_("processing..."))
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ self.statusMessage(None)
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_beep_(self):
+ curses.beep()
+
+ # ---------------------------------------------------------------------------
+
def _ui_update_status_(self, tip, status, insert, curRec, maxRec, curPage,
maxPage):
Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -171,9 +171,6 @@
self.app.quit ()
- def _beep (self):
- pass
-
#############################################################################
#
# Incoming Event Processors
@@ -191,45 +188,7 @@
self.app.mainLoop()
- #
- # formAlert
- #
- # Rings a bell and alters the statusbar to display
- # a line of text
- #
- def formAlert(self, event):
- ui = self._gfObjToUIWidget[event._form]
- if ui.statusBar is not None:
- ui.statusBar1.push (ui.statusBar1.get_context_id ("tip"), \
- unicode (event.data))
-
-
# ---------------------------------------------------------------------------
- # Change the cursor into the watch
- # ---------------------------------------------------------------------------
-
- def beginWait (self, event):
- ui = self._gfObjToUIWidget [event._form]
- if ui.mainWindow.window is not None:
- ui.mainWindow.window.set_cursor (gtk.gdk.Cursor (gtk.gdk.WATCH))
-
- self.processMessages ()
-
-
-
- # ---------------------------------------------------------------------------
- # Called whenever forms leaves a "wait" state
- # ---------------------------------------------------------------------------
-
- def endWait (self, event):
- ui = self._gfObjToUIWidget [event._form]
- if ui.mainWindow.window is not None:
- ui.mainWindow.window.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
-
- self.processMessages ()
-
-
- # ---------------------------------------------------------------------------
# Get some text from the clipboard
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -177,64 +177,6 @@
0, 0)
# ---------------------------------------------------------------------------
- # Makes the requested page visible while hiding the others
- # ---------------------------------------------------------------------------
-
- def gotoPage (self, page):
- self._wrapper.setPage (page.widgets [0])
-
-
- # ---------------------------------------------------------------------------
- # Show a tip in the status bar. Used by the menu.
- # ---------------------------------------------------------------------------
-
- def _show_tip (self, tip):
-
- if not hasattr (self, 'statusBar1'):
- return
-
- text = self._makeSafe ("%s" % tip)
- context = self.statusBar1.get_context_id ('tip')
- self.statusBar1.push (context, text)
-
-
- # ---------------------------------------------------------------------------
- # set values in the corresponding status bars
- # ---------------------------------------------------------------------------
-
- def _ui_update_status_ (self, tip, record_status, insert_status,
- record_number, record_count, page_number, page_count):
-
- if not hasattr (self, 'statusBar1'):
- return
-
- if tip is not None:
- text = self._makeSafe ("%s" % tip)
- context = self.statusBar1.get_context_id ('tip')
- self.statusBar1.push (context, text)
-
- if record_status:
- context = self.statusBar2.get_context_id ('statusValue')
- self.statusBar2.push (context, self._makeSafe (record_status))
-
- if insert_status:
- context = self.statusBar3.get_context_id ('insertValue')
- self.statusBar3.push (context, self._makeSafe (insert_status))
-
- if record_number and record_count:
- context = self.statusBar4.get_context_id ('currentRecord_and_maxRecord')
- text = string.strip ("%s/%s" % (record_number, record_count))
- self.statusBar4.push (context, self._makeSafe (text))
-
- if page_number and page_count:
- context = self.statusBar5.get_context_id ('currentPage_and_maxPage')
- text = string.strip ("%s/%s" % (page_number, page_count))
- self.statusBar5.push (context, self._makeSafe (text))
-
- self._uiDriver.processMessages ()
-
-
- # ---------------------------------------------------------------------------
# show the current form non-modal
# ---------------------------------------------------------------------------
@@ -295,3 +237,80 @@
self._uiDriver.dispatchEvent ('requestEXIT', _form = self._form)
return True
+
+
+ # ---------------------------------------------------------------------------
+ # Makes the requested page visible while hiding the others
+ # ---------------------------------------------------------------------------
+
+ def gotoPage (self, page):
+ self._wrapper.setPage (page.widgets [0])
+
+
+ # ---------------------------------------------------------------------------
+ # Show a tip in the status bar. Used by the menu.
+ # ---------------------------------------------------------------------------
+
+ def _show_tip (self, tip):
+
+ if not hasattr (self, 'statusBar1'):
+ return
+
+ text = self._makeSafe ("%s" % tip)
+ context = self.statusBar1.get_context_id ('tip')
+ self.statusBar1.push (context, text)
+
+
+ # ---------------------------------------------------------------------------
+ # User feedback functions
+ # ---------------------------------------------------------------------------
+
+ def _ui_begin_wait_(self):
+ if self.mainWindow.window is not None:
+ self.mainWindow.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
+ self._uiDriver.processMessages()
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ if self.mainWindow.window is not None:
+ self.mainWindow.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
+ self._uiDriver.processMessages ()
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_beep_(self):
+ pass
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_update_status_ (self, tip, record_status, insert_status,
+ record_number, record_count, page_number, page_count):
+
+ if not hasattr (self, 'statusBar1'):
+ return
+
+ if tip is not None:
+ text = self._makeSafe ("%s" % tip)
+ context = self.statusBar1.get_context_id ('tip')
+ self.statusBar1.push (context, text)
+
+ if record_status:
+ context = self.statusBar2.get_context_id ('statusValue')
+ self.statusBar2.push (context, self._makeSafe (record_status))
+
+ if insert_status:
+ context = self.statusBar3.get_context_id ('insertValue')
+ self.statusBar3.push (context, self._makeSafe (insert_status))
+
+ if record_number and record_count:
+ context = self.statusBar4.get_context_id ('currentRecord_and_maxRecord')
+ text = string.strip ("%s/%s" % (record_number, record_count))
+ self.statusBar4.push (context, self._makeSafe (text))
+
+ if page_number and page_count:
+ context = self.statusBar5.get_context_id ('currentPage_and_maxPage')
+ text = string.strip ("%s/%s" % (page_number, page_count))
+ self.statusBar5.push (context, self._makeSafe (text))
+
+ self._uiDriver.processMessages ()
Modified: trunk/gnue-forms/src/uidrivers/html/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/html/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -57,12 +57,3 @@
def mainLoop(self):
self._htmlapp.MainLoop() # simply call the wxApp's MainLoop method
-
- def formAlert(self, event):
- pass
-
- def beginWait (self, event):
- pass
-
- def endWait (self, event):
- pass
Modified: trunk/gnue-forms/src/uidrivers/qt/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/qt/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -177,24 +177,7 @@
def mainLoop(self):
self._qtapp.exec_loop()
-
- def _beep(self, event):
- self._qtapp.bell()
-
#
- # Called whenever forms goes into a "wait" state in which user cannot
- # interact with interface (e.g., while waiting for a query or a commit)
- #
- def beginWait (self, event):
- self._qtapp.setOverrideCursor(QCursor(self._qtapp.WaitCursor))
-
- #
- # Called whenever forms leaves a "wait" state
- #
- def endWait (self, event):
- self._qtapp.restoreOverrideCursor()
-
- #
# Clipboard routines
#
# If a particular UI has a system-wide clipboard,
Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -111,6 +111,16 @@
return newWidget
+ def show(self):
+ #self.containerFrame.Show()
+ self.mainWindow.show()
+
+ def showModal(self):
+ #self.containerFrame.Show()
+ self.mainWindow.exec_loop()
+
+
+
#
# closeTrap
#
@@ -152,12 +162,29 @@
## if pageId == self._notebook.GetPage(count).GetId():
## self._notebook.SetSelection(count)
+ # ---------------------------------------------------------------------------
+ # User feedback functions
+ # ---------------------------------------------------------------------------
- #
- # _ui_update_status_
- #
- def _ui_update_status_(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
+ def _ui_begin_wait_(self):
+ self._uiDriver._qtapp.setOverrideCursor(
+ QCursor(self._uiDriver._qtapp.WaitCursor))
+ # ---------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ self._uiDriver._qtapp.restoreOverrideCursor()
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_beep_(self):
+ self._uiDriver._qtapp.bell()
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_update_status_(self,tip, statusValue, insertValue, currentRecord,
+ maxRecord, currentPage, maxPage):
+
# Popup forms don't seem to have a statusbar
try:
self.statusFields
@@ -201,14 +228,3 @@
pageWidth = pageWidth and (pageWidth * 2) or 5
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
-
-
- def show(self):
- #self.containerFrame.Show()
- self.mainWindow.show()
-
- def showModal(self):
- #self.containerFrame.Show()
- self.mainWindow.exec_loop()
-
-
Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -234,9 +234,6 @@
window.Enable(1)
win32gui.SetActiveWindow(window.GetHwnd())
- def _beep(self):
- win32gui.MessageBeep(0)
-
#############################################################################
#
# Incoming Event Processors
@@ -254,32 +251,6 @@
self._win32app.MainLoop() # simply call the wxApp's MainLoop method
#
- # formAlert
- #
- # Rings a bell and alters the statusbar to display
- # a line of text
- #
- def formAlert(self, event):
- self._beep()
- ui = self._gfObjToUIWidget[event._form]
- if hasattr (ui, 'statusBar'):
- win32gui.SendMessage(ui.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
textEncode(event.data))
-
- #
- # Called whenever forms goes into a "wait" state in which user cannot
- # interact with interface (e.g., while waiting for a query or a commit)
- #
- def beginWait (self, event):
- win32ui.DoWaitCursor(1)
-
- #
- # Called whenever forms leaves a "wait" state
- #
- def endWait (self, event):
- win32ui.DoWaitCursor(0)
-
-
- #
# Clipboard routines
#
# If a particular UI has a system-wide clipboard,
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -142,17 +142,50 @@
#
def gotoPage(self,page):
self._wrapper.setPage(page.widgets[0])
-
-
- #
- # Update status bar
- #
+
+ def show(self):
+ self.mainWindow.Show()
+ if self._form.style == 'dialog':
+ win32gui.PumpMessages()
+
+
+ def showModal(self):
+ self.mainWindow.Show()
+
+ for key in self._uiDriver._formNameToUIForm.keys():
+ if self._form.name == key:
+ self._uiDriver._formNameToUIForm[key].mainWindow.Enable(1)
+ else:
+ self._uiDriver._formNameToUIForm[key].mainWindow.Enable(0)
+ if self._form.style == 'dialog':
+ win32gui.PumpMessages()
+
+
+ # ---------------------------------------------------------------------------
+ # User feedback functions
+ # ---------------------------------------------------------------------------
+
+ def _ui_begin_wait_(self):
+ win32ui.DoWaitCursor(1)
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ win32ui.DoWaitCursor(0)
+
+ # ---------------------------------------------------------------------------
+
+ def _ui_beep_(self):
+ win32gui.MessageBeep(0)
+
+ # ---------------------------------------------------------------------------
+
def _ui_update_status_(self, tip, record_status, insert_status,
record_number, record_count, page_number, page_count):
if not hasattr (self, 'statusBar'):
return
-
+
if tip is not None:
win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
textEncode(tip))
@@ -174,22 +207,3 @@
("%s/%s" % (page_number, page_count)).strip())
return
-
-
- def show(self):
- self.mainWindow.Show()
- if self._form.style == 'dialog':
- win32gui.PumpMessages()
-
-
- def showModal(self):
- self.mainWindow.Show()
-
- for key in self._uiDriver._formNameToUIForm.keys():
- if self._form.name == key:
- self._uiDriver._formNameToUIForm[key].mainWindow.Enable(1)
- else:
- self._uiDriver._formNameToUIForm[key].mainWindow.Enable(0)
- if self._form.style == 'dialog':
- win32gui.PumpMessages()
-
Modified: trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/wx/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -154,10 +154,6 @@
for child in self._children:
child.mainWindow.Close(true)
- def _beep(self):
- wxBell()
- wxYield()
-
#############################################################################
#
# Incoming Event Processors
@@ -174,33 +170,8 @@
def mainLoop(self):
self._wxapp.MainLoop() # simply call the wxApp's MainLoop method
- #
- # formAlert
- #
- # Rings a bell and alters the statusbar to display
- # a line of text
- #
- def formAlert(self, event):
- wxBell()
- ui = self._gfObjToUIWidget[event._form]
- if ui.statusBar is not None:
- ui.statusBar.SetStatusText (wxEncode (event.data), 0)
#
- # Called whenever forms goes into a "wait" state in which user cannot
- # interact with interface (e.g., while waiting for a query or a commit)
- #
- def beginWait (self, event):
- wxBeginBusyCursor()
-
- #
- # Called whenever forms leaves a "wait" state
- #
- def endWait (self, event):
- wxEndBusyCursor()
-
-
- #
# Clipboard routines
#
# If a particular UI has a system-wide clipboard,
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2006-06-29
20:16:33 UTC (rev 8522)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2006-06-29
21:16:34 UTC (rev 8523)
@@ -122,6 +122,28 @@
return newWidget
+ # ---------------------------------------------------------------------------
+ # Show the form
+ # ---------------------------------------------------------------------------
+ def show(self):
+ """
+ Display the form.
+ """
+ self.containerFrame.Show(1)
+# self.mainWindow.Show(1)
+
+
+ # ---------------------------------------------------------------------------
+ # Show the form modal mode
+ # ---------------------------------------------------------------------------
+ def showModal(self):
+ """
+ Display the form in modal windowing mode.
+ """
+ self.containerFrame.ShowModal()
+# self.mainWindow.ShowModal()
+
+
# --------------------------------------------------------------------------
# Intercepts the application's closure and generates an event to the form
# requesting closure.
@@ -154,14 +176,23 @@
# --------------------------------------------------------------------------
- # Set statusbar values
+ # User feedback functions
# --------------------------------------------------------------------------
- def _ui_update_status_(self, tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
- """
- Sets statusbar values.
-
-
- """
+
+ def _ui_begin_wait_(self):
+ wxBeginBusyCursor()
+
+ # --------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ wxEndBusyCursor()
+
+ def _ui_beep_(self):
+ wxBell()
+ wxYield()
+
+ def _ui_update_status_(self, tip, statusValue, insertValue, currentRecord,
+ maxRecord, currentPage, maxPage):
if not self.statusBar:
return
@@ -198,26 +229,3 @@
pageWidth = pageWidth and (pageWidth * 2) or 5
self.statusBar.SetStatusWidths([tipWidth, statusWidth, insertWidth,
recordWidth, pageWidth])
-
-
- # ---------------------------------------------------------------------------
- # Show the form
- # ---------------------------------------------------------------------------
- def show(self):
- """
- Display the form.
- """
- self.containerFrame.Show(1)
-# self.mainWindow.Show(1)
-
-
- # ---------------------------------------------------------------------------
- # Show the form modal mode
- # ---------------------------------------------------------------------------
- def showModal(self):
- """
- Display the form in modal windowing mode.
- """
- self.containerFrame.ShowModal()
-# self.mainWindow.ShowModal()
-
Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -265,38 +265,6 @@
# ---------------------------------------------------------------------------
- # Begin/end wait cursor
- # ---------------------------------------------------------------------------
-
- def beginWait (self, event):
- wx.BeginBusyCursor()
-
- def endWait (self, event):
- wx.EndBusyCursor()
-
-
- # ---------------------------------------------------------------------------
- # Form alert
- # ---------------------------------------------------------------------------
-
- def formAlert (self, event):
-
- self._beep ()
- ui = self._gfObjToUIWidget [event._form]
- if ui.statusBar is not None:
- ui.statusBar.SetStatusText (event.data, 0)
-
-
- # ---------------------------------------------------------------------------
- # Ring the bell
- # ---------------------------------------------------------------------------
-
- def _beep (self):
-
- wx.Bell ()
-
-
- # ---------------------------------------------------------------------------
# Create and run an input dialog
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-06-29 20:16:33 UTC
(rev 8522)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-06-29 21:16:34 UTC
(rev 8523)
@@ -186,7 +186,47 @@
# -------------------------------------------------------------------------
+ # Close the form
+ # -------------------------------------------------------------------------
+ def __closeTrap (self, event):
+
+ if event.CanVeto ():
+ self._request ('EXIT')
+ event.Veto ()
+
+ else:
+ event.GetEventObject ().Destroy ()
+
+
+ # -------------------------------------------------------------------------
+ # Change to the requested page
+ # -------------------------------------------------------------------------
+
+ def gotoPage (self, page):
+
+ self._containerToolkitWidget.showPage (page._pageIndex)
+
+
+ # -------------------------------------------------------------------------
+ # User feedback functions
+ # -------------------------------------------------------------------------
+
+ def _ui_begin_wait_(self):
+ wx.BeginBusyCursor()
+
+ # -------------------------------------------------------------------------
+
+ def _ui_end_wait_(self):
+ wx.EndBusyCursor()
+
+ # -------------------------------------------------------------------------
+
+ def _ui_beep_(self):
+ wx.Bell()
+
+ # -------------------------------------------------------------------------
+
def _ui_update_status_(self, tip, record_status, insert_status,
record_number, record_count, page_number, page_count):
@@ -211,30 +251,6 @@
"%s/%s" % (page_number, page_count), 4)
- # -------------------------------------------------------------------------
- # Close the form
- # -------------------------------------------------------------------------
-
- def __closeTrap (self, event):
-
- if event.CanVeto ():
- self._request ('EXIT')
- event.Veto ()
-
- else:
- event.GetEventObject ().Destroy ()
-
-
- # -------------------------------------------------------------------------
- # Change to the requested page
- # -------------------------------------------------------------------------
-
- def gotoPage (self, page):
-
- self._containerToolkitWidget.showPage (page._pageIndex)
-
-
-
# =============================================================================
# Simple scrolled window containing multiple page panels
# =============================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r8523 - in trunk/gnue-forms/src: . input/displayHandlers uidrivers/_base uidrivers/_commonGuiToolkit uidrivers/curses uidrivers/curses/widgets uidrivers/gtk2 uidrivers/gtk2/widgets/form uidrivers/html uidrivers/qt uidrivers/qt/widgets/form uidrivers/win32 uidrivers/win32/widgets/form uidrivers/wx uidrivers/wx/widgets/form uidrivers/wx26 uidrivers/wx26/widgets,
reinhard <=