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

[dolphin.git] / src / kitemviews / kfileitemmodel.h

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 725ba71bdbe503593db89d9f724ba8a2cbcafa98..13554d8c7fa1999dc62e8fd355c71967096ca9e5 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -198,7 +198,7 @@ public:
 
     /**
      * @return Provides static information for a role that is supported
 
     /**
      * @return Provides static information for a role that is supported

-     *         by KFileItemModel. Some roles can only be determined if 
+     *         by KFileItemModel. Some roles can only be determined if

      *         Baloo is enabled and/or the Baloo indexing is enabled.
      */
     static RoleInfo roleInformation(const QByteArray &role);
      *         Baloo is enabled and/or the Baloo indexing is enabled.
      */
     static RoleInfo roleInformation(const QByteArray &role);


@@ -211,6 +211,13 @@ public:
      */
     static QList<RoleInfo> rolesInformation();
 
      */
     static QList<RoleInfo> rolesInformation();
 

+    /**
+     * @return Provides static information for all available grouping
+     *         behaviors supported by KFileItemModel but not directly
+     *         mapped to roles of KFileItemModel.
+     */
+    static QList<RoleInfo> extraGroupingInformation();
+

     /** set to true to hide application/x-trash files */
     void setShowTrashMime(bool show);
 
     /** set to true to hide application/x-trash files */
     void setShowTrashMime(bool show);
 


@@ -265,7 +272,7 @@ Q_SIGNALS:
      * Is emitted if an error message (e.g. "Unknown location")
      * should be shown.
      */
      * Is emitted if an error message (e.g. "Unknown location")
      * should be shown.
      */

-    void errorMessage(const QString &message);
+    void errorMessage(const QString &message, const int kioErrorCode);

 
     /**
      * Is emitted if a redirection from the current URL \a oldUrl
 
     /**
      * Is emitted if a redirection from the current URL \a oldUrl


@@ -293,9 +300,9 @@ Q_SIGNALS:
 protected:
     void onGroupedSortingChanged(bool current) override;
     void onSortRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;
 protected:
     void onGroupedSortingChanged(bool current) override;
     void onSortRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;

-    void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems = true) override;
+    void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;

     void onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;
     void onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;

-    void onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems = true) override;
+    void onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;

 
 private Q_SLOTS:
     /**
 
 private Q_SLOTS:
     /**


@@ -373,6 +380,15 @@ private:
         QHash<QByteArray, QVariant> values;
         ItemData *parent;
     };
         QHash<QByteArray, QVariant> values;
         ItemData *parent;
     };

+    
+    struct ItemGroupInfo {
+        int comparable;
+        QString text;
+
+        bool operator==(const ItemGroupInfo &other) const;
+        bool operator!=(const ItemGroupInfo &other) const;
+        bool operator<(const ItemGroupInfo &other) const;
+    };

 
     enum RemoveItemsBehavior { KeepItemData, DeleteItemData, DeleteItemDataIfUnfiltered };
 
 
     enum RemoveItemsBehavior { KeepItemData, DeleteItemData, DeleteItemDataIfUnfiltered };
 


@@ -387,6 +403,12 @@ private:
      */
     QList<ItemData *> createItemDataList(const QUrl &parentUrl, const KFileItemList &items) const;
 
      */
     QList<ItemData *> createItemDataList(const QUrl &parentUrl, const KFileItemList &items) const;
 

