commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r8665 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/gtk2


From: reinhard
Subject: [gnue] r8665 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/gtk2 uidrivers/gtk2/widgets/form uidrivers/win32 uidrivers/win32/widgets/form uidrivers/wx uidrivers/wx/widgets/form uidrivers/wx26 uidrivers/wx26/widgets
Date: Mon, 11 Sep 2006 14:05:13 -0500 (CDT)

Author: reinhard
Date: 2006-09-11 14:05:12 -0500 (Mon, 11 Sep 2006)
New Revision: 8665

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/dialogs.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/dialogs.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/dialogs.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Cleanup of about box methods.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-09-11 14:55:54 UTC (rev 8664)
+++ trunk/gnue-forms/src/GFForm.py      2006-09-11 19:05:12 UTC (rev 8665)
@@ -175,6 +175,7 @@
 
             # Other stuff
             'toggle_insert_mode': {'function': self.toggle_insert_mode},
+            'show_about': {'function': self.show_about},
 
             'printout': {
                 'function': self.__trigger_printout},
@@ -487,12 +488,7 @@
         @param modal: whether the dialog should be modal or not
         @return: None
         """
-        # Keep this to allow calling of about-box from trigger namespace
-        if dialogName == '_about':
-          # FIXME: This should be deprecated
-          self._instance._uiinstance.showAbout (**parameters)
-        else:
-          self._instance.activateForm (dialogName, parameters, modal)
+        self._instance.activateForm (dialogName, parameters, modal)
 
     # -------------------------------------------------------------------------
 
@@ -613,7 +609,7 @@
         """
         Makes a noise.
         """
-        if self.uiWidget:
+        if self.uiWidget is not None:
             self.uiWidget._ui_beep_()
 
 
@@ -713,7 +709,7 @@
         """
 
         # This can be called before the UI is built.
-        if self.uiWidget:
+        if self.uiWidget is not None:
             self.uiWidget._ui_update_status_(tip, record_status, insert_status,
                     record_number, record_count, page_number, page_count)
 
@@ -955,7 +951,7 @@
         if hasattr(self._currentEntry, '_displayHandler'):
             # FIXME: what if this fails?
             self._currentEntry._displayHandler.updateFieldValue()
-        if self.uiWidget:
+        if self.uiWidget is not None:
             self.uiWidget._ui_begin_wait_()
 
 
