[patch] this patch removes all sly sotring and just takes first smile for iconselect.

psi-iconselect-direct-order.patch (text/plain), 1.76 KB, created by Vadim Efimov on 2007-11-25 12:43:55 UTC

Index: src/widgets/iconselect.cpp
===================================================================
--- src/widgets/iconselect.cpp	(revision 226)
+++ src/widgets/iconselect.cpp	(working copy)
@@ -119,13 +119,13 @@
 
 			if ( !ic->text().isEmpty() ) {
 				// first, try to get the text by priorities
-				QStringList lang;
+/*				QStringList lang;
 				lang << QString(QTextCodec::locale()).left(2); // most prioritent, is the local language
 				lang << "";                                    // and then the language without name goes (international?)
 				lang << "en";                                  // then real English
-
+*/
 				QString str;
-				QStringList::Iterator it = lang.begin();
+/*				QStringList::Iterator it = lang.begin();
 				for ( ; it != lang.end(); ++it) {
 					QHash<QString, QString>::const_iterator it2 = ic->text().find( *it );
 					if ( it2 != ic->text().end() ) {
@@ -133,13 +133,14 @@
 						break;
 					}
 				}
-
+*/
 				// if all fails, just get the first text
 				if ( str.isEmpty() )
 				{
 					QHashIterator<QString, QString> it ( ic->text() );
-					while ( it.hasNext() ) {
-						it.next();
+					it.toBack();
+					while ( it.hasPrevious() ) {
+						it.previous();
 
 						if ( !it.value().isEmpty() ) {
 							str = it.value();
@@ -150,15 +151,14 @@
 
 				if ( !str.isEmpty() )
 					text = str;
-
 				// and list of possible variants in the ToolTip
-				QString toolTip;
-				foreach ( QString icText, ic->text() ) {
+				QString toolTip = text;
+/*				foreach ( QString icText, ic->text() ) {
 					if ( !toolTip.isEmpty() )
 						toolTip += ", ";
 					toolTip += icText;
 					break; // comment this to get list of iconsets
-				}
+				}*/
 				if ( toolTip.length() > 30 )
 					toolTip = toolTip.left(30) + "...";
 				setToolTip(toolTip);