[uim-commit] r2445 - trunk/qt

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-08 05:56:47 -0800 (Thu, 08 Dec 2005)
New Revision: 2445

Modified:
   trunk/qt/switcher-qt.cpp
Log:
* qt/switcher-qt.cpp (UimImSwitcher::parseHelperStrImList) : Bug
  fix for handling IM lang with "", and use of translation.


Modified: trunk/qt/switcher-qt.cpp
===================================================================
--- trunk/qt/switcher-qt.cpp	2005-12-08 13:41:21 UTC (rev 2444)
+++ trunk/qt/switcher-qt.cpp	2005-12-08 13:56:47 UTC (rev 2445)
@@ -251,15 +251,24 @@
     const QStringList lines = QStringList::split( "\n", message );
     for ( unsigned int i = 2; i < lines.count(); i++ )
     {
-        const QStringList iminfoList = QStringList::split( "\t", lines[ i ] );
+        const QStringList iminfoList = QStringList::split( "\t", lines[ i ], true );
 
         if ( !iminfoList.isEmpty()
                 && !iminfoList[ 0 ].isEmpty()
-                && !iminfoList[ 1 ].isEmpty()
+		// Language of IM with any locale is set as "".
+                // && !iminfoList[ 1 ].isEmpty()
                 && !iminfoList[ 2 ].isEmpty() )
         {
+	    QString lang, short_desc;
+
+	    if (iminfoList[1].isEmpty())
+		lang = QString("-");
+	    else
+		lang = QString::fromUtf8(gettext(iminfoList[1].utf8()));
+	    short_desc = QString::fromUtf8(gettext(iminfoList[2].utf8()));
+
             // add new item to listview
-            QListViewItem * item = new QListViewItem( listview, iminfoList[ 0 ], iminfoList[ 1 ], iminfoList[ 2 ] );
+            QListViewItem * item = new QListViewItem( listview, iminfoList[ 0 ], lang, short_desc );
 
             if ( !iminfoList[ 3 ].isEmpty() && QString::compare( iminfoList[ 3 ], "selected" ) == 0 )
                 listview->setSelected( item, TRUE );