Changeset 3490 for branches/protocol_plugin_1_3_0

Timestamp:

05/03/03 10:51:05 (6 years ago)

Author:

emostar

Message:

Get tabbed chatting to work.
Hopefully I got all the spots that needed the code for protocol plugin support..

Location:

branches/protocol_plugin_1_3_0/qt-gui/src

Files:

• mainwin.cpp (modified) (4 diffs)
• usereventdlg.cpp (modified) (10 diffs)

branches/protocol_plugin_1_3_0/qt-gui/src/mainwin.cpp

@@ -2219 +2219 @@
              (*it)->PPID() == nPPID)
           {
-            e = *it;
-            e->show();
-            if(!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon"))
-            {
-              e->raise();
+          e = static_cast<UserSendCommon*>(*it);
+#if QT_VERSION >= 300
+          if (userEventTabDlg && userEventTabDlg->tabExists(e))
+          {
+          userEventTabDlg->show();
+          userEventTabDlg->selectTab(e);
+          userEventTabDlg->raise();
 #ifdef USE_KDE
-              KWin::setActiveWindow(e->winId());
-#endif
-            }
+          KWin::setActiveWindow(userEventTabDlg->winId());
+#endif
+          }
+#endif
+          else
+          {
+          e->show();
+          if (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon"))
+          {
+            e->raise();
+#ifdef USE_KDE
+            KWin::setActiveWindow(e->winId());
+#endif
+          }
+          }
             return e;
           }
@@ -2235 +2249 @@
   }
 
+  QWidget *parent = NULL;
+#if QT_VERSION >= 300
+  if (m_bTabbedChatting)
+  {
+    if (userEventTabDlg != NULL)
+      userEventTabDlg->raise();
+    else
+    {
+      // create the tab dialog if it does not exist
+      userEventTabDlg = new UserEventTabDlg();
+      connect(userEventTabDlg, SIGNAL(signal_done()), this, SLOT(slot_doneUserEventTabDlg()));
+    }
+    parent = userEventTabDlg;
+  }
+#endif
+
   switch (fcn)
   {
@@ -2244 +2274 @@
     case mnuUserSendMsg:
     {
-      e = new UserSendMsgEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendMsgEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
     case mnuUserSendUrl:
     {
-      e = new UserSendUrlEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendUrlEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
     case mnuUserSendChat:
     {
-      e = new UserSendChatEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendChatEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
     case mnuUserSendFile:
     {
-      e = new UserSendFileEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendFileEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
     case mnuUserSendContact:
     {
-      e = new UserSendContactEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendContactEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
     case mnuUserSendSms:
     {
-      e = new UserSendSmsEvent(licqDaemon, licqSigMan, this, szId, nPPID);
+      e = new UserSendSmsEvent(licqDaemon, licqSigMan, this, szId, nPPID, parent);
       break;
     }
@@ -2275 +2305 @@
       gLog.Warn("%sunknown callFunction() fcn: %d\n", L_WARNxSTR, fcn);
   }
-  if(e) {
-    connect(e, SIGNAL(viewurl(QWidget*, QString)), this, SLOT(slot_viewurl(QWidget *, QString)));
+  if (e == NULL) return NULL;
+
+  connect(e, SIGNAL(viewurl(QWidget*, QString)), this, SLOT(slot_viewurl(QWidget *, QString)));
+#if QT_VERSION >= 300
+  if (m_bTabbedChatting && fcn != mnuUserView)
+  {
+    userEventTabDlg->addTab(e);
+    userEventTabDlg->show();
+  }
+  else
+#endif
     e->show();
-    // there might be more than one send window open
-    // make sure we only remember one, or it will get compliated
-    if (fcn == mnuUserView)
-    {
-      slot_userfinished(szId, nPPID);
-      connect(e, SIGNAL(finished(const char *, unsigned long)),
-        SLOT(slot_userfinished(const char *, unsigned long)));
-      licqUserView.append(static_cast<UserViewEvent*>(e));
-    }
-    else
-    {
-      slot_sendfinished(szId, nPPID);
-      connect(e, SIGNAL(finished(const char *, unsigned long)),
-        SLOT(slot_sendfinished(const char *, unsigned long)));
-      licqUserSend.append(static_cast<UserSendCommon*>(e));
-    }
-  }
-
+
+  // there might be more than one send window open
+  // make sure we only remember one, or it will get complicated
+  if (fcn == mnuUserView)
+  {
+    slot_userfinished(szId, nPPID);
+    connect(e, SIGNAL(finished(const char *, unsigned long)),
+      SLOT(slot_userfinished(const char *, unsigned long)));
+    licqUserView.append(static_cast<UserViewEvent*>(e));
+  }
+  else
+  {
+    slot_sendfinished(szId, nPPID);
+    connect(e, SIGNAL(finished(const char *, unsigned long)),
+      SLOT(slot_sendfinished(const char *, unsigned long)));
+    licqUserSend.append(static_cast<UserSendCommon*>(e));
+  }
   return e;
 }

branches/protocol_plugin_1_3_0/qt-gui/src/usereventdlg.cpp

@@ -88 +88 @@
   m_bOwner = (gUserManager.FindOwner(m_szId, m_nPPID) != NULL);
   m_bDeleteUser = false;
-  
+
   top_hlay = new QHBoxLayout(this, 6);
   top_lay = new QVBoxLayout(top_hlay);
@@ -200 +200 @@
 {
   QString label;
-  ICQUser *u = gUserManager.FetchUser(tab->Uin(), LOCK_W);
+  ICQUser *u = gUserManager.FetchUser(tab->Id(), tab->PPID(), LOCK_W);
   if (u == NULL) return;
 
@@ -1369 +1369 @@
   QAccel *a = new QAccel( this );
   a->connectItem(a->insertItem(Key_Escape), this, SLOT(cancelSend()));
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      parent == mainwin->userEventTabDlg)
+  {
+    a->connectItem(a->insertItem(ALT + Key_Left),
+           mainwin->userEventTabDlg, SLOT(moveLeft()));
+    a->connectItem(a->insertItem(ALT + Key_Right),
+           mainwin->userEventTabDlg, SLOT(moveRight()));
+  }
+#endif
 
   QGroupBox *box = new QGroupBox(this);
@@ -1673 +1683 @@
   {
   case 0:
-    e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   case 1:
-    e = new UserSendUrlEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendUrlEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   case 2:
-    e = new UserSendChatEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendChatEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   case 3:
-    e = new UserSendFileEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendFileEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   case 4:
-    e = new UserSendContactEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendContactEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   case 5:
-    e = new UserSendSmsEvent(server, sigman, mainwin, m_szId, m_nPPID);
+    e = new UserSendSmsEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
     break;
   }
@@ -2230 +2240 @@
 
   m_sBaseTitle += tr(" - Message");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(0);
@@ -2396 +2411 @@
 
   m_sBaseTitle += tr(" - URL");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(1);
@@ -2524 +2544 @@
 
   m_sBaseTitle += tr(" - File Transfer");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(3);
@@ -2727 +2752 @@
 
   m_sBaseTitle += tr(" - Chat Request");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(2);
@@ -2877 +2907 @@
 
   m_sBaseTitle += tr(" - Contact List");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(4);
@@ -3029 +3064 @@
 
   m_sBaseTitle += tr(" - SMS");
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabIsSelected(this))
+    mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
+#endif
   setCaption(m_sBaseTitle);
   cmbSendType->setCurrentItem(5);