+    /**
+     * Helper method for prepareItemsForSorting(). 
+     * For a set role, fills 'values' of ItemData non-lazily.
+     */
+    void prepareItemsWithRole(QList<ItemData *> &itemDataList, RoleType roleType);
+

     /**
      * Prepares the items for sorting. Normally, the hash 'values' in ItemData is filled
      * lazily to save time and memory, but for some sort roles, it is expected that the
     /**
      * Prepares the items for sorting. Normally, the hash 'values' in ItemData is filled
      * lazily to save time and memory, but for some sort roles, it is expected that the


@@ -463,18 +485,20 @@ private:
 
     int stringCompare(const QString &a, const QString &b, const QCollator &collator) const;
 
 
     int stringCompare(const QString &a, const QString &b, const QCollator &collator) const;
 

-    QVariant getNameRoleGroup(const ItemData *itemData, bool asString = true) const;
-    QVariant getSizeRoleGroup(const ItemData *itemData, bool asString = true) const;
-    QVariant getTimeRoleGroup(const std::function<QDateTime(const ItemData *)> &fileTimeCb, const ItemData *itemData, bool asString = true) const;
-    QVariant getPermissionRoleGroup(const ItemData *itemData, bool asString = true) const;
-    QVariant getRatingRoleGroup(const ItemData *itemData, bool asString = true) const;
-    QString getGenericStringRoleGroup(const QByteArray &role, const ItemData *itemData) const;
+    ItemGroupInfo nameRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo sizeRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo timeRoleGroup(const std::function<QDateTime(const ItemData *)> &fileTimeCb, const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo permissionRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo ratingRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo typeRoleGroup(const ItemData *itemData) const;
+    ItemGroupInfo genericStringRoleGroup(const QByteArray &role, const ItemData *itemData) const;

 
     QList<QPair<int, QVariant>> nameRoleGroups() const;
     QList<QPair<int, QVariant>> sizeRoleGroups() const;
     QList<QPair<int, QVariant>> timeRoleGroups(const std::function<QDateTime(const ItemData *)> &fileTimeCb) const;
     QList<QPair<int, QVariant>> permissionRoleGroups() const;
     QList<QPair<int, QVariant>> ratingRoleGroups() const;
 
     QList<QPair<int, QVariant>> nameRoleGroups() const;
     QList<QPair<int, QVariant>> sizeRoleGroups() const;
     QList<QPair<int, QVariant>> timeRoleGroups(const std::function<QDateTime(const ItemData *)> &fileTimeCb) const;
     QList<QPair<int, QVariant>> permissionRoleGroups() const;
     QList<QPair<int, QVariant>> ratingRoleGroups() const;

+    QList<QPair<int, QVariant>> typeRoleGroups() const;

     QList<QPair<int, QVariant>> genericStringRoleGroups(const QByteArray &typeForRole) const;
 
     /**
     QList<QPair<int, QVariant>> genericStringRoleGroups(const QByteArray &typeForRole) const;
 
     /**


@@ -566,6 +590,9 @@ private:
 
     RoleType m_sortRole;
     RoleType m_groupRole;
 
     RoleType m_sortRole;
     RoleType m_groupRole;

+    QByteArray m_sortExtraInfo;
+    QByteArray m_groupExtraInfo;
+

     int m_sortingProgressPercent; // Value of directorySortingProgress() signal
     QSet<QByteArray> m_roles;
 
     int m_sortingProgressPercent; // Value of directorySortingProgress() signal
     QSet<QByteArray> m_roles;
 


@@ -612,7 +639,9 @@ inline bool KFileItemModel::isRoleValueNatural(RoleType roleType)
 
 inline bool KFileItemModel::nameLessThan(const ItemData *a, const ItemData *b)
 {
 
 inline bool KFileItemModel::nameLessThan(const ItemData *a, const ItemData *b)
 {

-    return a->item.text() < b->item.text();
+    // Split extension, taking into account it can be empty
+    constexpr QString::SectionFlags flags = QString::SectionSkipEmpty | QString::SectionIncludeLeadingSep;
+    return a->item.text().section('.', 0, 0, flags) < b->item.text().section('.', 0, 0, flags);

 }
 
 inline bool KFileItemModel::isChildItem(int index) const
 }
 
 inline bool KFileItemModel::isChildItem(int index) const


@@ -624,4 +653,14 @@ inline bool KFileItemModel::isChildItem(int index) const
     }
 }
 
     }
 }
 

+inline bool KFileItemModel::ItemGroupInfo::operator==(const ItemGroupInfo &other) const
+{
+    return comparable == other.comparable && text == other.text;
+}
+
+inline bool KFileItemModel::ItemGroupInfo::operator!=(const ItemGroupInfo &other) const
+{
+    return comparable != other.comparable || text != other.text;
+}
+

 #endif
 #endif