Changeset 6259 for branches/qt4-gui_group/src/core/groupmenu.cpp

Timestamp:

06/11/08 08:25:24 (6 months ago)

Author:

eugene

Message:

Applied the latest version of flynd's qt4-gui patch.

Files:

• branches/qt4-gui_group/src/core/groupmenu.cpp (modified) (3 diffs)

branches/qt4-gui_group/src/core/groupmenu.cpp

@@ -89 +89 @@
     delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
-  {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
 
     myGroupsMenu->insertAction(myGroupSeparator, a);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu
@@ -118 +117 @@
   myMoveDownAction->setEnabled(!special && myGroupId < gUserManager.NumGroups());
   myRemoveGroupAction->setEnabled(!special);
+
+  mySortIndex = 0;
+  if (!special)
+  {
+    LicqGroup* group = gUserManager.FetchGroup(myGroupId, LOCK_R);
+    if (group != NULL)
+    {
+      mySortIndex = group->sortIndex();
+      myGroupName = QString::fromLocal8Bit(group->name().c_str());
+      gUserManager.DropGroup(group);
+    }
+  }
 }
 
@@ -133 +144 @@
 void GroupMenu::moveGroupUp()
 {
-  // Model uses group+1 so substract one before sending to daemon
-  gUserManager.SwapGroups(myGroupId, myGroupId - 1);
+  if (mySortIndex == 0)
+    return;
+
+  gUserManager.ModifyGroupSorting(myGroupId, mySortIndex - 1);
 }
 
 void GroupMenu::moveGroupDown()
 {
-  // Model uses group+1 so substract one before sending to daemon
-  gUserManager.SwapGroups(myGroupId, myGroupId + 1);
+  gUserManager.ModifyGroupSorting(myGroupId, mySortIndex + 1);
 }
 
 void GroupMenu::removeGroup()
 {
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
   QString warning(tr("Are you sure you want to remove the group '%1'?")
-      .arg(QString::fromLocal8Bit((*g)[myGroupId-1])));
-  gUserManager.UnlockGroupList();
+      .arg(myGroupName));
   if (!QueryYesNo(this, warning))
     return;