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

Timestamp:

08/07/08 03:51:16 (4 months ago)

Author:

flynd

Message:

Remake of user dialog to have same page handling as settings dialog. Added pages for other user settings and group membership as well.

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (7 diffs)
• licqgui.h (modified) (4 diffs)

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

@@ -86 +86 @@
 
 #include "dialogs/logwindow.h"
-#include "dialogs/userinfodlg.h"
 
 #include "dockicons/dockicon.h"
@@ -96 +95 @@
 
 #include "helpers/support.h"
+
+#include "userdlg/userdlg.h"
 
 #include "userevents/usereventcommon.h"
@@ -745 +746 @@
   if (id.isEmpty() || ppid == 0) return;
 
-  UserInfoDlg* f = NULL;
-
-  for (int i = 0; i < myUserInfoList.size(); ++i)
-  {
-    UserInfoDlg* item = myUserInfoList.at(i);
-    if (item->Id() == id && item->PPID() == ppid)
+  UserDlg* f = NULL;
+
+  for (int i = 0; i < myUserDlgList.size(); ++i)
+  {
+    UserDlg* item = myUserDlgList.at(i);
+    if (item->id() == id && item->ppid() == ppid)
     {
       f = item;
@@ -757 +758 @@
   }
 
-  int tab = UserInfoDlg::GeneralInfo;
+  UserDlg::UserPage tab = UserDlg::GeneralPage;
 
   if (f != NULL)
   {
-    if (toggle && f->isTabShown(tab))
+    if (toggle && f->currentPage() == tab)
     {
       delete f; // will notify us about deletion
@@ -774 +775 @@
   else
   {
-    f = new UserInfoDlg(id, ppid);
-    connect(f, SIGNAL(finished(UserInfoDlg*)),
-        SLOT(userInfoDlgFinished(UserInfoDlg*)));
+    f = new UserDlg(id, ppid);
+    connect(f, SIGNAL(finished(UserDlg*)), SLOT(userDlgFinished(UserDlg*)));
     f->show();
-    myUserInfoList.append(f);
-  }
-
-  f->showTab(tab);
+    myUserDlgList.append(f);
+  }
+
+  f->showPage(tab);
   f->show();
   f->raise();
@@ -1022 +1022 @@
 }
 
-void LicqGui::userInfoDlgFinished(UserInfoDlg* dialog)
-{
-  if (myUserInfoList.removeAll(dialog) > 0)
+void LicqGui::userDlgFinished(UserDlg* dialog)
+{
+  if (myUserDlgList.removeAll(dialog) > 0)
     return;
 
   gLog.Warn("%sUser Info finished signal for user with no window (%s)!\n",
-      L_WARNxSTR, dialog->Id().toLatin1().data());
+      L_WARNxSTR, dialog->id().toLatin1().data());
 }
 
@@ -1359 +1359 @@
       }
       // if their info box is open, kill it
-      for (int i = 0; i < myUserInfoList.size(); ++i)
+      for (int i = 0; i < myUserDlgList.size(); ++i)
       {
-        UserInfoDlg* item = myUserInfoList.at(i);
-        if (item->Id() == sig->Id() && item->PPID() == sig->PPID())
+        UserDlg* item = myUserDlgList.at(i);
+        if (item->id() == sig->Id() && item->ppid() == sig->PPID())
         {
           item->close();
-          myUserInfoList.removeAll(item);
+          myUserDlgList.removeAll(item);
           break;
         }

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

@@ -49 +49 @@
 class UserEventCommon;
 class UserEventTabDlg;
-class UserInfoDlg;
+class UserDlg;
 class UserMenu;
 class UserSendCommon;
@@ -55 +55 @@
 
 typedef QList<UserViewEvent*> UserViewEventList;
-typedef QList<UserInfoDlg*> UserInfoList;
+typedef QList<UserDlg*> UserDlgList;
 typedef QList<UserSendCommon*> UserSendEventList;
 
@@ -234 +234 @@
 #endif
 
-  void userInfoDlgFinished(UserInfoDlg* dialog);
+  void userDlgFinished(UserDlg* dialog);
   void userEventTabDlgDone();
   void userEventFinished(QString id, unsigned long ppid);
@@ -291 +291 @@
   UserEventTabDlg* myUserEventTabDlg;
   UserViewEventList myUserViewList;
-  UserInfoList myUserInfoList;
+  UserDlgList myUserDlgList;
   UserSendEventList myUserSendList;