r6046 - in trunk/gnue-forms/src: . uidrivers/gtk2

[johannes]

Author: johannes
Date: 2004-07-23 04:14:22 -0500 (Fri, 23 Jul 2004)
New Revision: 6046

Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
Log:
StringType messages get converted into unicode, and better default title for 
messageboxes


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2004-07-23 09:04:27 UTC (rev 6045)
+++ trunk/gnue-forms/src/GFInstance.py  2004-07-23 09:14:22 UTC (rev 6046)
@@ -764,8 +764,8 @@
 
 
       if not event._form.isSaved():
-        self.displayMessageBox (_("Data not saved. Save changes or clear "
-                           "the form to proceed."), 'Error')
+        self.displayMessageBox (u_("Data not saved. Save changes or clear "
+               "the form to proceed."), 'Error')
         event._form.refreshUIEvents()
       else:
         event._form.processTrigger('On-Exit')
@@ -833,7 +833,7 @@
   # Displays a generic message box
   #
   def displayMessageBox (self, message = '', kind = 'Info',
-      cancel = False, caption = 'GNUe Message', title = 'Information'):
+      cancel = False, caption = 'GNUe Message', title = None):
      parameters = {
        'caption': caption,
        'message': message,
@@ -842,6 +842,8 @@
      if hasattr (self._uiinstance, 'messageBox'):
        return self._uiinstance.messageBox (message, kind, title, cancel)
      else:
+       if title is None:
+         parameters ['title'] = 'Information'
        self.activateForm ('_messageBox', parameters, modal = 1)
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-23 09:04:27 UTC 
(rev 6045)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-23 09:14:22 UTC 
(rev 6046)
@@ -304,12 +304,10 @@
     mbRec  = self._MBOX_KIND.get (kind)
     dialog = gtk.MessageDialog (parent = None, flags = gtk.DIALOG_MODAL,
         type = mbRec ['type'], buttons = mbRec ['buttons'],
-        message_format = message)
+        message_format = self.__makeSafe (message))
 
     if title is not None and len (title):
-      if isinstance (title, types.StringType):
-        title = unicode (title, i18n.encoding)
-      dialog.set_title (title)
+      dialog.set_title (self.__makeSafe (title))
 
     cButtons = [gtk.BUTTONS_CANCEL, gtk.BUTTONS_OK_CANCEL]
     if cancel and not mbRec ['buttons'] in cButtons:
@@ -329,3 +327,14 @@
     dialog = about.AboutBox (params, form)
     dialog.run ()
     dialog.destroy ()
+
+
+  # ---------------------------------------------------------------------------
+  # Make sure strings get converted to unicode
+  # ---------------------------------------------------------------------------
+
+  def __makeSafe (self, aValue):
+    if isinstance (aValue, types.StringType):
+      return unicode (aValue, i18n.encoding)
+    else:
+      return aValue