Changeset 6000 for branches/qt-gui_qt4/src/core/systemmenu.cpp

Timestamp:

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

Author:

flynd

Message:

Use new history dialog instead of old user info tab.

Files:

• branches/qt-gui_qt4/src/core/systemmenu.cpp (modified) (4 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);
 }