[gnue] r6884 - in trunk/gnue-forms/src/uidrivers: _commonGuiToolkit gtk2

[johannes]

Author: johannes
Date: 2005-01-10 08:42:29 -0600 (Mon, 10 Jan 2005)
New Revision: 6884

Modified:
   trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
Log:
Fix for encoding of menu labels


Modified: trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/MenuBar.py 2005-01-10 
11:52:16 UTC (rev 6883)
+++ trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/MenuBar.py 2005-01-10 
14:42:29 UTC (rev 6884)
@@ -129,53 +129,53 @@
 #
 
 _DEFAULT_MENU =  (
-   ( _('&File'), (
-       (_('&Save Changes'), "COMMIT"),
-       (_('&Revert Changes'), "ROLLBACK"),
+   ( u_('&File'), (
+       (u_('&Save Changes'), "COMMIT"),
+       (u_('&Revert Changes'), "ROLLBACK"),
        None,
-       (_('&Print'), "PRINTOUT"),
+       (u_('&Print'), "PRINTOUT"),
        None,
-       (_('&Close'), "EXIT") ) ),
+       (u_('&Close'), "EXIT") ) ),
 
-   ( _('&Edit'), (
-       (_('C&ut'), "CUT"),
-       (_('&Copy'), "COPY"),
+   ( u_('&Edit'), (
+       (u_('C&ut'), "CUT"),
+       (u_('&Copy'), "COPY"),
 #TODO: POST 0.5.0#       ('C&opy Special', (
 #TODO: POST 0.5.0#          ('&Record as Text', 'COPYRECORD'),
 #TODO: POST 0.5.0#          ('&Screen as Text', 'COPYSCREEN' ) ) ),
-       (_('&Paste'), "PASTE"),
-       (_('Select &All'), "SELECTALL"),
+       (u_('&Paste'), "PASTE"),
+       (u_('Select &All'), "SELECTALL"),
        None,
-       (_('&Insert New Record'),"NEWRECORD"),
+       (u_('&Insert New Record'),"NEWRECORD"),
        None,
-       (_('&Delete Current Record'),'MARKFORDELETE') ) ),
+       (u_('&Delete Current Record'),'MARKFORDELETE') ) ),
 
-   ( _('&Navigation'), (
-       (_('&Next Entry'), "NEXTENTRY"),
-       (_('&Previous Entry'), "PREVENTRY"),
+   ( u_('&Navigation'), (
+       (u_('&Next Entry'), "NEXTENTRY"),
+       (u_('&Previous Entry'), "PREVENTRY"),
        None,
-       (_('Next &Record'), "NEXTRECORD"),
-       (_('Previous R&ecord'), "PREVRECORD"),
-       (_('&First Record'), 'FIRSTRECORD'),
-       (_('&Last Record'), 'LASTRECORD'),
-       (_('&Go to record...'), 'JUMPPROMPT'),
+       (u_('Next &Record'), "NEXTRECORD"),
+       (u_('Previous R&ecord'), "PREVRECORD"),
+       (u_('&First Record'), 'FIRSTRECORD'),
+       (u_('&Last Record'), 'LASTRECORD'),
+       (u_('&Go to record...'), 'JUMPPROMPT'),
        None,
-       (_('Next &Block'), 'NEXTBLOCK'),
-       (_('Previous Bl&ock'), 'PREVBLOCK'),
+       (u_('Next &Block'), 'NEXTBLOCK'),
+       (u_('Previous Bl&ock'), 'PREVBLOCK'),
        None,
-       (_('Next P&age'), 'NEXTPAGE'),
-       (_('Pre&vious Page'), 'PREVPAGE') ) ),
+       (u_('Next P&age'), 'NEXTPAGE'),
+       (u_('Pre&vious Page'), 'PREVPAGE') ) ),
 
-   ( _('&Search'), (
-       (_('Enter Query Mode'), "ENTERQUERY"),
-       (_('Cancel Query Mode'), "CANCELQUERY"),       
+   ( u_('&Search'), (
+       (u_('Enter Query Mode'), "ENTERQUERY"),
+       (u_('Cancel Query Mode'), "CANCELQUERY"),       
        None, 
-       (_('Repeat Last Query'), "COPYQUERY"),
+       (u_('Repeat Last Query'), "COPYQUERY"),
        None,
-       (_('Perform Query'), "EXECQUERY") ) ),
+       (u_('Perform Query'), "EXECQUERY") ) ),
 
-   ( _('&Help'), (
+   ( u_('&Help'), (
 #TODO: POST 0.5.0#       (_('Keystrokes...'), "HELPKEYS"),
-       (_('About...'), "ABOUT"), ) ),
+       (u_('About...'), "ABOUT"), ) ),
   )
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2005-01-10 11:52:16 UTC 
(rev 6883)
+++ trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2005-01-10 14:42:29 UTC 
(rev 6884)
@@ -58,8 +58,8 @@
   def correctLabel (self, label):
     # TODO: remove decode step, when gettext translations are send
     # in unicode instead of local encoding
-    return string.replace (unicode (label, gConfigForms ('textEncoding')),
-                           '&', '_')
+    print "Label=", repr (label)
+    return string.replace (label, '&', '_')
     
   # ---------------------------------------------------------------------------
   # Add a (sub)menu