Changeset 5546

Timestamp:

10/04/07 12:27:57 (13 months ago)

Author:

eugene

Message:

Added default AwaitingAuth? extended icon.

Location:

branches/qt-gui_qt4/src

Files:

• config/iconmanager.cpp (modified) (3 diffs)
• config/iconmanager.h (modified) (1 diff)
• contactlist/contactlist.h (modified) (2 diffs)
• contactlist/contactuserdata.cpp (modified) (3 diffs)
• contactlist/contactuserdata.h (modified) (1 diff)
• views/contactdelegate.cpp (modified) (1 diff)
• xpm/pixAwaitingAuth.xpm (added)

branches/qt-gui_qt4/src/config/iconmanager.cpp

@@ -38 +38 @@
 #include "xpm/itemCollapsed.xpm"
 #include "xpm/itemExpanded.xpm"
+#include "xpm/pixAwaitingAuth.xpm"
 #include "xpm/pixCustomAR.xpm"
 #include "xpm/pixPhone.xpm"
@@ -212 +213 @@
   LOAD_ICON("Invisible",        InvisibleIcon,          pixInvisible_xpm);
   LOAD_ICON("Typing",           TypingIcon,             pixTyping_xpm);
+  LOAD_ICON("AwaitingAuth",     AwaitingAuthIcon,       pixAwaitingAuth_xpm);
   LOAD_ICON("ICQphoneActive",   IcqPhoneActiveIcon,     pixICQphoneActive_xpm);
   LOAD_ICON("ICQphoneBusy",     IcqPhoneBusyIcon,       pixICQphoneBusy_xpm);
@@ -235 +237 @@
     return myIconMap[icon];
 
-printf("IconManager::getIcon - returning empty icon for %i\n", icon);
+  qWarning("IconManager::getIcon - returning empty icon for IconType=%i", icon);
   return myEmptyIcon;
 }

branches/qt-gui_qt4/src/config/iconmanager.h

@@ -73 +73 @@
     InvisibleIcon,
     TypingIcon,
+    AwaitingAuthIcon,
     CustomArIcon,
     CollapsedIcon,

branches/qt-gui_qt4/src/contactlist/contactlist.h

@@ -143 +143 @@
     IcqPhoneBusyStatusBit,
     SharedFilesStatusBit,
+    AwaitingAuthBit,
     TypingStatusBit,
     SecureStatusBit,
@@ -164 +165 @@
   static const unsigned long IcqPhoneBusyStatus         = 1 << IcqPhoneBusyStatusBit;
   static const unsigned long SharedFilesStatus          = 1 << SharedFilesStatusBit;
+  static const unsigned long AwaitingAuthStatus         = 1 << AwaitingAuthBit;
   static const unsigned long TypingStatus               = 1 << TypingStatusBit;
   static const unsigned long SecureStatus               = 1 << SecureStatusBit;

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

@@ -164 +164 @@
   myStatusFull = u->StatusFull();
   myStatusInvisible = u->StatusInvisible();
+  myStatusAwaitingAuth = u->GetAwaitingAuth();
   myStatusTyping = u->GetTyping() == ICQ_TYPING_ACTIVE;
   myPhoneFollowMeStatus = u->PhoneFollowMeStatus();
@@ -197 +198 @@
 
   updateText(u);
-
-  myStatusFull = u->StatusFull();
-
 
   if (u->GetPicturePresent())
@@ -316 +314 @@
     myExtendedStatus |= ContactListModel::SharedFilesStatus;
 
+  if (myStatusAwaitingAuth)
+    myExtendedStatus |= ContactListModel::AwaitingAuthStatus;
+
   if (myCustomAR)
     myExtendedStatus |= ContactListModel::CustomArStatus;

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

@@ -211 +211 @@
   unsigned long myStatusFull;
   int myEvents;
-  bool myStatusInvisible, myStatusTyping, myCustomAR, mySecure, myFlash, myBirthday, myPhone, myCellular, myGPGKey, myGPGKeyEnabled;
+  bool myStatusInvisible, myStatusTyping, myStatusAwaitingAuth, myCustomAR, mySecure;
+  bool myFlash, myBirthday, myPhone, myCellular, myGPGKey, myGPGKeyEnabled;
   bool myNewUser, myNotInList;
   bool myInIgnoreList, myInOnlineNotify, myInInvisibleList, myInVisibleList;

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

@@ -328 +328 @@
           && Config::ContactList::instance()->showExtendedIcons()) // ...+ extended icons are enabled
       {
+        // pmAwaitingAuth
+        if (extStatus & ContactListModel::AwaitingAuthStatus)
+          drawExtIcon(p, width, height, align, w, IconManager::AwaitingAuthIcon);
+
         // pmPhone
         if (extStatus & ContactListModel::PhoneStatus)