Changeset 6101 for trunk/qt4-gui/src/userevents

Timestamp:

03/15/08 22:51:25 (9 months ago)

Author:

eugene

Message:

Made user picture be updated in an already opened chat window.

Location:

trunk/qt4-gui/src/userevents

Files:

• usersendcommon.cpp (modified) (5 diffs)
• usersendcommon.h (modified) (4 diffs)

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -103 +103 @@
 {
   grpMR = NULL;
+  lblPicture = NULL;
   clearDelay = 250;
 
@@ -421 +422 @@
   }
 
-  QSplitter* bottom = new QSplitter(splView);
-
-  mleSend = new MLEdit(true, bottom, true);
+  splPicture = new QSplitter(splView);
+
+  mleSend = new MLEdit(true, splPicture, true);
   mleSend->setSizeHintLines(3);
   mleSend->setCheckSpellingEnabled(Config::Chat::instance()->checkSpelling());
   mleSend->installEventFilter(this); // Enables send with enter
 
-  if (Config::Chat::instance()->showUserPic())
-  {
-    u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
-    if (u != NULL)
-    {
-      if (u->GetPicturePresent())
-      {
-        QString picPath = QString(BASE_DIR) + USER_DIR + "/" + u->IdString() + ".pic";
-        QMovie* picMovie = new QMovie(picPath);
-        if (picMovie->isValid())
-        {
-          QLabel* picLabel = new QLabel(bottom);
-          picLabel->setMovie(picMovie);
-          picMovie->start();
-          picLabel->setFixedWidth(picLabel->sizeHint().width());
-          if (Config::Chat::instance()->showUserPicHidden())
-            bottom->setSizes(QList<int>() << 1 << 0);
-        }
-      }
-      gUserManager.DropUser(u);
-    }
-  }
-
   if (Config::Chat::instance()->msgChatView())
   {
     splView->setStretchFactor(splView->indexOf(mleHistory), 1);
-    splView->setStretchFactor(splView->indexOf(bottom), 0);
+    splView->setStretchFactor(splView->indexOf(splPicture), 0);
 
     connect(mleHistory, SIGNAL(quote(const QString&)),
@@ -472 +450 @@
 
   updateIcons();
+  updatePicture();
 
   connect(mleSend, SIGNAL(ctrlEnterPressed()), btnSend, SIGNAL(clicked()));
@@ -527 +506 @@
   foreach (QAction* a, grpSendType->actions())
     a->setIcon(iconForType(a->data().toInt()));
+}
+
+void UserSendCommon::updatePicture(ICQUser* u)
+{
+  bool fetched = false;
+
+  if (u == NULL)
+  {
+    u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
+    fetched = true;
+  }
+  if (u == NULL)
+    return;
+
+  if (lblPicture != NULL)
+  {
+    delete lblPicture;
+    lblPicture = NULL;
+  }
+
+  if (Config::Chat::instance()->showUserPic() &&
+      u->GetPicturePresent())
+  {
+    QString picPath = QString(BASE_DIR) + USER_DIR + "/" + u->IdString() + ".pic";
+    QMovie* picMovie = new QMovie(picPath);
+    if (picMovie->isValid())
+    {
+      lblPicture = new QLabel();
+      splPicture->insertWidget(1, lblPicture);
+      lblPicture->setMovie(picMovie);
+      picMovie->start();
+      lblPicture->setFixedWidth(lblPicture->sizeHint().width());
+      if (Config::Chat::instance()->showUserPicHidden())
+        splPicture->setSizes(QList<int>() << 1 << 0);
+    }
+    else
+      delete picMovie;
+  }
+
+  if (fetched)
+    gUserManager.DropUser(u);
 }
 
@@ -955 +975 @@
       }
       break;
+
+    case USER_PICTURE:
+      updatePicture(u);
   }
 

trunk/qt4-gui/src/userevents/usersendcommon.h

@@ -27 +27 @@
 
 class QGroupBox;
+class QLabel;
 class QPushButton;
 class QSplitter;
@@ -32 +33 @@
 class CICQSignal;
 class ICQEvent;
+class ICQUser;
 
 namespace LicqQtGui
@@ -74 +76 @@
   QActionGroup* grpSendType;
   QGroupBox* grpMR;
+  QLabel* lblPicture;
   QPushButton* btnClose;
   QPushButton* btnSend;
   QSplitter* splView;
+  QSplitter* splPicture;
   QString strTempMsg;
   QTimer* tmrSendTyping;
@@ -83 +87 @@
   void retrySend(ICQEvent* e, bool online, unsigned short level);
   virtual void userUpdated(CICQSignal* sig, QString id = QString::null, unsigned long ppid = 0);
+  void updatePicture(ICQUser* u = NULL);
   bool checkSecure();