Changeset 6482 for trunk/qt4-gui/src

Timestamp:

08/10/08 18:22:00 (4 months ago)

Author:

flynd

Message:

Added option to move users when dragging in contact list.

Location:

trunk/qt4-gui/src

Files:

• config/contactlist.cpp (modified) (3 diffs)
• config/contactlist.h (modified) (3 diffs)
• settings/contactlist.cpp (modified) (4 diffs)
• settings/contactlist.h (modified) (1 diff)
• views/userviewbase.cpp (modified) (1 diff)

trunk/qt4-gui/src/config/contactlist.cpp

@@ -64 +64 @@
   iniFile.ReadBool("ScrollBar", myAllowScrollBar, true);
   iniFile.ReadBool("SystemBackground", myUseSystemBackground, false);
+  iniFile.ReadBool("DragMovesUser", myDragMovesUser, false);
 
   unsigned short flash;
@@ -138 +139 @@
   iniFile.WriteBool("ScrollBar", myAllowScrollBar);
   iniFile.WriteBool("SystemBackground", myUseSystemBackground);
+  iniFile.WriteBool("DragMovesUser", myDragMovesUser);
   iniFile.WriteNum("StartUpGroupId", myGroupId);
   iniFile.WriteNum("StartUpGroupType", static_cast<unsigned short>(myGroupType));
@@ -323 +325 @@
 }
 
+void Config::ContactList::setDragMovesUser(bool dragMovesUser)
+{
+  if (dragMovesUser == myDragMovesUser)
+    return;
+
+  myDragMovesUser = dragMovesUser;
+}
+
 void Config::ContactList::setShowDividers(bool showDividers)
 {

trunk/qt4-gui/src/config/contactlist.h

@@ -110 +110 @@
   bool allowScrollBar() const { return myAllowScrollBar; }
   bool useSystemBackground() const { return myUseSystemBackground; }
+  bool dragMovesUser() const { return myDragMovesUser; }
 
   bool popupPicture() const { return myPopupPicture; }
@@ -160 +161 @@
   void setAllowScrollBar(bool allowScrollBar);
   void setUseSystemBackground(bool useSystemBackground);
+  void setDragMovesUser(bool dragMovesUser);
 
   void setPopupPicture(bool popupPicture);
@@ -240 +242 @@
   bool myAllowScrollBar;
   bool myUseSystemBackground;
+
+  // Contact list behaviour
+  bool myDragMovesUser;
 
   // Contact list sorting

trunk/qt4-gui/src/settings/contactlist.cpp

@@ -161 +161 @@
   myBehaviourLayout->addWidget(myMainWinStickyCheck, 0, 1);
 
+  myDragMovesUserCheck = new QCheckBox(tr("Move users when dragging to groups"));
+  myDragMovesUserCheck->setToolTip(tr("If checked a user will be moved when dragged to another group.\n"
+      "If not checked user will only be added to the new group."));
+  myBehaviourLayout->addWidget(myDragMovesUserCheck, 1, 1);
+
   QHBoxLayout* mySortByLayout = new QHBoxLayout();
   mySortByLabel = new QLabel(tr("Additional sorting:"));
@@ -176 +181 @@
   mySortByLabel->setBuddy(mySortByCombo);
   mySortByLayout->addWidget(mySortByCombo);
-  myBehaviourLayout->addLayout(mySortByLayout, 1, 1);
+  myBehaviourLayout->addLayout(mySortByLayout, 2, 1);
 
 
@@ -347 +352 @@
   myScrollBarCheck->setChecked(contactListConfig->allowScrollBar());
   mySysBackCheck->setChecked(contactListConfig->useSystemBackground());
+  myDragMovesUserCheck->setChecked(contactListConfig->dragMovesUser());
 
   int numColumns = contactListConfig->columnCount();
@@ -419 +425 @@
   contactListConfig->setAllowScrollBar(myScrollBarCheck->isChecked());
   contactListConfig->setUseSystemBackground(mySysBackCheck->isChecked());
+  contactListConfig->setDragMovesUser(myDragMovesUserCheck->isChecked());
 
   for (unsigned short i = 0; i < MAX_COLUMNCOUNT; ++i)

trunk/qt4-gui/src/settings/contactlist.h

@@ -106 +106 @@
   QCheckBox* myMainWinStickyCheck;
   QCheckBox* myTransparentCheck;
+  QCheckBox* myDragMovesUserCheck;
 
   // Widgets for contact list column settings

trunk/qt4-gui/src/views/userviewbase.cpp

@@ -284 +284 @@
 
         if (!dropId.isEmpty())
-          gUserManager.SetUserInGroup(dropId.toLatin1(), dropPpid, GROUPS_USER, gid, true);
+        {
+          bool moveUser = Config::ContactList::instance()->dragMovesUser();
+          gUserManager.SetUserInGroup(dropId.toLatin1(), dropPpid, GROUPS_USER, gid, true, moveUser);
+
+          // If we are moving user we now need to remove it from the old group.
+          // However, since the drop event doesn't contain the originating
+          // group, we don't know which group that is so we'll just have to
+          // remove the user from all other groups.
+          if (moveUser)
+          {
+            const ICQUser* u = gUserManager.FetchUser(dropId.toLatin1(), dropPpid, LOCK_R);
+            if (u != NULL)
+            {
+              UserGroupList userGroups = u->GetGroups();
+              gUserManager.DropUser(u);
+
+              UserGroupList::const_iterator i;
+              for (i = userGroups.begin(); i != userGroups.end(); ++i)
+                if (*i != gid)
+                  gUserManager.SetUserInGroup(dropId.toLatin1(), dropPpid, GROUPS_USER, *i, false, false);
+            }
+          }
+        }
       }
       else