Changeset 6287 for trunk/qt4-gui/src/dialogs/adduserdlg.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/adduserdlg.cpp (modified) (4 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();