[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9510 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/_bas
|
From: |
reinhard |
|
Subject: |
[gnue] r9510 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/_base/widgets uidrivers/_commonGuiToolkit uidrivers/curses uidrivers/curses/widgets uidrivers/gtk2/widgets uidrivers/gtk2/widgets/form uidrivers/html/widgets uidrivers/qt3/widgets uidrivers/qt4/widgets uidrivers/win32/widgets uidrivers/win32/widgets/form uidrivers/wx/widgets uidrivers/wx/widgets/form uidrivers/wx26/widgets |
|
Date: |
Tue, 24 Apr 2007 13:45:26 -0500 (CDT) |
Author: reinhard
Date: 2007-04-24 13:45:24 -0500 (Tue, 24 Apr 2007)
New Revision: 9510
Modified:
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
trunk/gnue-forms/src/uidrivers/_base/widgets/_base.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/widgets/_base.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
trunk/gnue-forms/src/uidrivers/html/widgets/form.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py
trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
replaced UIdriver.activateForm by form._ui_show_ for consistency and simpler
and more straightforward calling path.
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2007-04-24 18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/GFForm.py 2007-04-24 18:45:24 UTC (rev 9510)
@@ -425,7 +425,7 @@
self.__visible = True
assert gDebug(4, "Activating form")
- self._instance._uiinstance.activateForm(self.name, modal)
+ self.uiWidget._ui_show_(modal)
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -235,17 +235,6 @@
self._formNameToUIForm [formName]._form = form
- # ---------------------------------------------------------------------------
- # Activate a form
- # ---------------------------------------------------------------------------
-
- def activateForm (self, formName, modal = 0):
-
- self._form = self._formNameToGFForm[formName]
- self._UIform = self._formNameToUIForm[formName]
- self._activateForm(self._UIform, modal)
-
-
#############################################################################
#
# Optional Functions
@@ -321,19 +310,3 @@
def _getInput (self, title, fields, cancel):
raise ImplementationError, (self.name, '_getInput')
-
-
- #############################################################################
- #
- # Required Functions
- #
- # UIDrivers must implement the following features
-
-
- # ---------------------------------------------------------------------------
- # Activate a form
- # ---------------------------------------------------------------------------
-
- def _activateForm (self, form, modal):
-
- raise ImplementationError, (self.name, '_activateForm')
Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -339,12 +339,3 @@
def _create_widget_(self, event, spacer):
assert gDebug(1, "UI does not support %s" % self.__class__)
-
- def lose_focus(self, index):
- pass
-
- def show_modal(self):
- pass
-
- def destroy(self):
- pass
Modified: trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
2007-04-24 18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
2007-04-24 18:45:24 UTC (rev 9510)
@@ -37,13 +37,6 @@
#
class GFUserInterface(GFUserInterfaceBase):
- def _activateForm (self, form, modal):
- if modal:
- form.show_modal()
- else:
- form.show()
-
-
#############################################################################
#
# Private UIBase support functions
Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -127,10 +127,8 @@
# Activate the given form
# -------------------------------------------------------------------------
- def _activateForm(self, form, modal):
+ def show_form(self, form, modal):
- assert gDebug(2, "ACTIVATING FORM")
- form.set_size_and_fit()
self.__current_form = form
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -105,6 +105,16 @@
# -------------------------------------------------------------------------
+ # Show the form
+ # -------------------------------------------------------------------------
+
+ def _ui_show_(self, modal):
+
+ self.set_size_and_fit()
+ self._uiDriver.show_form(self, modal)
+
+
+ # -------------------------------------------------------------------------
# Set form title
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -157,9 +157,6 @@
widget.hide ()
- def show_modal (self):
- assert gDebug (1, "show_modal not implemented for gtk2 driver")
-
def destroy (self):
assert gDebug (1, "destroy not implemented for gtk2 driver")
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -189,7 +189,7 @@
# show the current form non-modal
# ---------------------------------------------------------------------------
- def show (self):
+ def _ui_show_ (self, modal):
# show_all moves the focus, so we have to remember where it was before and
# restore it
@@ -197,27 +197,9 @@
self.mainWindow.show_all ()
- if widget != self.mainWindow.get_focus ():
- widget.grab_focus ()
+ if modal:
+ self.mainWindow.set_modal (True)
- self._visible = True
- if self._form.style == 'dialog':
- self.mainWindow.run ()
-
-
- # ---------------------------------------------------------------------------
- # Show the current form modal
- # ---------------------------------------------------------------------------
-
- def show_modal (self):
-
- # show_all moves the focus, so we have to remember where it was before and
- # restore it
- widget = self.mainWindow.get_focus ()
-
- self.mainWindow.show_all ()
- self.mainWindow.set_modal (True)
-
if widget != self.mainWindow.get_focus ():
widget.grab_focus ()
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/_base.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -117,29 +117,6 @@
#
---------------------------------------------------------------------------
- # Show all ui-widgets managed by this object
- #
---------------------------------------------------------------------------
-
- def show (self):
- pass
-
-
- #
---------------------------------------------------------------------------
- # Hide all ui-widgets managed by this object
- #
---------------------------------------------------------------------------
-
- def hide (self):
- pass
-
-
- def show_modal (self):
- assert gDebug (1, "show_modal not implemented for HTML driver")
-
- def destroy (self):
- assert gDebug (1, "destroy not implemented for HTML driver")
-
-
- #
---------------------------------------------------------------------------
# Set the focus to a given widget
#
---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -80,10 +80,8 @@
self._container = newWidget
return newWidget
- def show(self):
- pass
- def show_modal(self):
+ def _ui_show_(self, modal):
pass
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -121,28 +121,12 @@
# Show the form/dialog
# -------------------------------------------------------------------------
- def show(self):
- """
- Show the form or dialog modeless
- """
+ def _ui_show_(self, modal):
- self.sizing_enabled = True
- self.main_window.show()
self._uiDriver.hide_splash()
-
-
- # -------------------------------------------------------------------------
- # Show the form/dialog modal
- # -------------------------------------------------------------------------
-
- def show_modal(self):
- """
- Show the dialog modal. This seems only possible for QDialog instances.
- """
-
- self._uiDriver.hide_splash()
self.sizing_enabled = True
- if isinstance(self.main_window, qt.QDialog):
+
+ if modal and isinstance(self.main_window, qt.QDialog):
self.main_window.setModal(True)
self.main_window.exec_loop()
else:
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -135,28 +135,12 @@
# Show the form/dialog
# -------------------------------------------------------------------------
- def show(self):
- """
- Show the form or dialog modeless
- """
+ def _ui_show_(self, modal):
- self.sizing_enabled = True
- self.main_window.show()
self._uiDriver.hide_splash()
-
-
- # -------------------------------------------------------------------------
- # Show the form/dialog modal
- # -------------------------------------------------------------------------
-
- def show_modal(self):
- """
- Show the dialog modal. This seems only possible for QDialog instances.
- """
-
- self._uiDriver.hide_splash()
self.sizing_enabled = True
- if isinstance(self.main_window, qt.QDialog):
+
+ if modal and isinstance(self.main_window, qt.QDialog):
self.main_window.setModal(True)
self.main_window.exec_()
else:
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -720,27 +720,6 @@
except:
assert gDebug(6, "_deleteFromCrossRef failed")
- #
- # Override the base UIWidget functions
- #
- def show(self):
- for widget in self.widgets:
- widget.Show()
-
- def hide(self):
- for widget in self.widgets:
- widget.Hide()
-
-
- def show_modal(self):
- for widget in self.widgets:
- widget.Show()
-
- def destroy(self):
- for widget in self.widgets:
- self.Destroy()
-
-
def _ui_set_focus_(self, index):
self.widgets[index].SetFocus()
Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -162,24 +162,12 @@
def _ui_goto_page_(self,page):
self._wrapper.setPage(page.widgets[0])
- def show(self):
+ def _ui_show_(self):
self.mainWindow.Show()
- if self._form.style == 'dialog':
+ if self._form.style == 'dialog':
win32gui.PumpMessages()
-
- def show_modal(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()
-
def _ui_set_title_(self, title):
win32gui.SetWindowText(self.mainWindow.GetHwnd(), event.title)
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -82,38 +82,6 @@
pass
# --------------------------------------------------------------------------
- # Show all ui-widgets managed by this object
- # --------------------------------------------------------------------------
- def show(self):
- """
- Calls the show() on all wx-widgets managed by this instance.
- This is needed if a row-count greater than 0 is given.
- """
- for widget in self.widgets:
- widget.Show(1)
- widget.Raise()
-
- # --------------------------------------------------------------------------
- # Hide all ui-widgets managed by this object
- # --------------------------------------------------------------------------
- def hide(self):
- """
- Calls the hide() on all wx-widgets managed by this instance.
- This is needed if a row-count greater than 0 is given.
- """
- for widget in self.widgets:
- widget.Show(0)
-
- def show_modal(self):
- for widget in self.widgets:
- widget.ShowModal()
-
- def destroy(self):
- for widget in self.widgets:
- self.Destroy()
-
-
- # --------------------------------------------------------------------------
# Focus handling
# --------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2007-04-24
18:44:28 UTC (rev 9509)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2007-04-24
18:45:24 UTC (rev 9510)
@@ -132,23 +132,13 @@
# ---------------------------------------------------------------------------
# Show the form
# ---------------------------------------------------------------------------
- def show(self):
- """
- Display the form.
- """
- self.containerFrame.Show(1)
-# self.mainWindow.Show(1)
+ def _ui_show_(self, modal):
- # ---------------------------------------------------------------------------
- # Show the form modal mode
- # ---------------------------------------------------------------------------
- def show_modal(self):
- """
- Display the form in modal windowing mode.
- """
- self.containerFrame.ShowModal()
-# self.mainWindow.ShowModal()
+ if modal:
+ self.containerFrame.ShowModal()
+ else:
+ self.containerFrame.Show(1)
# --------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-04-24 18:44:28 UTC
(rev 9509)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-04-24 18:45:24 UTC
(rev 9510)
@@ -234,36 +234,13 @@
# Show the form/dialog
# -------------------------------------------------------------------------
- def show(self):
- """
- Show the form or dialog non-modal. This function raises the Frame or
- Dialog into the front, enables processing of wx.EVT_SIZE events and
- shows the window.
- """
+ def _ui_show_(self):
- self.main_window.Raise()
-
- self.sizing_enabled = True
- self.main_window.Show()
-
self._uiDriver.hide_splash()
-
-
- # -------------------------------------------------------------------------
- # Show the form/dialog modal
- # -------------------------------------------------------------------------
-
- def show_modal(self):
- """
- Show the form or dialog modal. This function raises the Frame or
- Dialog into the front, enables processing of wx.EVT_SIZE events and
- shows the window.
- """
-
- self._uiDriver.hide_splash()
self.main_window.Raise()
self.sizing_enabled = True
- if isinstance(self.main_window, wx.Dialog):
+
+ if modal and isinstance(self.main_window, wx.Dialog):
self.main_window.ShowModal()
else:
self.main_window.Show()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9510 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/_base/widgets uidrivers/_commonGuiToolkit uidrivers/curses uidrivers/curses/widgets uidrivers/gtk2/widgets uidrivers/gtk2/widgets/form uidrivers/html/widgets uidrivers/qt3/widgets uidrivers/qt4/widgets uidrivers/win32/widgets uidrivers/win32/widgets/form uidrivers/wx/widgets uidrivers/wx/widgets/form uidrivers/wx26/widgets,
reinhard <=