Changeset 5544

Timestamp:

10/04/07 10:58:39 (13 months ago)

Author:

eugene

Message:

• Rewrote ContactUserData::updateText to fix/add the following:
  • Fixed encoding for different components;
  • Append (!) string to the alias if we are awaiting user's auth and exticons are off;
• Fixed delegate to properly recognize columns with aliases.

Location:

branches/qt-gui_qt4/src

Files:

• contactlist/contactuserdata.cpp (modified) (1 diff)
• views/contactdelegate.cpp (modified) (1 diff)

branches/qt-gui_qt4/src/contactlist/contactuserdata.cpp

@@ -407 +407 @@
   for (unsigned short i = 0; i < Config::ContactList::instance()->columnCount(); i++)
   {
+    QString format = Config::ContactList::instance()->columnFormat(i);
+    format.replace("%a", "@_USER_ALIAS_@");
+
     QTextCodec* codec = UserCodec::codecForICQUser(licqUser);
-    QString format = Config::ContactList::instance()->columnFormat(i);
-    char* sTemp = licqUser->usprintf(format.toLatin1());
-    QString newStr;
-    if (format == "%a")
-      newStr = QString::fromUtf8(sTemp);
-    else
-      newStr = codec->toUnicode(sTemp);
-    free(sTemp);
+    char* temp = licqUser->usprintf(format.toLocal8Bit());
+    QString newStr = codec->toUnicode(temp);
+    free(temp);
+
+    temp = licqUser->usprintf("%a");
+    QString alias = QString::fromUtf8(temp);
+    free(temp);
+
+    if (licqUser->GetAwaitingAuth() && !Config::ContactList::instance()->showExtendedIcons())
+      alias.append(" (!)");
+
+    newStr.replace("@_USER_ALIAS_@", alias);
 
     if (newStr != myText[i])

branches/qt-gui_qt4/src/views/contactdelegate.cpp

@@ -325 +325 @@
     {
       if (!text.isEmpty()                                          // ...+ it is not empty 
-          && Config::ContactList::instance()->columnFormat(column) == "%a" // ...+ col contains user's alias 
+          && Config::ContactList::instance()->columnFormat(column).contains("%a") // ...+ col contains user's alias 
           && Config::ContactList::instance()->showExtendedIcons()) // ...+ extended icons are enabled
       {