Changeset 6148

Timestamp:

04/13/08 23:18:08 (8 months ago)

Author:

flynd

Message:

Allow editing contact alias and group names directly in the contact list.

Location:

trunk/qt4-gui/src

Files:

• contactlist/contactgroup.cpp (modified) (2 diffs)
• contactlist/contactgroup.h (modified) (1 diff)
• contactlist/contactitem.cpp (modified) (1 diff)
• contactlist/contactitem.h (modified) (1 diff)
• contactlist/contactlist.cpp (modified) (2 diffs)
• contactlist/contactlist.h (modified) (1 diff)
• contactlist/contactuser.cpp (modified) (1 diff)
• contactlist/contactuser.h (modified) (1 diff)
• contactlist/contactuserdata.cpp (modified) (4 diffs)
• contactlist/contactuserdata.h (modified) (2 diffs)
• views/contactdelegate.cpp (modified) (2 diffs)
• views/contactdelegate.h (modified) (1 diff)
• views/userviewbase.cpp (modified) (1 diff)

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

@@ -161 +161 @@
       break;
 
+    case Qt::EditRole:
+      return myName;
+
     case ContactListModel::ItemTypeRole:
       return ContactListModel::GroupItem;
@@ -185 +188 @@
   return QVariant();
 }
+
+bool ContactGroup::setData(const QVariant& value, int role)
+{
+  if (role != Qt::EditRole || !value.isValid())
+    return false;
+
+  // Don't allow system groups or "Other users" to be renamed this way
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return false;
+
+  if (value.toString() == myName)
+    return true;
+
+  myName = value.toString();
+  gUserManager.RenameGroup(myGroupId, myName.toLocal8Bit());
+
+  // Daemon doesn't signal when groups change so trigger update from here
+  emit dataChanged(this);
+
+  return true;
+}

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

@@ -143 +143 @@
   QVariant data(int column, int role) const;
 
+  /**
+   * Set data for this group
+   *
+   * @param value New value to set
+   * @param role Role to set
+   * @return True if any data was changed
+   */
+  virtual bool setData(const QVariant& value, int role = Qt::EditRole);
+
 signals:
   /**

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

@@ -27 +27 @@
 {
 }
+
+bool ContactItem::setData(const QVariant& /* value */, int /* role */)
+{
+  return false;
+}

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

@@ -66 +66 @@
   virtual QVariant data(int column, int role) const = 0;
 
+  /**
+   * Set data for this item
+   *
+   * @param value New value to set
+   * @param role Role to set
+   * @return True if any data was changed
+   */
+  virtual bool setData(const QVariant& value, int role = Qt::EditRole);
+
 private:
   ContactListModel::ItemType myItemType;

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

@@ -402 +402 @@
     return Qt::ItemIsEnabled;
 
-  return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+  Qt::ItemFlags f = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+
+  ItemType itemType = static_cast<ContactItem*>(index.internalPointer())->itemType();
+
+  // Only editing of alias for contacts
+  if (itemType == UserItem && Config::ContactList::instance()->columnFormat(index.column()) == "%a")
+    f |= Qt::ItemIsEditable;
+
+  // Group names are editable in first column unless it's a system group
+  if (itemType == GroupItem && index.column() == 0 && index.row() != 0 && index.row() < myUserGroups.size())
+    f |= Qt::ItemIsEditable;
+
+  return f;
 }
 
@@ -449 +461 @@
   return QModelIndex();
 }
+
+bool ContactListModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+  return static_cast<ContactItem*>(index.internalPointer())->setData(value, role);
+}

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

@@ -291 +291 @@
 
   /**
+   * Set item data
+   *
+   * @param index Index for the item to update
+   * @param value Value to set
+   * @param role Role to update
+   */
+  virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+
+  /**
    * Get index for a specific user
    *

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

@@ -52 +52 @@
   return myUserData->data(column, role);
 }
+
+bool ContactUser::setData(const QVariant& value, int role)
+{
+  return myUserData->setData(value, role);
+}

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

@@ -99 +99 @@
   QVariant data(int column, int role) const;
 
+  /**
+   * Set data for this user
+   *
+   * @param value New value to set
+   * @param role Role to set
+   * @return True if any data was changed
+   */
+  virtual bool setData(const QVariant& value, int role = Qt::EditRole);
+
 private:
   ContactUserData* myUserData;

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

@@ -400 +400 @@
   bool hasChanged = false;
 
+  myAlias = QString::fromUtf8(licqUser->GetAlias());
+
   for (unsigned short i = 0; i < Config::ContactList::instance()->columnCount(); i++)
   {
@@ -410 +412 @@
     free(temp);
 
-    temp = licqUser->usprintf("%a");
-    QString alias = QString::fromUtf8(temp);
-    free(temp);
-
-    newStr.replace("@_USER_ALIAS_@", alias);
+    newStr.replace("@_USER_ALIAS_@", myAlias);
 
     if (newStr != myText[i])
@@ -471 +469 @@
 }
 
