Changeset 6259

Timestamp:

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

Author:

eugene

Message:

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

Location:

branches/qt4-gui_group/src

Files:

• contactlist/contactgroup.cpp (modified) (3 diffs)
• contactlist/contactgroup.h (modified) (4 diffs)
• contactlist/contactlist.cpp (modified) (4 diffs)
• contactlist/contactlist.h (modified) (2 diffs)
• core/groupmenu.cpp (modified) (3 diffs)
• core/groupmenu.h (modified) (1 diff)
• core/licqgui.cpp (modified) (1 diff)
• core/mainwin.cpp (modified) (1 diff)
• core/systemmenu.cpp (modified) (1 diff)
• core/usermenu.cpp (modified) (1 diff)
• dialogs/editgrpdlg.cpp (modified) (5 diffs)
• dialogs/editgrpdlg.h (modified) (2 diffs)

branches/qt4-gui_group/src/contactlist/contactgroup.cpp

@@ -36 +36 @@
 {
   if (myGroupId != 0)
-  {
-    mySortKey.sprintf("%10i", myGroupId);
-  }
+    mySortKey = myGroupId;
   else
-  {
     // Put "Other Users" last when sorting
-    mySortKey = QString("9999999999");
-  }
-
+    mySortKey = 65535;
+
+  update();
+
+  for (int i = 0; i < 3; ++i)
+    myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
+}
+
+ContactGroup::ContactGroup(const LicqGroup* group)
+  : ContactItem(ContactListModel::GroupItem),
+    myGroupId(group->id()),
+    myName(group->name().c_str()),
+    mySortKey(group->sortIndex()),
+    myEvents(0),
+    myVisibleContacts(0)
+{
   for (int i = 0; i < 3; ++i)
     myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
@@ -61 +71 @@
 void ContactGroup::update()
 {
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  myName = QString::fromLocal8Bit((*g)[myGroupId-1]);
-  gUserManager.UnlockGroupList();
-
-  emit dataChanged(this);
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  myName = QString::fromLocal8Bit(g->name().c_str());
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
+
+  emit dataChanged(this);
+}
+
+void ContactGroup::updateSortKey()
+{
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
 }
 
@@ -214 +246 @@
 
   // Don't save new name here, daemon will signal us when name has changed
-  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit());
+  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit().data());
 
   return true;

branches/qt4-gui_group/src/contactlist/contactgroup.h

@@ -29 +29 @@
 #include "contactlist.h"
 
