Changeset 6322 for trunk/qt4-gui/src/core

Timestamp:

06/17/08 03:18:28 (5 months ago)

Author:

flynd

Message:

Store group id with each item in the group combo box so we know which id to use when changing. This caused combo box to set wrong group and message field to show wrong group.

Location:

trunk/qt4-gui/src/core

Files:

• mainwin.cpp (modified) (3 diffs)
• mainwin.h (modified) (1 diff)

trunk/qt4-gui/src/core/mainwin.cpp

@@ -738 +738 @@
 }
 
-void MainWindow::setCurrentGroup(int groupId)
-{
+void MainWindow::setCurrentGroup(int index)
+{
+  unsigned short groupId = myUserGroupsBox->itemData(index).toUInt();
   GroupType groupType = GROUPS_USER;
-  unsigned short nNumGroups = gUserManager.NumGroups();
-
-  if (groupId > nNumGroups)
-  {
-    groupId -= nNumGroups;
+  if (groupId >= ContactListModel::SystemGroupOffset)
+  {
     groupType = GROUPS_SYSTEM;
+    groupId -= ContactListModel::SystemGroupOffset;
   }
 
   Config::ContactList::instance()->setGroup(groupType, groupId);
-  updateCurrentGroup();
 }
 
@@ -758 +756 @@
   int group = Config::ContactList::instance()->groupId();
 
-  unsigned short nNumGroups = gUserManager.NumGroups();
-
   if (groupType == GROUPS_SYSTEM)
-    group += nNumGroups;
+    group += ContactListModel::SystemGroupOffset;
 
   // Update the combo box
-  myUserGroupsBox->setCurrentIndex(group);
+  int index = myUserGroupsBox->findData(group);
+  if (index == -1)
+    return;
+  myUserGroupsBox->setCurrentIndex(index);
 
   // Update the msg label if necessary
@@ -783 +782 @@
   // update the combo box
   myUserGroupsBox->clear();
-  myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(GROUP_ALL_USERS));
+  myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(GROUP_ALL_USERS),
+      ContactListModel::SystemGroupOffset);
 
   FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    myUserGroupsBox->addItem(QString::fromLocal8Bit(pGroup->name().c_str()));
+    myUserGroupsBox->addItem(QString::fromLocal8Bit(pGroup->name().c_str()), pGroup->id());
   }
   FOR_EACH_GROUP_END
 
   for (unsigned short i = 1; i < NUM_GROUPS_SYSTEM_ALL; i++)
-    myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(i));
+    myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(i),
+        ContactListModel::SystemGroupOffset + i);
 
   updateCurrentGroup();

trunk/qt4-gui/src/core/mainwin.h

@@ -136 +136 @@
   void updateEvents();
   void updateStatus(CICQSignal* = NULL);
-  void setCurrentGroup(int);
+
+  /**
+   * Groups combo box was changed to show a new group
+   *
+   * @param index Combo box index of selected item
+   */
+  void setCurrentGroup(int index);
+
   //TODO
   //void callUserFunction(QString id, unsigned long ppid);