Changeset 6287 for trunk/qt4-gui/src/dialogs/searchuserdlg.cpp

Timestamp:

06/14/08 04:06:02 (6 months ago)

Author:

eugene

Message:

Merged r6260:6264 from SVNROOT/branches/qt4-gui_group

Files:

• trunk/qt4-gui/src/dialogs/searchuserdlg.cpp (modified) (5 diffs)

trunk/qt4-gui/src/dialogs/searchuserdlg.cpp

@@ -46 +46 @@
 #include "core/signalmanager.h"
 
+#include "dialogs/adduserdlg.h"
+
 #include "helpers/support.h"
 
@@ -52 +54 @@
 
 SearchUserDlg::SearchUserDlg()
-  : searchTag(0)
+  : ppid(LICQ_PPID),
+    searchTag(0)
 {
   Support::setWidgetProps(this, "SearchUserDialog");
@@ -178 +181 @@
   grp_lay->addWidget(foundView, 0, 0, 1, 4);
 
-  chkAlertUser = new QCheckBox(tr("A&lert User"));
-  chkAlertUser->setChecked(true);
-  grp_lay->addWidget(chkAlertUser, 1, 0);
-
   btnInfo = new QPushButton(tr("View &Info"));
   btnInfo->setEnabled(false);
   connect(btnInfo, SIGNAL(clicked()), SLOT(viewInfo()));
-  grp_lay->addWidget(btnInfo, 1, 2);
+  grp_lay->addWidget(btnInfo, 1, 1);
 
   btnAdd = new QPushButton(tr("&Add User"));
   btnAdd->setEnabled(false);
   connect(btnAdd, SIGNAL(clicked()), SLOT(addUser()));
-  grp_lay->addWidget(btnAdd, 1, 3);
+  grp_lay->addWidget(btnAdd, 1, 2);
 
   grp_lay->setRowStretch(0, 1);
-  grp_lay->setColumnStretch(1, 1);
+  grp_lay->setColumnStretch(0, 1);
   lay->addWidget(grpResult, 1);
 
@@ -445 +444 @@
   foreach (QTreeWidgetItem* current, foundView->selectedItems())
   {
-    QString szId = current->data(0, Qt::UserRole).toString();
-
-    if (!gUserManager.IsOnList(szId.toLatin1(), LICQ_PPID))
-      gLicqDaemon->AddUserToList(
-          szId.toLatin1(), LICQ_PPID, false, true);
-
-    LicqGui::instance()->showInfoDialog(mnuUserGeneral, szId, LICQ_PPID, false, true);
+    QByteArray id = current->data(0, Qt::UserRole).toString().toLatin1();
+
+    if (!gUserManager.IsOnList(id, ppid))
+      gLicqDaemon->AddUserToList(id, ppid, false, true);
+
+    LicqGui::instance()->showInfoDialog(mnuUserGeneral, id, ppid, false, true);
   }
 }
@@ -459 +457 @@
   foreach (QTreeWidgetItem* current, foundView->selectedItems())
   {
-    unsigned long uin = current->data(0, Qt::UserRole).toString().toULong();
-
-    if (gLicqDaemon->AddUserToList(uin) &&
-        chkAlertUser->isChecked())
-      gLicqDaemon->icqAlertUser(uin);
+    QString id = current->data(0, Qt::UserRole).toString();
+
+    new AddUserDlg(id, ppid, this);
   }