Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / kitemviews / kitemmodelbase.cpp

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index 566caefaaf35ffbd232506f501c4a3e945cc4435..17716f57f5d52155a5bafaa5e3fe592953a8023d 100644 (file)
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -10,17 +10,21 @@
 
 KItemModelBase::KItemModelBase(QObject *parent)
     : QObject(parent)
 
 KItemModelBase::KItemModelBase(QObject *parent)
     : QObject(parent)

-    , m_groupedSorting(false)
+    , m_groupedSorting(true)

     , m_sortRole()
     , m_sortOrder(Qt::AscendingOrder)
     , m_sortRole()
     , m_sortOrder(Qt::AscendingOrder)

+    , m_groupRole()
+    , m_groupOrder(Qt::AscendingOrder)

 {
 }
 
 {
 }
 

-KItemModelBase::KItemModelBase(const QByteArray &sortRole, QObject *parent)
+KItemModelBase::KItemModelBase(const QByteArray &sortRole, const QByteArray &groupRole, QObject *parent)

     : QObject(parent)
     : QObject(parent)

-    , m_groupedSorting(false)
+    , m_groupedSorting(true)

     , m_sortRole(sortRole)
     , m_sortOrder(Qt::AscendingOrder)
     , m_sortRole(sortRole)
     , m_sortOrder(Qt::AscendingOrder)

+    , m_groupRole(groupRole)
+    , m_groupOrder(Qt::AscendingOrder)

 {
 }
 
 {
 }
 


@@ -74,9 +78,34 @@ void KItemModelBase::setSortOrder(Qt::SortOrder order)
     }
 }
 
     }
 }
 

+void KItemModelBase::setGroupRole(const QByteArray &role, bool regroupItems)
+{
+    if (role != m_groupRole) {
+        const QByteArray previous = m_groupRole;
+        m_groupRole = role;
+        onGroupRoleChanged(role, previous, regroupItems);
+        Q_EMIT groupRoleChanged(role, previous);
+    }
+}
+
+QByteArray KItemModelBase::groupRole() const
+{
+    return m_groupRole;
+}
+
+void KItemModelBase::setGroupOrder(Qt::SortOrder order)
+{
+    if (order != m_groupOrder) {
+        const Qt::SortOrder previous = m_groupOrder;
+        m_groupOrder = order;
+        onGroupOrderChanged(order, previous);
+        Q_EMIT groupOrderChanged(order, previous);
+    }
+}
+

 QString KItemModelBase::roleDescription(const QByteArray &role) const
 {
 QString KItemModelBase::roleDescription(const QByteArray &role) const
 {

-    return role;
+    return QString::fromLatin1(role);

 }
 
 QList<QPair<int, QVariant>> KItemModelBase::groups() const
 }
 
 QList<QPair<int, QVariant>> KItemModelBase::groups() const


@@ -128,6 +157,12 @@ bool KItemModelBase::supportsDropping(int index) const
     return false;
 }
 
     return false;
 }
 

+bool KItemModelBase::canEnterOnHover(int index) const
+{
+    Q_UNUSED(index)
+    return false;
+}
+

 QString KItemModelBase::blacklistItemDropEventMimeType() const
 {
     return QStringLiteral("application/x-dolphin-blacklist-drop");
 QString KItemModelBase::blacklistItemDropEventMimeType() const
 {
     return QStringLiteral("application/x-dolphin-blacklist-drop");


@@ -151,6 +186,19 @@ void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder pre
     Q_UNUSED(previous)
 }
 
     Q_UNUSED(previous)
 }
 

+void KItemModelBase::onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    Q_UNUSED(resortItems)
+}
+
+void KItemModelBase::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+}
+

 QUrl KItemModelBase::url(int index) const
 {
     return data(index).value("url").toUrl();
 QUrl KItemModelBase::url(int index) const
 {
     return data(index).value("url").toUrl();