@@ -978,7 +974,7 @@
         handled, just like L{event_begin} is called at the beginning.
         """
 
-        if self.uiWidget:
+        if self.uiWidget is not None:
             self.uiWidget._ui_end_wait_()
         if self.__visible:
             self.refreshDisplay(self)
@@ -1373,6 +1369,10 @@
         return True
 
 
+    # =========================================================================
+    # Misc stuff
+    # =========================================================================
+
     # -------------------------------------------------------------------------
     # Toggles insert mode
     # -------------------------------------------------------------------------
@@ -1387,6 +1387,20 @@
 
 
     # -------------------------------------------------------------------------
+    # Show about box
+    # -------------------------------------------------------------------------
+
+    def show_about(self):
+
+        if self.uiWidget is not None:
+            self.uiWidget._ui_show_about_(
+                    self.title or "Unknown",
+                    self.get_option('version') or "Unknown",
+                    self.get_option('author') or "Unknown",
+                    self.get_option('description') or "Unknown")
+
+
+    # -------------------------------------------------------------------------
     # Print form
     # -------------------------------------------------------------------------
 
@@ -1401,7 +1415,7 @@
         if self._triggerDictionary.has_key('process-printout'):
             self.fireTrigger('process-printout')
         else:
-            if self.uiWidget:
+            if self.uiWidget is not None:
                 self.uiWidget._ui_printout_(self.title,
                         self._currentPage.caption,
                         self._instance.connections.getAuthenticatedUser(None) \
@@ -1767,7 +1781,7 @@
 
         self.processTrigger('On-Exit')
 
-        if self.uiWidget:
+        if self.uiWidget is not None:
             self.uiWidget._ui_close_()
 
         self.__visible = False

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-11 14:55:54 UTC (rev 8664)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-11 19:05:12 UTC (rev 8665)
@@ -124,7 +124,7 @@
 
                 # Miscellaneous stuff
                 'requestMODETOGGLE'   : self.__execute_modeToggle,
-                'requestABOUT'        : self.executeAbout,
+                'requestABOUT'        : self.__execute_about,
                 'requestPRINTOUT'     : self.__execute_printout,
                 'requestUSERCOMMAND'  : self.__execute_user_command,
                 'requestEXIT'         : self.__execute_exit})
@@ -751,15 +751,9 @@
   # Display the about dialog
   # ---------------------------------------------------------------------------
 
-  def executeAbout (self, event):
-    parameters = {
-      'name'        : event._form.title or "Unknown",
-      'formversion' : event._form.get_option ('version') or "Unknown",
-      'author'      : event._form.get_option ('author') or "Unknown",
-      'description' : event._form.get_option ('description') or "Unknown",
-    }
+  def __execute_about(self, event):
 
-    self._uiinstance.showAbout (**parameters)
+    event._form.show_about()
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -513,33 +513,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Show an about dialog
-  # ---------------------------------------------------------------------------
-
-  def showAbout (self, name = u_("Unknown"), appversion = VERSION,
-      formversion = "?", author = "Unknown", description = "Unknown"):
-    """
-    Displays an about dialog for the current application as defined by the
-    given parameter dictionary.
-
-    @param name: name of the application
-    @param appversion: version of the application (GNUe Forms)
-    @param formversion: version of the form
-    @param author: author of the form
-    @param description: text describing the form
-    """
-
-    self._showAbout (name, appversion, formversion, author, description)
-
-
-  # ---------------------------------------------------------------------------
-
-  def _showAbout (self, name, appversion, formversion, author, description):
-
-    raise ImplementationError, (self.name, '_showAbout')
-
-
-  # ---------------------------------------------------------------------------
   # Get an input dialog for a given set of fields
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -131,7 +131,7 @@
 
   def _deselectHandler (self, menuItem, userAction):
 
-    self.container._show_tiip ('')
+    self.container._show_tip ('')
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -237,20 +237,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Display an about box
-  # ---------------------------------------------------------------------------
-
-  def _showAbout (self, name, appversion, formversion, author, description):
-
-    dlg = dialogs.AboutBox (name, appversion, formversion, author, description)
-    try:
-      dlg.run ()
-
-    finally:
-      dlg.destroy ()
-
-
-  # ---------------------------------------------------------------------------
   # Make sure strings get converted to unicode
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py      2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/gtk2/dialogs.py      2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -20,15 +20,17 @@
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
 # $Id$
-
-import sys
 
+import sys
+
 import gtk
 import types
 import pango
 
 from gnue.common.apps import i18n, errors
 
+from gnue.forms import VERSION
+
 # =============================================================================
 # Exceptions
 # =============================================================================
@@ -53,11 +55,10 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, name, appversion, formversion, author, description):
+  def __init__ (self, name, version, author, description):
     """
     @param name: name of the application