+class LicqGroup;
+
 namespace LicqQtGui
 {
@@ -50 +52 @@
    * @param name Group name
    */
-  ContactGroup(unsigned short id, QString name);
+  ContactGroup(unsigned short id, QString name = QString());
+
+  /**
+   * Constructor, creates an empty group
+   *
+   * @param group Group object from daemon
+   */
+  ContactGroup(const LicqGroup* group);
 
   /**
@@ -157 +166 @@
   virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole);
 
+  /**
+   * Update sort key for this group from daemon
+   */
+  void updateSortKey();
+
 signals:
   /**
@@ -171 +185 @@
   unsigned short myGroupId;
   QString myName;
-  QString mySortKey;
+  unsigned short mySortKey;
   int myEvents;
   QList<ContactUser*> myUsers;

branches/qt4-gui_group/src/contactlist/contactlist.cpp

@@ -103 +103 @@
     {
       unsigned short gid = sig->Argument();
-
-      GroupList* g = gUserManager.LockGroupList(LOCK_R);
-      ContactGroup* newGroup = createGroup(gid, QString::fromLocal8Bit((*g)[gid-1]));
-      gUserManager.UnlockGroupList();
+      ContactGroup* newGroup = createGroup(gid);
 
       beginInsertRows(QModelIndex(), myUserGroups.size(), myUserGroups.size());
@@ -144 +141 @@
       break;
     }
+
+    case LIST_GROUP_REORDERED:
+    {
+      // Get new sort keys for all groups
+      for (int i = 0; i < myUserGroups.size(); ++i)
+        myUserGroups.at(i)->updateSortKey();
+
+      // Send one changed signal for all groups
+      emit dataChanged(createIndex(0, 0, myUserGroups.at(0)),
+          createIndex(myUserGroups.size() + NUM_GROUPS_SYSTEM_ALL - 1, myColumnCount - 1,
+          mySystemGroups[NUM_GROUPS_SYSTEM_ALL-1]));
+
+      break;
+    }
   }
 }
@@ -250 +261 @@
 
   // Add all groups
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  beginInsertRows(QModelIndex(), 0, g->size());
+  beginInsertRows(QModelIndex(), 0, gUserManager.NumGroups() + 1);
 
   ContactGroup* newGroup = createGroup(0, tr("Other Users"));
   myUserGroups.append(newGroup);
 
-  for (unsigned short i = 0; i < g->size(); ++i)
-  {
-    newGroup = createGroup(i+1, QString::fromLocal8Bit((*g)[i]));
-    myUserGroups.append(newGroup);
-  }
+  FOR_EACH_GROUP_START(LOCK_R)
+  {
+    ContactGroup* group = new ContactGroup(pGroup);
+    connect(group, SIGNAL(dataChanged(ContactGroup*)),
+        SLOT(groupDataChanged(ContactGroup*)));
+    connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
+        SLOT(barDataChanged(ContactBar*, int)));
+    myUserGroups.append(group);
+  }
+  FOR_EACH_GROUP_END
 
   endInsertRows();
-  gUserManager.UnlockGroupList();
 
   // Add all users
@@ -307 +321 @@
     unsigned short gid = group->groupId();
     bool shouldBeMember = (gid != 0 && licqUser->GetInGroup(GROUPS_USER, gid)) ||
-        (gid == 0 && licqUser->GetGroups(GROUPS_USER) == 0 && !licqUser->IgnoreList());
+        (gid == 0 && licqUser->GetGroups().empty() && !licqUser->IgnoreList());
     updateUserGroup(user, group, i, shouldBeMember);
   }

branches/qt4-gui_group/src/contactlist/contactlist.h

@@ -74 +74 @@
     ItemTypeRole = Qt::UserRole,        // Type of item (one of enum ItemType)
     NameRole,                           // Item name (alias for UserItems)
-    SortPrefixRole,                     // Primary sort index
-    SortRole,                           // Secondary sort index
+    SortPrefixRole,                     // Primary sort index (UserItems only)
+    SortRole,                           // Sort index (secondary index for UserItems, only index for GroupItems)
     UnreadEventsRole,                   // Number of unread events
     EventSubCommandRole,                // Type of event (UserItems only)
@@ -389 +389 @@
    *
    * @param id Id for the new group
-   * @param name Name for the new group
+   * @param name Name for the new group (only for non standard groups)
    * @return The created group
    */
-  ContactGroup* createGroup(unsigned short id, QString name);
+  ContactGroup* createGroup(unsigned short id, QString name = QString());
 
   /**

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;

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

@@ -102 +102 @@
   // Current group
   unsigned int myGroupId;
+  unsigned short mySortIndex;
+  QString myGroupName;
 
   // Actions not in any sub menu

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

@@ -754 +754 @@
       if (u == NULL)
         return true;
-      GroupList* g = gUserManager.LockGroupList(LOCK_R);
+      LicqGroup* g = gUserManager.FetchGroup(group, LOCK_R);
+      if (g == NULL)
+      {
+        gUserManager.DropUser(u);
+        return true;
+      }
       QString warning(tr("Are you sure you want to remove\n%1 (%2)\nfrom the '%3' group?")
           .arg(QString::fromUtf8(u->GetAlias()))
-          .arg(u->IdString()).arg(QString::fromLocal8Bit((*g)[group - 1])));
-      gUserManager.UnlockGroupList();
+          .arg(u->IdString()).arg(QString::fromLocal8Bit(g->name().c_str())));
+      gUserManager.DropGroup(g);
       gUserManager.DropUser(u);
       if (QueryYesNo(parent, warning))
       {
         gUserManager.RemoveUserFromGroup(id.toLatin1(), ppid, group);
-
-        // The daemon does not send an update when group membership changes
-        // so tell the contactList it needs to update
-        myContactList->updateUser(id, ppid);
         return true;
       }

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

@@ -773 +773 @@
   myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(GROUP_ALL_USERS));
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
-  {
-    myUserGroupsBox->addItem(QString::fromLocal8Bit((*g)[i]));
-  }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    myUserGroupsBox->addItem(QString::fromLocal8Bit(pGroup->name().c_str()));
+  }
+  FOR_EACH_GROUP_END
 
   for (unsigned short i = 1; i < NUM_GROUPS_SYSTEM_ALL; i++)

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

@@ -302 +302 @@
       delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
 
     myGroupMenu->insertAction(myGroupSeparator, a);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 }
 

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

@@ -204 +204 @@
     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());
     a->setCheckable(true);
 
     a = myServerGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu

branches/qt4-gui_group/src/dialogs/editgrpdlg.cpp

@@ -127 +127 @@
 }
 
+unsigned short EditGrpDlg::currentGroupId() const
+{
+  if (lstGroups->currentItem() == NULL)
+    return 0;
+
+  unsigned short groupId = lstGroups->currentItem()->data(Qt::UserRole).toUInt();
+  return groupId;
+}
+
+void EditGrpDlg::setCurrentGroupId(unsigned short groupId)
+{
+  for (int i = 0; i < lstGroups->count(); ++i)
+    if (lstGroups->item(i)->data(Qt::UserRole).toUInt() == groupId)
+    {
+      lstGroups->setCurrentRow(i);
+      break;
+    }
+}
+
 void EditGrpDlg::RefreshList()
 {
+  unsigned short groupId = currentGroupId();
   lstGroups->clear();
 
   const QString allUsers = LicqStrings::getSystemGroupName(GROUP_ALL_USERS);
-
-  lstGroups->addItem(allUsers);
+  QListWidgetItem* item = new QListWidgetItem(allUsers);
+  item->setData(Qt::UserRole, 0);
+  lstGroups->addItem(item);
 
   if (gUserManager.DefaultGroup() == GROUP_ALL_USERS)
@@ -141 +162 @@
     nfoNewUser->setText(allUsers);
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    lstGroups->addItem(QString::fromLocal8Bit((*g)[i]));
-
-    if (gUserManager.DefaultGroup() == i + 1)
-      nfoDefault->setText(QString::fromLocal8Bit((*g)[i]));
-
-    if (gUserManager.NewUserGroup() == i + 1)
-      nfoNewUser->setText(QString::fromLocal8Bit((*g)[i]));
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
+    item = new QListWidgetItem(name);
+    item->setData(Qt::UserRole, pGroup->id());
+    lstGroups->addItem(item);
+
+    if (gUserManager.DefaultGroup() == pGroup->id())
+      nfoDefault->setText(name);
+
+    if (gUserManager.NewUserGroup() == pGroup->id())
+      nfoNewUser->setText(name);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
+
+  setCurrentGroupId(groupId);
 }
 
@@ -162 +187 @@
     case LIST_GROUP_REMOVED:
     case LIST_GROUP_CHANGED:
+    case LIST_GROUP_REORDERED:
 
     case LIST_INVALIDATE:
@@ -173 +199 @@
 void EditGrpDlg::slot_add()
 {
-  gUserManager.AddGroup(strdup(tr("noname").toLocal8Bit()));
-  RefreshList();
-  lstGroups->setCurrentRow(lstGroups->count()-1);
-  slot_edit();
-}
-
-
-void EditGrpDlg::slot_remove()
-{
-  int n = lstGroups->currentRow();
-  // don't allow the default group #0 "All Users" to be deleted
-  // don't try to delete if there is no current Item (currentItem() == -1)
-  if (n < 1) return;
-
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  QString warning(tr("Are you sure you want to remove\n"
-                     "the group '%1'?").arg(QString::fromLocal8Bit((*g)[n-1])));
-  gUserManager.UnlockGroupList();
-
-  if (QueryYesNo(this, warning))
-  {
-    gUserManager.RemoveGroup(n);
-    RefreshList();
-    lstGroups->setCurrentRow(n - 1);
-  }
-}
-
-
-void EditGrpDlg::slot_up()
-{
-  int n = lstGroups->currentRow() - 1;
-  if (n <= 0) return;
-  gUserManager.SwapGroups(n + 1, n);
-  RefreshList();
-  lstGroups->setCurrentRow(n);
-}
-
-
-void EditGrpDlg::slot_down()
-{
-  int n = lstGroups->currentRow() - 1;
-  if (n < 0 /* || n == max */) return;
-  gUserManager.SwapGroups(n + 1, n + 2);
-  RefreshList();
-  if (n + 2 >= int(lstGroups->count()))
-    lstGroups->setCurrentRow(lstGroups->count() - 1);
-  else
-    lstGroups->setCurrentRow(n + 2);
-}
-
-
-void EditGrpDlg::slot_default()
-{
-  int n = lstGroups->currentRow();
-  if (n == -1) return;
-  gUserManager.SetDefaultGroup(n);
-  RefreshList();
-  lstGroups->setCurrentRow(n);
-}
-
-void EditGrpDlg::slot_newuser()
-{
-  int n = lstGroups->currentRow();
-  if (n == -1 ) return;
-  gUserManager.SetNewUserGroup(n);
-  RefreshList();
-  lstGroups->setCurrentRow(n);
-}
-
-void EditGrpDlg::slot_edit()
-{
-  int n = lstGroups->currentRow() - 1;
-  if (n < 0) return;
+  // Don't add group until user has had a chance to set a name for it
+  myEditGroupId = 0;
+  lstGroups->setCurrentRow(-1);
+
   btnSave->setEnabled(true);
   btnDone->setEnabled(false);
   edtName->setEnabled(true);
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  edtName->setText(QString::fromLocal8Bit((*g)[n]));
+
+  edtName->setText(tr("noname"));
   edtName->setFocus();
-  gUserManager.UnlockGroupList();
-  m_nEditGrp = n + 1;
   btnEdit->setText(tr("Cancel"));
   disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
   connect(btnEdit, SIGNAL(clicked()), SLOT(slot_editcancel()));
   lstGroups->setEnabled(false);
-}
-
+  btnSave->setDefault(true);
+}
+
+void EditGrpDlg::slot_remove()
+{
+  unsigned short groupId = currentGroupId();
+  if (groupId == 0)
+    return;
+
+  QString warning(tr("Are you sure you want to remove\n"
+                     "the group '%1'?").arg(lstGroups->currentItem()->text()));
+
+  if (QueryYesNo(this, warning))
+  {
+    gUserManager.RemoveGroup(groupId);
+    RefreshList();
+  }
+}
+
+void EditGrpDlg::moveGroup(int delta)
+{
+  unsigned short groupId = currentGroupId();
+  if (groupId == 0)
+    return;
+
+  LicqGroup* group = gUserManager.FetchGroup(groupId, LOCK_R);
+  if (group == NULL)
+    return;
+  unsigned short oldSortIndex = group->sortIndex();
+  gUserManager.DropGroup(group);
+
+  if (delta + oldSortIndex < 0)
+    return;
+
+  gUserManager.ModifyGroupSorting(groupId, oldSortIndex + delta);
+  RefreshList();
+}
+
+void EditGrpDlg::slot_up()
+{
+  moveGroup(-1);
+}
+
+void EditGrpDlg::slot_down()
+{
+  moveGroup(1);
+}
+
+void EditGrpDlg::slot_default()
+{
+  gUserManager.SetDefaultGroup(currentGroupId());
+  RefreshList();
+}
+
+void EditGrpDlg::slot_newuser()
+{
+  gUserManager.SetNewUserGroup(currentGroupId());
+  RefreshList();
+}
+
+void EditGrpDlg::slot_edit()
+{
+  myEditGroupId = currentGroupId();
+  if (myEditGroupId == 0)
+    return;
+
+  btnSave->setEnabled(true);
+  btnDone->setEnabled(false);
+  edtName->setEnabled(true);
+
+  edtName->setText(lstGroups->currentItem()->text());
+  edtName->setFocus();
+  btnEdit->setText(tr("Cancel"));
+  disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
+  connect(btnEdit, SIGNAL(clicked()), SLOT(slot_editcancel()));
+  lstGroups->setEnabled(false);
+  btnSave->setDefault(true);
+}
 
 void EditGrpDlg::slot_editok()
 {
-  int n = lstGroups->currentRow();
-  gUserManager.RenameGroup(m_nEditGrp, edtName->text().toLocal8Bit());
-  RefreshList();
-
+  if (myEditGroupId == 0)
+    myEditGroupId = gUserManager.AddGroup(edtName->text().toLocal8Bit().data());
+  else
+    gUserManager.RenameGroup(myEditGroupId, edtName->text().toLocal8Bit().data());
+  RefreshList();
+  setCurrentGroupId(myEditGroupId);
+
+  btnSave->setDefault(false);
   lstGroups->setEnabled(true);
   btnEdit->setText(tr("Edit Name"));
@@ -275 +310 @@
   disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_editok()));
   connect(btnEdit, SIGNAL(clicked()), SLOT(slot_edit()));
-  lstGroups->setCurrentRow(n);
-}
-
+}
 
 void EditGrpDlg::slot_editcancel()
 {
+  btnSave->setDefault(false);
   lstGroups->setEnabled(true);
   btnEdit->setText(tr("Edit Name"));