Changeset 174

Timestamp:

11/12/06 21:28:57 (18 years ago)

Author:

jerome

Message:

Ensures the dialog box is raised before being displayed.
Simplified character encoding stuff.
Backported i18n stuff from PyKota.

Files:

• pykoticon/trunk/bin/pykoticon (modified) (6 diffs)

pykoticon/trunk/bin/pykoticon

@@ -242 +242 @@
         self.SetSizerAndFit(vsizer)
         self.Layout()
-        self.Show(True)
-        self.Raise()
         
         
@@ -314 +312 @@
                                         _("About"), \
                                         wx.OK | wx.ICON_INFORMATION)
+        dialog.Raise()                                        
         dialog.ShowModal()
         dialog.Destroy()
@@ -328 +327 @@
         style |= wx.STAY_ON_TOP    
         dialog = wx.MessageDialog(self, message, caption, style)
+        dialog.Raise()
         self.dialogAnswer = ((dialog.ShowModal() == wx.ID_NO) and "CANCEL") or "OK"
         dialog.Destroy()
@@ -335 +335 @@
         self.dialogAnswer = None
         dialog = GenericInputDialog(self, wx.ID_ANY, labels, varnames, varvalues)
+        dialog.Raise()
         retvalues = {}
         if dialog.ShowModal() == wx.ID_OK :
@@ -415 +416 @@
         if text is not None :
             try :
-                # We don't necessarily trust the default charset, because
-                # xprint sends us titles in UTF-8 but CUPS gives us an ISO-8859-1 charset !
-                # So we first try to see if the text is already in UTF-8 or not, and
-                # if it is, we delete characters which can't be converted to the user's charset,
-                # then convert back to UTF-8. PostgreSQL 7.3.x used to reject some unicode characters,
-                # this is fixed by the ugly line below :
-                return text.decode("UTF-8").encode(self.charset, "replace").decode(self.charset).encode("UTF-8", "replace")
+                return text.decode(self.charset).encode("UTF-8")
             except (UnicodeError, AttributeError) :
                 try :
-                    return text.decode(self.charset).encode("UTF-8", "replace") 
+                    return text.decode(self.charset, "replace").encode("UTF-8") 
                 except (UnicodeError, AttributeError) :    
                     try :
@@ -448 +443 @@
 def main() :
     """Program's entry point."""
+    # locale stuff
     try :
-        locale.setlocale(locale.LC_ALL, "")
+        locale.setlocale(locale.LC_ALL, ("", None))
     except (locale.Error, IOError) :
-        sys.stderr.write("Problem while setting locale.\n")
+        locale.setlocale(locale.LC_ALL, None)
+    (language, charset) = locale.getlocale()
+    language = language or "C"
+    charset = charset or locale.getpreferredencoding()
+    
+    # translation stuff
     try :
-        gettext.install("pykoticon")
+        try :
+            trans = gettext.translation("pykoticon", languages=["%s.%s" % (language, charset)], codeset=charset)
+        except TypeError : # Python <2.4
+            trans = gettext.translation("pykoticon", languages=["%s.%s" % (language, charset)])
+        trans.install()
     except :
         gettext.NullTranslations().install()
-        
-    localecharset = None
-    try :
-        try :
-            localecharset = locale.nl_langinfo(locale.CODESET)
-        except AttributeError :    
-            try :
-                localecharset = locale.getpreferredencoding()
-            except AttributeError :    
-                try :
-                    localecharset = locale.getlocale()[1]
-                    localecharset = localecharset or locale.getdefaultlocale()[1]
-                except ValueError :    
-                    pass        # Unknown locale, strange...
-    except locale.Error :            
-        pass
-    charset = os.environ.get("CHARSET") or localecharset or "ISO-8859-15"
+    
     
     parser = optparse.OptionParser(usage="pykoticon [options] server1 [server2 ...]")