Changeset 6287

Timestamp:

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

Author:

eugene

Message:

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

Location:

trunk/qt4-gui/src/dialogs

Files:

• adduserdlg.cpp (modified) (4 diffs)
• adduserdlg.h (modified) (2 diffs)
• searchuserdlg.cpp (modified) (5 diffs)
• searchuserdlg.h (modified) (3 diffs)

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

@@ -31 +31 @@
 #include "helpers/support.h"
 
+#include "widgets/groupcombobox.h"
 #include "widgets/protocombobox.h"
 
@@ -55 +56 @@
   layDialog->addWidget(myProtocol, line++, 1);
 
-  QLabel* lblUin = new QLabel(tr("New &User ID:"));
-  myUin = new QLineEdit();
+  QLabel* lblGroup = new QLabel(tr("&Group:"));
+  myGroup = new GroupComboBox();
+  myGroup->setCurrentGroupId(gUserManager.NewUserGroup());
+  lblGroup->setBuddy(myGroup);
+
+  layDialog->addWidget(lblGroup, line, 0);
+  layDialog->addWidget(myGroup, line++, 1);
+
+  QLabel* lblId = new QLabel(tr("New &User ID:"));
+  myId = new QLineEdit();
   if (!id.isEmpty())
-    myUin->setText(id);
-  connect(myUin, SIGNAL(returnPressed()), SLOT(ok()));
-  lblUin->setBuddy(myUin);
+    myId->setText(id);
+  connect(myId, SIGNAL(returnPressed()), SLOT(ok()));
+  lblId->setBuddy(myId);
 
-  layDialog->addWidget(lblUin, line, 0);
-  layDialog->addWidget(myUin, line++, 1);
+  layDialog->addWidget(lblId, line, 0);
+  layDialog->addWidget(myId, line++, 1);
 
   myNotify = new QCheckBox(tr("&Notify User"));
@@ -77 +86 @@
   layDialog->addWidget(buttons, line++, 0, 1, 2);
 
-  myUin->setFocus();
+  myId->setFocus();
   show();
 }
@@ -83 +92 @@
 void AddUserDlg::ok()
 {
-  QString uin = myUin->text();
+  QByteArray id = myId->text().trimmed().toLatin1();
+  unsigned long ppid = myProtocol->currentPpid();
+  unsigned short group = myGroup->currentGroupId();
+  bool notify = myNotify->isChecked();
 
-  if (!uin.isEmpty())
-    gLicqDaemon->AddUserToList(uin.toLatin1(), myProtocol->currentPpid(),
-        myNotify->isChecked());
+  if (!id.isEmpty())
+  {
+    ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_W);
+
+    if (u == NULL)
+    {
+      unsigned short currentNewGroup = gUserManager.NewUserGroup();
+      gUserManager.SetNewUserGroup(group);
+      gLicqDaemon->AddUserToList(id, ppid, notify);
+      gUserManager.SetNewUserGroup(currentNewGroup);
+    }
+    else
+    {
+      if (u->NotInList())
+      {
+        u->SetPermanent();
+        gUserManager.DropUser(u);
+        gUserManager.AddUserToGroup(id.toLatin1());
+        if (notify && ppid == LICQ_PPID)
+          gLicqDaemon->icqAlertUser(id.toULong());
+      }
+      else
+        gUserManager.DropUser(u);
+    }
+  }
 
   close();

trunk/qt4-gui/src/dialogs/adduserdlg.h

@@ -29 +29 @@
 namespace LicqQtGui
 {
+class GroupComboBox;
 class ProtoComboBox;
 
@@ -40 +41 @@
 private:
    QCheckBox* myNotify;
-   QLineEdit* myUin;
+   QLineEdit* myId;
+   GroupComboBox* myGroup;
    ProtoComboBox* myProtocol;
 

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);
   }
 

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

@@ -40 +40 @@
 namespace LicqQtGui
 {
-class TabWidget;
-
 //TODO for protocol plugin support
 
@@ -55 +53 @@
 
 private:
+  unsigned long ppid;
   unsigned long searchTag;
 
@@ -80 +79 @@
 
   QCheckBox* chkOnlineOnly;
-  QCheckBox* chkAlertUser;
 
   QPushButton* btnSearch;