-    @param appversion: version of the application (GNUe Forms)
-    @param formversion: version of the form
+    @param version: version of the form
     @param author: author of the form
     @param description: text describing the form
     """
@@ -80,7 +81,7 @@
     labels.append (self.__newLabel (u_("Version:"), tbl, 0, 1, 0, 1))
     labels.append (self.__newLabel (u_("Driver:"), tbl, 0, 1, 1, 2))
 
-    items.append (self.__newLabel (appversion, tbl, 1, 2, 0, 1))
+    items.append (self.__newLabel (VERSION, tbl, 1, 2, 0, 1))
     items.append (self.__newLabel (u'GTK', tbl, 1, 2, 1, 2))
 
     box.add (tbl)
@@ -100,9 +101,9 @@
     labels.append (self.__newLabel (u_("Author:"),      tbl, 0, 1, 2, 3))
     labels.append (self.__newLabel (u_("Description:"), tbl, 0, 1, 3, 4))
 
-    items.append (self.__newLabel (name,        tbl, 1, 2, 0, 1))
-    items.append (self.__newLabel (formversion, tbl, 1, 2, 1, 2))
-    items.append (self.__newLabel (author,      tbl, 1, 2, 2, 3))
+    items.append (self.__newLabel (name,    tbl, 1, 2, 0, 1))
+    items.append (self.__newLabel (version, tbl, 1, 2, 1, 2))
+    items.append (self.__newLabel (author,  tbl, 1, 2, 2, 3))
 
     l = self.__newLabel (description, tbl, 1, 2, 3, 4)
     l.set_line_wrap (True)

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-09-11 
14:55:54 UTC (rev 8664)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-09-11 
19:05:12 UTC (rev 8665)
@@ -27,6 +27,7 @@
 import types
 
 from gnue.common import events
+from gnue.forms.uidrivers.gtk2 import dialogs
 from gnue.forms.uidrivers.gtk2.widgets._base import UIHelper
 from gnue.forms.uidrivers.gtk2.MenuBar import MenuBar
 from gnue.forms.uidrivers.gtk2.ToolBar import ToolBar
@@ -306,6 +307,20 @@
 
 
   # ---------------------------------------------------------------------------
+  # Display an about box
+  # ---------------------------------------------------------------------------
+
+  def _ui_show_about_(self, name, version, author, description):
+
+    dlg = dialogs.AboutBox (name, version, author, description)
+    try:
+      dlg.run ()
+
+    finally:
+      dlg.destroy ()
+
+
+  # ---------------------------------------------------------------------------
   # Print form screenshot
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -319,15 +319,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Display an about box
-  # ---------------------------------------------------------------------------
-
-  def _showAbout (self, name, appversion, formversion, author, description):
-    d = dialogs.AboutBox (name, appversion, formversion, author, description)
-    d.DoModal ()
-
-
-  # ---------------------------------------------------------------------------
   # Exit the application
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/win32/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -342,7 +342,7 @@
 # =============================================================================
 class AboutBox (BaseDialog):
 
-  def __init__ (self, name, appversion, formversion, author, description):
+  def __init__ (self, name, version, author, description):
     """
     """
     title = textEncode(u_("About %s") % name)
@@ -357,7 +357,7 @@
     self.template.append (self.__addLabel (self.__labels, 
textEncode(u_('Version:')), 20))
     self.template.append (self.__addLabel (self.__labels, 
textEncode(u_('Driver:')), 34))
 
-    self.template.append (self.__addLabel (self.__contents, 
textEncode(appversion), 20))
+    self.template.append (self.__addLabel (self.__contents, 
textEncode(VERSION), 20))
     self.template.append (self.__addLabel (self.__contents, 'win32', 34))
 
     # Lower box with info about the form currently displayed
@@ -368,7 +368,7 @@
     self.template.append (self.__addLabel (self.__labels, 
textEncode(u_('Description:')), 116))
 
     self.template.append (self.__addLabel (self.__contents, textEncode(name), 
74))
-    self.template.append (self.__addLabel (self.__contents, 
textEncode(formversion), 88))
+    self.template.append (self.__addLabel (self.__contents, 
textEncode(version), 88))
     self.template.append (self.__addLabel (self.__contents, 
textEncode(author), 102))
     descr = '\n'.join (textwrap.wrap (description))
     self.template.append (self.__addLabel (self.__contents, textEncode(descr), 
116))
@@ -477,7 +477,7 @@
          "get's continued in the third line too.\n" \
          "And here comes the rest. Here we go."
   #desc = "Hey boyz, that thingy is quite complicated"
-  dialog = AboutBox ('Foobar', '1.0', '0.5.2', 'Frodo', desc)
+  dialog = AboutBox ('Foobar', '1.0', 'Frodo', desc)
   dialog.DoModal ()
  
    # 
---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-09-11 
14:55:54 UTC (rev 8664)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-09-11 
19:05:12 UTC (rev 8665)
@@ -33,6 +33,7 @@
 import win32con
 import commctrl
 
+from gnue.forms.uidrivers.win32 import dialogs
 from gnue.forms.uidrivers.win32.common import *
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
 from gnue.forms.uidrivers.win32.MenuBar import MenuBar
@@ -210,6 +211,16 @@
 
 
   # ---------------------------------------------------------------------------
+  # Display an about box
+  # ---------------------------------------------------------------------------
+
+  def _ui_show_about_(self, name, version, author, description):
+
+    d = dialogs.AboutBox (name, version, author, description)
+    d.DoModal ()
+
+
+  # ---------------------------------------------------------------------------
   # Print form screenshot
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -221,20 +221,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Display an about box
-  # ---------------------------------------------------------------------------
-
-  def _showAbout (self, name, appversion, formversion, author, description):
-    
-    dlg = dialogs.AboutBox (name, appversion, formversion, author, description)
-    try:
-      dlg.ShowModal ()
-
-    finally:
-      dlg.Destroy ()
-
-
-  # ---------------------------------------------------------------------------
   # Start an input dialog and return the data record or None if cancelled
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/wx/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/dialogs.py        2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx/dialogs.py        2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -44,12 +44,11 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, name = "Unknown", appversion = VERSION,
-      formversion = "?", author = "Unknown", description = 'n/a'):
+  def __init__ (self, parent, name, version, author, description):
     """
