Changeset 6000

Timestamp:

01/08/08 06:03:05 (8 months ago)

Author:

flynd

Message:

Use new history dialog instead of old user info tab.

Location:

branches/qt-gui_qt4/src

Files:

• core/systemmenu.cpp (modified) (4 diffs)
• core/systemmenu.h (modified) (1 diff)
• core/usermenu.cpp (modified) (2 diffs)
• userevents/usereventcommon.cpp (modified) (2 diffs)

branches/qt-gui_qt4/src/core/systemmenu.cpp

@@ -39 +39 @@
 #include "dialogs/awaymsgdlg.h"
 #include "dialogs/editgrpdlg.h"
+#include "dialogs/historydlg.h"
 #include "dialogs/logwindow.h"
 #include "dialogs/ownermanagerdlg.h"
@@ -553 +554 @@
   // System sub menu
   myOwnerAdmMenu = new QMenu(protoName);
-  connect(myOwnerAdmMenu, SIGNAL(triggered(QAction*)), SLOT(ownerAdmFunction(QAction*)));
-  myOwnerAdmInfoAction = myOwnerAdmMenu->addAction(tr("&Info..."));
-  myOwnerAdmInfoAction->setData(mnuUserGeneral);
-  myOwnerAdmHistoryAction = myOwnerAdmMenu->addAction(tr("View &History..."));
-  myOwnerAdmHistoryAction->setData(mnuUserHistory);
+  myOwnerAdmInfoAction = myOwnerAdmMenu->addAction(tr("&Info..."), this, SLOT(viewInfo()));
+  myOwnerAdmHistoryAction = myOwnerAdmMenu->addAction(tr("View &History..."), this, SLOT(viewHistory()));
 
   // Status sub menu
@@ -674 +672 @@
 }
 
-void OwnerData::ownerAdmFunction(QAction* action)
-{
-  int id = action->data().toInt();
-
+void OwnerData::viewInfo()
+{
   ICQOwner* o = gUserManager.FetchOwner(myPpid, LOCK_R);
   if (o == NULL)
@@ -684 +680 @@
   QString userid = o->IdString();
   gUserManager.DropOwner(myPpid);
-  LicqGui::instance()->showInfoDialog(id, userid, myPpid);
+  LicqGui::instance()->showInfoDialog(mnuUserGeneral, userid, myPpid);
+}
+
+void OwnerData::viewHistory()
+{
+  ICQOwner* o = gUserManager.FetchOwner(myPpid, LOCK_R);
+  if (o == NULL)
+    return;
+
+  QString userid = o->IdString();
+  gUserManager.DropOwner(myPpid);
+  new HistoryDlg(userid, myPpid);
 }
 

branches/qt-gui_qt4/src/core/systemmenu.h

@@ -243 +243 @@
 private slots:
   void aboutToShowStatusMenu();
-  void ownerAdmFunction(QAction* action);
+  void viewInfo();
+  void viewHistory();
   void setStatus(QAction* action);
   void toggleInvisibleStatus();

branches/qt-gui_qt4/src/core/usermenu.cpp

@@ -38 +38 @@
 #include "dialogs/customautorespdlg.h"
 #include "dialogs/gpgkeyselect.h"
+#include "dialogs/historydlg.h"
 #include "dialogs/keyrequestdlg.h"
 #include "dialogs/reqauthdlg.h"
@@ -382 +383 @@
 void UserMenu::viewHistory()
 {
-  LicqGui::instance()->showInfoDialog(mnuUserHistory, myId, myPpid);
+  new HistoryDlg(myId, myPpid);
 }
 

branches/qt-gui_qt4/src/userevents/usereventcommon.cpp

@@ -44 +44 @@
 #include "core/usermenu.h"
 
+#include "dialogs/historydlg.h"
 #include "dialogs/keyrequestdlg.h"
 
@@ -373 +374 @@
 void UserEventCommon::slotShowHistory()
 {
-  LicqGui::instance()->showInfoDialog(mnuUserHistory, myUsers.front().c_str(), myPpid, true);
+  new HistoryDlg(myUsers.front().c_str(), myPpid);
 }