[uim] r6573 committed - * qt4/pref/keyeditformbase.ui...

[codesite-noreply]

Revision: 6573
Author: nogu.dev
Date: Fri Jul 23 17:12:33 2010
Log: * qt4/pref/keyeditformbase.ui
  - Include qtgettext.h.
* qt4/pref/olisteditformbase.ui
  - Ditto.
* qt4/pref/uim-pref-qt4.pro.in
  - Define QMAKE_UIC.
* qt4/qtgettext.h
  - Define UIC_.
  - Remove extra parentheses.
* qt4/toolbar/common-uimstateindicator.cpp
  - (qstring_): New function.
  - (UimStateIndicator::propListUpdate): Translate labels.
http://code.google.com/p/uim/source/detail?r=6573

Modified:
 /trunk/qt4/pref/keyeditformbase.ui
 /trunk/qt4/pref/olisteditformbase.ui
 /trunk/qt4/pref/uim-pref-qt4.pro.in
 /trunk/qt4/qtgettext.h
 /trunk/qt4/toolbar/common-uimstateindicator.cpp

=======================================
--- /trunk/qt4/pref/keyeditformbase.ui  Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/keyeditformbase.ui  Fri Jul 23 17:12:33 2010
@@ -4,6 +4,9 @@
   <comment></comment>
   <exportmacro></exportmacro>
   <class>KeyEditFormBase</class>
+  <includes>
+    <include location="local">qtgettext.h</include>
+  </includes>
   <widget class="QDialog" name="KeyEditFormBase">
     <property name="geometry">
       <rect>
=======================================
--- /trunk/qt4/pref/olisteditformbase.ui        Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/olisteditformbase.ui        Fri Jul 23 17:12:33 2010
@@ -3,6 +3,9 @@
   <author></author>
   <comment></comment>
   <exportmacro></exportmacro>
+  <includes>
+    <include location="local">qtgettext.h</include>
+  </includes>
   <class>OListEditFormBase</class>
   <widget class="QDialog" name="OListEditFormBase">
     <property name="geometry">
=======================================
--- /trunk/qt4/pref/uim-pref-qt4.pro.in Tue Mar  2 23:14:47 2010
+++ /trunk/qt4/pref/uim-pref-qt4.pro.in Fri Jul 23 17:12:33 2010
@@ -15,6 +15,8 @@
 QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
 QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@

+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -tr UIC_
+
 # Input
 HEADERS += @srcdir@/customwidgets.h @srcdir@/kseparator.h @srcdir@/qt4.h
 FORMS += @srcdir@/keyeditformbase.ui @srcdir@/olisteditformbase.ui
=======================================
--- /trunk/qt4/qtgettext.h      Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/qtgettext.h      Fri Jul 23 17:12:33 2010
@@ -47,6 +47,7 @@
 #undef _
 #endif
 #define _(String) mygettext(String)
+#define UIC_(String, dummy) mygettext(String)
 /* undef original N_(String) macro for handling encoding */
 #ifdef N_
 #undef N_
@@ -59,7 +60,8 @@

 #else /* ENABLE_NLS */

-#define mygettext(String) QString::fromLocal8Bit( (String) )
+#define mygettext(String) QString::fromLocal8Bit(String)
+#define UIC_(String, dummy) (String)
 #endif /* ENABLE_NLS */

 #endif /* Not def: UIM_QT4_QTGETTEXT_H */
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.cpp     Sun Jun  6 05:54:01 2010
+++ /trunk/qt4/toolbar/common-uimstateindicator.cpp     Fri Jul 23 17:12:33 2010
@@ -46,10 +46,21 @@
 #include <cstring>
 #include <cstdlib>

+#include "qtgettext.h"
+
 static const QString ICONDIR = UIM_PIXMAPSDIR;
 static int uim_fd;
 static QHelperToolbarButton *fallbackButton = 0;
 static QSocketNotifier *notifier = 0;
+
+static inline QString qstring_(const QString &string)
+{
+#if ENABLE_NLS
+    return mygettext(string.toUtf8().data());
+#else
+    return string;
+#endif
+}

 UimStateIndicator::UimStateIndicator( QWidget *parent )
         : QFrame( parent )
@@ -199,7 +210,8 @@
                         && !fields[ 5 ].isEmpty() )
                 {
                     QAction *action = popupMenu->insertHelperItem(
-                        fields[1], fields[ 3 ], fields[ 4 ], fields[ 5 ] );
+                        fields[1], qstring_( fields[ 3 ] ),
+                        fields[ 4 ], fields[ 5 ] );
                     // check the item which is now used
                     if ( fields.count() > 6 && fields[ 6 ] == "*" )
                         action->setChecked( true );