+    @param parent: wx object to be the parent of the dialog
     @param name: name of the application
-    @param appversion: version of the application (GNUe Forms)
-    @param formversion: version of the form
+    @param version: version of the form
     @param author: author of the form
     @param description: text describing the form
     """
@@ -65,7 +64,7 @@
 
     gfFlex = wxFlexGridSizer (2, 2, 4, 10)
     gfFlex.Add (wxStaticText (self, -1, wxEncode (u_("Version:"))))
-    gfFlex.Add (wxStaticText (self, -1, appversion))
+    gfFlex.Add (wxStaticText (self, -1, VERSION))
     gfFlex.Add (wxStaticText (self, -1, wxEncode (u_("Driver:"))))
     gfFlex.Add (wxStaticText (self, -1, "wxPython %s" % WXVERSION))
 
@@ -83,7 +82,7 @@
     fiFlex.Add (wxStaticText (self, -1, wxEncode (u_("Name:"))))
     fiFlex.Add (wxStaticText (self, -1, name))
     fiFlex.Add (wxStaticText (self, -1, wxEncode (u_("Version:"))))
-    fiFlex.Add (wxStaticText (self, -1, formversion))
+    fiFlex.Add (wxStaticText (self, -1, version))
     fiFlex.Add (wxStaticText (self, -1, wxEncode (u_("Author:"))))
     fiFlex.Add (wxStaticText (self, -1, author))
     fiFlex.Add (wxStaticText (self, -1, wxEncode (u_("Description:"))))
@@ -500,7 +499,7 @@
          "WWWWWWW WWWWWWW WWWWWWWWWWWW WWWWWWW WWWWWWWWWW WWWWWWW WWWWWWW" \
          "WWWW WWWWW WWWW! And here comes the rest. Here we go."
 
-  dialog = AboutBox ('FooBar', author = 'BarBaz', description = desc)
+  dialog = AboutBox (None, 'FooBar', '1.0', 'BarBaz', desc)
   try:
     dialog.ShowModal ()
   finally:

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-09-11 
14:55:54 UTC (rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-09-11 
19:05:12 UTC (rev 8665)
@@ -234,6 +234,20 @@
     self.statusBar.SetStatusWidths([tipWidth, statusWidth, insertWidth, 
recordWidth, pageWidth])
 
 
+  # ---------------------------------------------------------------------------
+  # Display an about box
+  # ---------------------------------------------------------------------------
+
+  def _ui_show_about_(self, name, version, author, description):
+    
+    dlg = dialogs.AboutBox (self.mainWindow, name, version, author, 
description)
+    try:
+      dlg.ShowModal ()
+
+    finally:
+      dlg.Destroy ()
+
+
   # --------------------------------------------------------------------------
   # Print out form screenshot
   # --------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -239,23 +239,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Display an about box
-  # ---------------------------------------------------------------------------
-
-  def _showAbout (self, name, appversion, formversion, author, description):
-
-    iDir = GConfig.getInstalledBase ('forms_images', 'common_images')
-    icon = os.path.join (iDir, 'gnue-icon.png')
-    
-    dlg = dialogs.AboutBox (name, formversion, author, description, icon)
-    try:
-      dlg.ShowModal ()
-
-    finally:
-      dlg.Destroy ()
-
-
-  # ---------------------------------------------------------------------------
   # Show an exception dialog
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/dialogs.py      2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx26/dialogs.py      2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -42,17 +42,17 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, appname, appvers = None, author = None, descr = None,
-      icon = None):
+  def __init__ (self, parent, name, version, author, descr, icon):
     """