+bool ContactUserData::setData(const QVariant& value, int role)
+{
+  if (role != Qt::EditRole || !value.isValid())
+    return false;
+
+  if (value.toString() == myAlias)
+    return true;
+
+  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+  if (u == NULL)
+    return false;
+
+  myAlias = value.toString();
+  u->SetAlias(myAlias.toUtf8());
+  u->SetKeepAliasOnUpdate(true);
+
+  // Daemon dosen't send signal when alias is changed so trigger update from here
+  updateText(u);
+  updateSorting();
+
+  gUserManager.DropUser(u);
+
+  emit dataChanged(this);
+  return true;
+}
+
 void ContactUserData::refresh()
 {
@@ -558 +582 @@
         return myText[column];
       break;
+
+    case Qt::EditRole:
+      return myAlias;
 
     case Qt::ToolTipRole:

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

@@ -148 +148 @@
    */
   QVariant data(int column, int role) const;
+
+  /**
+   * Set data for this user
+   * Currently only alias may be change this way
+   *
+   * @param value New value to set
+   * @param role Must be Qt::EditRole
+   * @return True if alias was changed
+   */
+  virtual bool setData(const QVariant& value, int role = Qt::EditRole);
 
 signals:
@@ -241 +251 @@
   bool myUrgent;
   QString myText[4];
+  QString myAlias;
   QList<ContactUser*> myUserInstances;
 

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

@@ -23 +23 @@
 #include "contactdelegate.h"
 
+#include <QApplication>
+#include <QKeyEvent>
+#include <QLineEdit>
 #include <QPainter>
 
@@ -495 +498 @@
 #undef EXTICON
 }
+
+QWidget* ContactDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& /* option */, const QModelIndex& /* index */) const
+{
+  QLineEdit* editor = new QLineEdit(parent);
+
+  // Don't use the view's skinned palette
+  editor->setPalette(QApplication::palette());
+
+  return editor;
+}
+
+void ContactDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
+{
+  QString value = index.model()->data(index, Qt::EditRole).toString();
+
+  QLineEdit* lineedit = dynamic_cast<QLineEdit*>(editor);
+  lineedit->setText(value);
+}
+
+void ContactDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QLineEdit* lineedit = dynamic_cast<QLineEdit*>(editor);
+  model->setData(index, lineedit->text(), Qt::EditRole);
+}
+
+void ContactDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+  QRect r = option.rect;
+
+  // Leave space for icon in first column
+  if (index.column() == 0)
+    r.setLeft(r.left() + 18);
+
+  editor->setGeometry(r);
+}
+
+bool ContactDelegate::eventFilter(QObject* object, QEvent* event)
+{
+  QWidget* editor = qobject_cast<QWidget*>(object);
+  if (editor == NULL)
+    return false;
+
+  if (event->type() == QEvent::KeyPress)
+  {
+    switch (static_cast<QKeyEvent*>(event)->key())
+    {
+      case Qt::Key_Enter:
+      case Qt::Key_Return:
+        emit commitData(editor);
+        emit closeEditor(editor, QAbstractItemDelegate::SubmitModelCache);
+        return true;
+      case Qt::Key_Escape:
+        // don't commit data
+        emit closeEditor(editor, QAbstractItemDelegate::RevertModelCache);
+        return true;
+    }
+  }
+  else if (event->type() == QEvent::FocusOut)
+  {
+    emit commitData(editor);
+    emit closeEditor(editor, NoHint);
+  }
+
+  return QAbstractItemDelegate::eventFilter(object, event);
+}
+

trunk/qt4-gui/src/views/contactdelegate.h

@@ -72 +72 @@
   virtual void paint(QPainter* p, const QStyleOptionViewItem& option, const QModelIndex& index) const;
 
+  /**
+   * Create widget that can be used for editing data in an item
+   *
+   * @param parent Parent widget for the editor
+   * @param option Style options
+   * @param index Item to edit
+   * @return An editor widget
+   */
+  virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+
+  /**
+   * Set data for an editor widget
+   *
+   * @param editor Existing editor widget to update with data
+   * @param index Item to get data from
+   */
+  virtual void setEditorData(QWidget* editor, const QModelIndex& index) const;
+
+  /**
+   * Get data from editor widget and update model
+   *
+   * @param editor Existing editor widget with data
+   * @param model Model to write data to
+   * @param index Index of item to update
+   */
+  virtual void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
+
+  /**
+   * Update geometry of an editor widget
+   *
+   * @param editor Existing editor widget to update geometry for
+   * @param option Style options, including new rect for editor
+   * @param index Index of item being edited
+   */
+  virtual void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+
+  /**
+   * Catch events for other objects. Used to get events for editor widget
+   *
+   * @param object Object the event happened for
+   * @param event Event for that object
+   * @return True if event should not be forwarded to object
+   */
+  virtual bool eventFilter(QObject* object, QEvent* event);
+
 private:
   /**

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

@@ -50 +50 @@
 {
   setItemDelegate(new ContactDelegate(this, this));
+  setEditTriggers(EditKeyPressed);
 
   // Look'n'Feel