Changeset 6097 for trunk/qt4-gui/src/core

Timestamp:

03/15/08 06:23:52 (9 months ago)

Author:

flynd

Message:

Let user menu and event dialog user same enum for event type so we don't have to convert between them.

Location:

trunk/qt4-gui/src/core

Files:

• gui-defines.h (modified) (1 diff)
• licqgui.cpp (modified) (17 diffs)
• licqgui.h (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• usermenu.cpp (modified) (1 diff)
• usermenu.h (modified) (1 diff)

trunk/qt4-gui/src/core/gui-defines.h

@@ -47 +47 @@
 {
 
-enum UserFunctions {
-  mnuUserView,
-  mnuUserSendMsg,
-  mnuUserSendUrl,
-  mnuUserSendChat,
-  mnuUserSendFile,
-  mnuUserSendContact,
-  mnuUserSendSms,
-  mnuUserGeneral,
+// Event types, used by event dialog but placed here since callers to
+//   LicqGui::showEventDialog also needs them
+enum EventType
+{
+  MessageEvent,
+  UrlEvent,
+  ChatEvent,
+  FileEvent,
+  ContactEvent,
+  SmsEvent,
 };
+
+// Constant used to select opening page when calling LicqGui::showInfoDialog
+// Leave it for now as the fcn parameter may be needed when user info dialog has been remade
+static const int mnuUserGeneral = 0;
 
 } // namespace LicqQtGui

trunk/qt4-gui/src/core/licqgui.cpp

@@ -840 +840 @@
 }
 
-UserEventCommon* LicqGui::showEventDialog(int fcn, QString id, unsigned long ppid, int convoId)
+UserViewEvent* LicqGui::showViewEventDialog(QString id, unsigned long ppid)
 {
   if (id.isEmpty() || ppid == 0)
     return NULL;
 
-  switch (fcn)
-  {
-    case mnuUserView:
+  for (int i = 0; i < myUserViewList.size(); ++i)
+  {
+    UserViewEvent* e = myUserViewList.at(i);
+    if (id.compare(e->id(), Qt::CaseInsensitive) == 0 && e->ppid() == ppid)
+    {
+      e->show();
+      if (Config::Chat::instance()->autoFocus() &&
+          (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
       {
-        for (int i = 0; i < myUserViewList.size(); ++i)
+        e->raise();
+        e->activateWindow();
+      }
+      return e;
+    }
+  }
+
+  UserViewEvent* e = new UserViewEvent(id, ppid);
+  connect(e, SIGNAL(viewUrl(QWidget*, QString)), SLOT(viewUrl(QWidget*, QString)));
+
+  e->show();
+  userEventFinished(id, ppid);
+  connect(e, SIGNAL(finished(QString, unsigned long)), SLOT(userEventFinished(QString, unsigned long)));
+  myUserViewList.append(e);
+
+  return e;
+}
+
+UserEventCommon* LicqGui::showEventDialog(int fcn, QString id, unsigned long ppid, int convoId)
+{
+  if (id.isEmpty() || ppid == 0)
+    return NULL;
+
+  if (Config::Chat::instance()->msgChatView())
+  {
+    for (int i = 0; i < myUserSendList.size(); ++i)
+    {
+      UserSendCommon* e = myUserSendList.at(i);
+
+      // Protocols (MSN only atm) that support convo ids are differentiated from
+      // the icq protocol because the convo id will be the server socket.. which does
+      // not meet the requirement that convo ids must be unique for each conversation.
+      if ( ((ppid == MSN_PPID && e->ppid() == MSN_PPID) && (e->isUserInConvo(id) ||
+              (e->convoId() == (unsigned long)(convoId) && e->convoId() != (unsigned long)(-1)))) ||
+          (e->isUserInConvo(id) && e->ppid() == ppid))
+      {
+        //if (!e->FindUserInConvo(id))
+        //  e->convoJoin(id);
+
+        if (myUserEventTabDlg && myUserEventTabDlg->tabExists(e))
         {
-          UserViewEvent* e = myUserViewList.at(i);
-          if (id.compare(e->id(), Qt::CaseInsensitive) == 0 && e->ppid() == ppid)
+          myUserEventTabDlg->show();
+          if (Config::Chat::instance()->autoFocus())
           {
-            e->show();
-            if (Config::Chat::instance()->autoFocus() &&
-                (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
-            {
-              e->raise();
-              e->activateWindow();
-            }
-            return e;
+            myUserEventTabDlg->selectTab(e);
+            myUserEventTabDlg->raise();
+            myUserEventTabDlg->activateWindow();
           }
         }
-      }
-      break;
-    case mnuUserSendMsg:
-    case mnuUserSendUrl:
-    case mnuUserSendChat:
-    case mnuUserSendFile:
-    case mnuUserSendContact:
-    case mnuUserSendSms:
-      {
-        if (!Config::Chat::instance()->msgChatView())
-          break;
-
-        for (int i = 0; i < myUserSendList.size(); ++i)
+        else
         {
-          UserSendCommon* e = myUserSendList.at(i);
-
-          // Protocols (MSN only atm) that support convo ids are differentiated from
-          // the icq protocol because the convo id will be the server socket.. which does
-          // not meet the requirement that convo ids must be unique for each conversation.
-          if ( ((ppid == MSN_PPID && e->ppid() == MSN_PPID) && (e->isUserInConvo(id) ||
-                  (e->convoId() == (unsigned long)(convoId) && e->convoId() != (unsigned long)(-1)))) ||
-              (e->isUserInConvo(id) && e->ppid() == ppid))
+          e->show();
+          if (Config::Chat::instance()->autoFocus() &&
+              (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
           {
-            //if (!e->FindUserInConvo(id))
-            //  e->convoJoin(id);
-
-            if (myUserEventTabDlg && myUserEventTabDlg->tabExists(e))
-            {
-              myUserEventTabDlg->show();
-              if (Config::Chat::instance()->autoFocus())
-              {
-                myUserEventTabDlg->selectTab(e);
-                myUserEventTabDlg->raise();
-                myUserEventTabDlg->activateWindow();
-              }
-            }
-            else
-            {
-              e->show();
-              if (Config::Chat::instance()->autoFocus() &&
-                  (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
-              {
-                e->raise();
-                e->activateWindow();
-              }
-            }
-            // Make the existing event dialog change to the new event type
-            switch (fcn)
-            {
-              case mnuUserSendMsg: e->changeEventType(ET_MESSAGE); break;
-              case mnuUserSendUrl: e->changeEventType(ET_URL); break;
-              case mnuUserSendChat: e->changeEventType(ET_CHAT); break;
-              case mnuUserSendFile: e->changeEventType(ET_FILE); break;
-              case mnuUserSendContact: e->changeEventType(ET_CONTACT); break;
-              case mnuUserSendSms: e->changeEventType(ET_SMS); break;
-            }
-            return e;
+            e->raise();
+            e->activateWindow();
           }
         }
+        // Make the existing event dialog change to the new event type
+        e->changeEventType(fcn);
+        return e;
       }
-    default:
-      break;
+    }
   }
 
@@ -954 +946 @@
   switch (fcn)
   {
-    case mnuUserView:
-      {
-        e = new UserViewEvent(id, ppid);
-        break;
-      }
-    case mnuUserSendMsg:
-      {
-        e = new UserSendMsgEvent(id, ppid, parent);
-        break;
-      }
-    case mnuUserSendUrl:
-      {
-        e = new UserSendUrlEvent(id, ppid, parent);
-        break;
-      }
-    case mnuUserSendChat:
-      {
-        e = new UserSendChatEvent(id, ppid, parent);
-        break;
-      }
-    case mnuUserSendFile:
-      {
-        e = new UserSendFileEvent(id, ppid, parent);
-        break;
-      }
-    case mnuUserSendContact:
-      {
-        e = new UserSendContactEvent(id, ppid, parent);
-        break;
-      }
-    case mnuUserSendSms:
-      {
-        e = new UserSendSmsEvent(id, ppid, parent);
-        break;
-      }
+    case MessageEvent:
+      e = new UserSendMsgEvent(id, ppid, parent);
+      break;
+
+    case UrlEvent:
+      e = new UserSendUrlEvent(id, ppid, parent);
+      break;
+
+    case ChatEvent:
+      e = new UserSendChatEvent(id, ppid, parent);
+      break;
+
+    case FileEvent:
+      e = new UserSendFileEvent(id, ppid, parent);
+      break;
+
+    case ContactEvent:
+      e = new UserSendContactEvent(id, ppid, parent);
+      break;
+
+    case SmsEvent:
+      e = new UserSendSmsEvent(id, ppid, parent);
+      break;
+
     default:
       gLog.Warn("%sunknown callFunction() fcn: %d\n", L_WARNxSTR, fcn);
@@ -996 +977 @@
   connect(e, SIGNAL(viewUrl(QWidget*, QString)), SLOT(viewUrl(QWidget*, QString)));
 
-  if (Config::Chat::instance()->tabbedChatting() && fcn != mnuUserView)
+  if (Config::Chat::instance()->tabbedChatting())
   {
     myUserEventTabDlg->addTab(e);
@@ -1018 +999 @@
   // there might be more than one send window open
   // make sure we only remember one, or it will get complicated
-  if (fcn == mnuUserView)
-  {
-    userEventFinished(id, ppid);
-    connect(e, SIGNAL(finished(QString, unsigned long)), SLOT(userEventFinished(QString, unsigned long)));
-    myUserViewList.append(static_cast<UserViewEvent*>(e));
-  }
-  else
-  {
-    sendEventFinished(id, ppid);
-    connect(e, SIGNAL(finished(QString, unsigned long)), SLOT(sendEventFinished(QString, unsigned long)));
-    myUserSendList.append(static_cast<UserSendCommon*>(e));
-  }
+  sendEventFinished(id, ppid);
+  connect(e, SIGNAL(finished(QString, unsigned long)), SLOT(sendEventFinished(QString, unsigned long)));
+  myUserSendList.append(static_cast<UserSendCommon*>(e));
+
   return e;
 }
@@ -1043 +1016 @@
 void LicqGui::showMessageDialog(QString id, unsigned long ppid)
 {
-  showEventDialog(mnuUserSendMsg, id, ppid);
+  showEventDialog(MessageEvent, id, ppid);
 }
 
 void LicqGui::sendMsg(QString id, unsigned long ppid, const QString& message)
 {
-  UserSendCommon* event = dynamic_cast<UserSendCommon*>(showEventDialog(mnuUserSendMsg, id, ppid));
+  UserSendCommon* event = dynamic_cast<UserSendCommon*>(showEventDialog(MessageEvent, id, ppid));
   if (event == 0)
     return;
@@ -1057 +1030 @@
 void LicqGui::sendFileTransfer(QString id, unsigned long ppid, const QString& filename, const QString& description)
 {
-  UserSendFileEvent* event = dynamic_cast<UserSendFileEvent*>(showEventDialog(mnuUserSendFile, id, ppid));
+  UserSendFileEvent* event = dynamic_cast<UserSendFileEvent*>(showEventDialog(FileEvent, id, ppid));
   if (event == 0)
     return;
@@ -1066 +1039 @@
 void LicqGui::sendChatRequest(QString id, unsigned long ppid)
 {
-  UserSendCommon* event = dynamic_cast<UserSendCommon*>(showEventDialog(mnuUserSendChat, id, ppid));
+  UserSendCommon* event = dynamic_cast<UserSendCommon*>(showEventDialog(ChatEvent, id, ppid));
   if (event == 0)
     return;
@@ -1147 +1120 @@
   // set default function to read or send depending on whether or not
   // there are new messages
-  int fcn = (u->NewMessages() == 0 ? mnuUserSendMsg : mnuUserView);
-  if (fcn == mnuUserView && Config::Chat::instance()->msgChatView())
+  bool send = (u->NewMessages() == 0);
+  if (!send && Config::Chat::instance()->msgChatView())
   {
     // if one of the new events is a msg in chatview mode,
@@ -1157 +1130 @@
       {
         convoId = u->EventPeek(i)->ConvoId();
-        fcn = mnuUserSendMsg;
+        send = true;
         break;
       }
@@ -1163 +1136 @@
   gUserManager.DropUser(u);
 
+  if (!send)
+  {
+    // Messages pending and not open in chatview mode so open view event dialog
+    showViewEventDialog(id, ppid);
+    return;
+  }
+
   // See if the clipboard contains a url
-  if (fcn == mnuUserSendMsg && Config::Chat::instance()->sendFromClipboard())
+  if (Config::Chat::instance()->sendFromClipboard())
   {
     QClipboard* clip = QApplication::clipboard();
@@ -1179 +1159 @@
     if (c.left(5) == "http:" || c.left(4) == "ftp:" || c.left(6) == "https:")
     {
-      UserEventCommon* ec = showEventDialog(mnuUserSendUrl, id, ppid);
+      UserEventCommon* ec = showEventDialog(UrlEvent, id, ppid);
       if (!ec || ec->objectName() != "UserSendUrlEvent")
         return;
@@ -1191 +1171 @@
     else if (c.left(5) == "file:" || c.left(1) == "/")
     {
-      UserEventCommon* ec = showEventDialog(mnuUserSendFile, id, ppid);
+      UserEventCommon* ec = showEventDialog(FileEvent, id, ppid);
       if (!ec || ec->objectName() != "UserSendFileEvent")
         return;
@@ -1208 +1188 @@
   }
 
-  showEventDialog(fcn, id, ppid, convoId);
+  showEventDialog(MessageEvent, id, ppid, convoId);
 }
 
@@ -1223 +1203 @@
 
     if (nNumMsg > 0)
-      showEventDialog(mnuUserView, id, (*_ppit)->PPID());
+      showViewEventDialog(id, (*_ppit)->PPID());
   }
   FOR_EACH_PROTO_PLUGIN_END
@@ -1305 +1285 @@
         {
           gUserManager.DropUser(u);
-          showEventDialog(mnuUserSendMsg, id, ppid, u->EventPeek(i)->ConvoId());
+          showEventDialog(MessageEvent, id, ppid, u->EventPeek(i)->ConvoId());
           return;
         }
@@ -1312 +1292 @@
     }
 
-    showEventDialog(mnuUserView, id, ppid);
+    showViewEventDialog(id, ppid);
   }
 }
@@ -1542 +1522 @@
 
             if (bCallSendMsg)
-              showEventDialog(mnuUserSendMsg, id, ppid, sig->CID());
+              showEventDialog(MessageEvent, id, ppid, sig->CID());
             if (bCallUserView)
-              showEventDialog(mnuUserView, id, ppid, sig->CID());
+              showViewEventDialog(id, ppid);
           }
         }

trunk/qt4-gui/src/core/licqgui.h

@@ -130 +130 @@
 
   /**
+   * Show contact view event dialog (used when chat mode is disabled)
+   *
+   * @param id Contact id
+   * @param ppid Contact protocol id
+   */
+  UserViewEvent* showViewEventDialog(QString id, unsigned long ppid);
+
+  /**
    * Show contact event dialog
    *

trunk/qt4-gui/src/core/mainwin.cpp

@@ -161 +161 @@
   a->setData(data);
 
-  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_V, mnuUserView)
-  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_S, mnuUserSendMsg)
-  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_U, mnuUserSendUrl)
-  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_C, mnuUserSendChat)
-  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_F, mnuUserSendFile)
+  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_V, -1)
+  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_S, MessageEvent)
+  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_U, UrlEvent)
+  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_C, ChatEvent)
+  ADD_USERFUNCACTION(Qt::CTRL + Qt::Key_F, FileEvent)
 #undef ADD_USERFUNCACTION
   addActions(userFuncGroup->actions());
@@ -520 +520 @@
   myUserView->MainWindowSelectedItemUser(id, ppid);
 
-  LicqGui::instance()->showEventDialog(index, id, ppid);
+  if (index == -1)
+    LicqGui::instance()->showViewEventDialog(id, ppid);
+  else
+    LicqGui::instance()->showEventDialog(index, id, ppid);
 }
 

trunk/qt4-gui/src/core/usermenu.cpp

@@ -345 +345 @@
 void UserMenu::viewEvent()
 {
-  LicqGui::instance()->showEventDialog(mnuUserView, myId, myPpid);
+  LicqGui::instance()->showViewEventDialog(myId, myPpid);
 }
 

trunk/qt4-gui/src/core/usermenu.h

@@ -107 +107 @@
   enum SendModes
   {
-    SendMessage = mnuUserSendMsg,
-    SendUrl = mnuUserSendUrl,
-    SendChat = mnuUserSendChat,
-    SendFile = mnuUserSendFile,
-    SendContact = mnuUserSendContact,
-    SendSms = mnuUserSendSms,
+    SendMessage = MessageEvent,
+    SendUrl = UrlEvent,
+    SendChat = ChatEvent,
+    SendFile = FileEvent,
+    SendContact = ContactEvent,
+    SendSms = SmsEvent,
     SendAuthorize,
     SendReqAuthorize,