-    @param appname: name of the application
-    @param appvers: version of the application
+    @param parent: wx object to be the parent of the dialog
+    @param name: name of the application
+    @param version: version of the application
     @param author: author of the application
     @param description: text describing the form
     @param icon: path to the appication's icon
     """
 
-    wx.Dialog.__init__ (self, None, wx.ID_ANY, u_("About %s") % appname)
+    wx.Dialog.__init__ (self, parent, wx.ID_ANY, u_("About %s") % name)
 
     dlgSz = wx.BoxSizer (wx.VERTICAL)
     sizer = wx.BoxSizer (wx.VERTICAL)
@@ -73,13 +73,13 @@
       small = wx.SMALL_FONT
 
     # Application name
-    s = wx.StaticText (self, -1, appname)
+    s = wx.StaticText (self, -1, name)
     s.SetFont (bold)
     sizer.Add (s, 0, wx.ALIGN_CENTER)
 
     # Application version
-    if appvers:
-      s = wx.StaticText (self, -1, u_("Version: %s") % appvers)
+    if version:
+      s = wx.StaticText (self, -1, u_("Version: %s") % version)
       s.SetFont (small)
       sizer.Add (s, 0, wx.ALIGN_CENTER)
 
@@ -558,7 +558,7 @@
          "It also contains newlines as well as a lot of text. This text " \
          "get's continued in the third line too.\n"
 
-  dialog = AboutBox ('FooBar', '1.0.3', 'BarBaz', desc)
+  dialog = AboutBox (None, 'FooBar', '1.0.3', 'BarBaz', desc, None)
   try:
     dialog.ShowModal ()
   finally:

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-09-11 14:55:54 UTC 
(rev 8664)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-09-11 19:05:12 UTC 
(rev 8665)
@@ -30,6 +30,7 @@
 
 from gnue.common.apps import GConfig
 from gnue.forms import VERSION
+from gnue.forms.uidrivers.wx26 import dialogs
 from gnue.forms.uidrivers.wx26.MenuBar import MenuBar
 from gnue.forms.uidrivers.wx26.ToolBar import ToolBar
 from gnue.forms.uidrivers.wx26.widgets._base import UIHelper
@@ -358,6 +359,23 @@
 
 
     # -------------------------------------------------------------------------
+    # Display an about box
+    # -------------------------------------------------------------------------
+
+    def _ui_show_about_(self, name, version, author, description):
+
+        idir = GConfig.getInstalledBase('forms_images', 'common_images')
+        icon = os.path.join(idir, 'gnue-icon.png')
+    
+        dlg = dialogs.AboutBox(self.main_window, name, version, author,
+                description, icon)
+        try:
+            dlg.ShowModal()
+        finally:
+            dlg.Destroy()
+
+
+    # -------------------------------------------------------------------------
     # Print form screenshot
     # -------------------------------------------------------------------------
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]