KFileItemListWidget: wrong selection when renamed file ends with a dot

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

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index a62b75824c268ec4442d7ef61692af569aac03eb..e1da7192a20fc9b3fe7526c9dcc4c1c56f6c55c2 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -9,7 +9,7 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 

-#include "dolphin_detailsmodesettings.h"
+#include "dolphin_contentdisplaysettings.h"

 
 #include <KFormat>
 #include <KLocalizedString>
 
 #include <KFormat>
 #include <KLocalizedString>


@@ -18,8 +18,8 @@
 #include <QGraphicsView>
 #include <QMimeDatabase>
 
 #include <QGraphicsView>
 #include <QMimeDatabase>
 

-KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
-    KStandardItemListWidgetInformant()
+KFileItemListWidgetInformant::KFileItemListWidgetInformant()
+    : KStandardItemListWidgetInformant()

 {
 }
 
 {
 }
 


@@ -27,26 +27,25 @@ KFileItemListWidgetInformant::~KFileItemListWidgetInformant()
 {
 }
 
 {
 }
 

-QString KFileItemListWidgetInformant::itemText(int index, const KItemListView* view) const
+QString KFileItemListWidgetInformant::itemText(int index, const KItemListView *view) const

 {
 {

-    Q_ASSERT(qobject_cast<KFileItemModel*>(view->model()));
-    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(view->model());
+    Q_ASSERT(qobject_cast<KFileItemModel *>(view->model()));
+    KFileItemModel *fileItemModel = static_cast<KFileItemModel *>(view->model());

 
     const KFileItem item = fileItemModel->fileItem(index);
     return item.text();
 }
 
 
     const KFileItem item = fileItemModel->fileItem(index);
     return item.text();
 }
 

-bool KFileItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
+bool KFileItemListWidgetInformant::itemIsLink(int index, const KItemListView *view) const

 {
 {

-    Q_ASSERT(qobject_cast<KFileItemModel*>(view->model()));
-    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(view->model());
+    Q_ASSERT(qobject_cast<KFileItemModel *>(view->model()));
+    KFileItemModel *fileItemModel = static_cast<KFileItemModel *>(view->model());

 
     const KFileItem item = fileItemModel->fileItem(index);
     return item.isLink();
 }
 
 
     const KFileItem item = fileItemModel->fileItem(index);
     return item.isLink();
 }
 

-QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
-                                               const QHash<QByteArray, QVariant>& values) const
+QString KFileItemListWidgetInformant::roleText(const QByteArray &role, const QHash<QByteArray, QVariant> &values, ForUsageAs forUsageAs) const

 {
     QString text;
     const QVariant roleValue = values.value(role);
 {
     QString text;
     const QVariant roleValue = values.value(role);


@@ -56,11 +55,13 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
     // Implementation note: In case if more roles require a custom handling
     // use a hash + switch for a linear runtime.
 
     // Implementation note: In case if more roles require a custom handling
     // use a hash + switch for a linear runtime.
 

-    auto formatDate = [formatter, local](const QDateTime& time) {
-        if (DetailsModeSettings::useShortRelativeDates()) {
-            return formatter.formatRelativeDateTime(time, QLocale::ShortFormat);
+    auto formatDate = [formatter, local, forUsageAs](const QDateTime &time) {
+        if (ContentDisplaySettings::useShortRelativeDates()) {
+            return formatter.formatRelativeDateTime(time,
+                                                    forUsageAs == KStandardItemListWidgetInformant::ForUsageAs::DisplayedText ? QLocale::ShortFormat
+                                                                                                                              : QLocale::LongFormat);

         } else {
         } else {

-            return local.toString(time, QLocale::ShortFormat);
+            return local.toString(time, forUsageAs == KStandardItemListWidgetInformant::ForUsageAs::DisplayedText ? QLocale::ShortFormat : QLocale::LongFormat);

         }
     };
 
         }
     };
 


@@ -68,7 +69,8 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
         if (values.value("isDir").toBool()) {
             if (!roleValue.isNull() && roleValue != -1) {
                 // The item represents a directory.
         if (values.value("isDir").toBool()) {
             if (!roleValue.isNull() && roleValue != -1) {
                 // The item represents a directory.

-                if (DetailsModeSettings::directorySizeCount()) {
+                if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount
+                    || roleValue == -2 /* size is invalid */) {

                     //  Show the number of sub directories instead of the file size of the directory.
                     const int count = values.value("count").toInt();
                     text = i18ncp("@item:intable", "%1 item", "%1 items", count);
                     //  Show the number of sub directories instead of the file size of the directory.
                     const int count = values.value("count").toInt();
                     text = i18ncp("@item:intable", "%1 item", "%1 items", count);


@@ -83,12 +85,12 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
             text = formatter.formatByteSize(size);
         }
     } else if (role == "modificationtime" || role == "creationtime" || role == "accesstime") {
             text = formatter.formatByteSize(size);
         }
     } else if (role == "modificationtime" || role == "creationtime" || role == "accesstime") {

-            bool ok;
-            const long long time = roleValue.toLongLong(&ok);
-            if (ok && time != -1) {
-                const QDateTime dateTime = QDateTime::fromSecsSinceEpoch(time);
-                text = formatDate(dateTime);
-            }
+        bool ok;
+        const long long time = roleValue.toLongLong(&ok);
+        if (ok && time != -1) {
+            const QDateTime dateTime = QDateTime::fromSecsSinceEpoch(time);
+            text = formatDate(dateTime);
+        }

     } else if (role == "deletiontime" || role == "imageDateTime") {
         const QDateTime dateTime = roleValue.toDateTime();
         if (dateTime.isValid()) {
     } else if (role == "deletiontime" || role == "imageDateTime") {
         const QDateTime dateTime = roleValue.toDateTime();
         if (dateTime.isValid()) {


@@ -99,14 +101,28 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
         if (dimensions.isValid()) {
             text = i18nc("width × height", "%1 × %2", dimensions.width(), dimensions.height());
         }
         if (dimensions.isValid()) {
             text = i18nc("width × height", "%1 × %2", dimensions.width(), dimensions.height());
         }

+    } else if (role == "permissions") {
+        const auto permissions = roleValue.value<QVariantList>();
+
+        switch (ContentDisplaySettings::usePermissionsFormat()) {
+        case ContentDisplaySettings::EnumUsePermissionsFormat::SymbolicFormat:
+            text = permissions.at(0).toString();
+            break;
+        case ContentDisplaySettings::EnumUsePermissionsFormat::NumericFormat:
+            text = QString::number(permissions.at(1).toInt(), 8);
+            break;
+        case ContentDisplaySettings::EnumUsePermissionsFormat::CombinedFormat:
+            text = QLatin1String("%1 (%2)").arg(permissions.at(0).toString()).arg(permissions.at(1).toInt(), 0, 8);
+            break;
+        }

     } else {
     } else {

-        text = KStandardItemListWidgetInformant::roleText(role, values);
+        text = KStandardItemListWidgetInformant::roleText(role, values, forUsageAs);

     }
 
     return text;
 }
 
     }
 
     return text;
 }
 

-QFont KFileItemListWidgetInformant::customizedFontForLinks(const QFont& baseFont) const
+QFont KFileItemListWidgetInformant::customizedFontForLinks(const QFont &baseFont) const

 {
     // The customized font should be italic if the file is a symbolic link.
     QFont font(baseFont);
 {
     // The customized font should be italic if the file is a symbolic link.
     QFont font(baseFont);


@@ -114,8 +130,8 @@ QFont KFileItemListWidgetInformant::customizedFontForLinks(const QFont& baseFont
     return font;
 }
 
     return font;
 }
 

-KFileItemListWidget::KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
-    KStandardItemListWidget(informant, parent)
+KFileItemListWidget::KFileItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : KStandardItemListWidget(informant, parent)

 {
 }
 
 {
 }
 


@@ -123,14 +139,14 @@ KFileItemListWidget::~KFileItemListWidget()
 {
 }
 
 {
 }
 

-KItemListWidgetInformant* KFileItemListWidget::createInformant()
+KItemListWidgetInformant *KFileItemListWidget::createInformant()

 {
     return new KFileItemListWidgetInformant();
 }
 
 {
     return new KFileItemListWidgetInformant();
 }
 

-bool KFileItemListWidget::isRoleRightAligned(const QByteArray& role) const
+bool KFileItemListWidget::isRoleRightAligned(const QByteArray &role) const

 {
 {

-    return role == "size";
+    return role == "size" || role == "permissions";

 }
 
 bool KFileItemListWidget::isHidden() const
 }
 
 bool KFileItemListWidget::isHidden() const


@@ -138,7 +154,7 @@ bool KFileItemListWidget::isHidden() const
     return data().value("isHidden").toBool();
 }
 
     return data().value("isHidden").toBool();
 }
 

-QFont KFileItemListWidget::customizedFont(const QFont& baseFont) const
+QFont KFileItemListWidget::customizedFont(const QFont &baseFont) const

 {
     // The customized font should be italic if the file is a symbolic link.
     QFont font(baseFont);
 {
     // The customized font should be italic if the file is a symbolic link.
     QFont font(baseFont);


@@ -146,40 +162,38 @@ QFont KFileItemListWidget::customizedFont(const QFont& baseFont) const
     return font;
 }
 
     return font;
 }
 

-int KFileItemListWidget::selectionLength(const QString& text) const
+int KFileItemListWidget::selectionLength(const QString &text) const

 {
 {

-    // Select the text without MIME-type extension
-    int selectionLength = text.length();
-

     // If item is a directory, use the whole text length for
     // selection (ignore all points)
     // If item is a directory, use the whole text length for
     // selection (ignore all points)

-    if(data().value("isDir").toBool()) {
-        return selectionLength;
+    if (data().value("isDir").toBool()) {
+        return numberOfUnicodeCharactersIn(text);

     }
 
     }
 

+    int indexOfExtension = text.length();
+

     QMimeDatabase db;
     const QString extension = db.suffixForFileName(text);
     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after
     QMimeDatabase db;
     const QString extension = db.suffixForFileName(text);
     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after

-        // the last point. This does not work for multiple extensions like
+        // the last dot. This does not work for multiple extensions like

         // *.tar.gz but usually this is anyhow a known extension.
         // *.tar.gz but usually this is anyhow a known extension.

-        selectionLength = text.lastIndexOf(QLatin1Char('.'));
+        indexOfExtension = text.lastIndexOf(QLatin1Char('.'));

 
 

-        // If no point could be found, use whole text length for selection.
-        if (selectionLength < 1) {
-            selectionLength = text.length();
+        // if there either is no dot, or the last dot is the first or last char, treat as no extension.
+        if (indexOfExtension < 1 || indexOfExtension == text.length() - 1) {
+            indexOfExtension = text.length();

         }
         }

-

     } else {
     } else {

-        selectionLength -= extension.length() + 1;
+        indexOfExtension -= extension.length() + 1;

     }
 
     }
 

-    return selectionLength;
+    return numberOfUnicodeCharactersIn(text.left(indexOfExtension));

 }
 
 void KFileItemListWidget::hoverSequenceStarted()
 {
 }
 
 void KFileItemListWidget::hoverSequenceStarted()
 {

-    KFileItemListView* view = listView();
+    KFileItemListView *view = listView();

 
     if (!view) {
         return;
 
     if (!view) {
         return;


@@ -190,9 +204,20 @@ void KFileItemListWidget::hoverSequenceStarted()
     view->setHoverSequenceState(itemUrl, 0);
 }
 
     view->setHoverSequenceState(itemUrl, 0);
 }
 

+void KFileItemListWidget::forceUpdate()
+{
+    updateAdditionalInfoTextColor();
+    // icon layout does not include the icons in the item selection rectangle
+    // so its icon does not need updating
+    if (listView()->itemLayout() != KStandardItemListView::ItemLayout::IconsLayout) {
+        invalidateIconCache();
+    }
+    update();
+}
+

 void KFileItemListWidget::hoverSequenceIndexChanged(int sequenceIndex)
 {
 void KFileItemListWidget::hoverSequenceIndexChanged(int sequenceIndex)
 {

-    KFileItemListView* view = listView();
+    KFileItemListView *view = listView();

 
     if (!view) {
         return;
 
     if (!view) {
         return;


@@ -209,7 +234,7 @@ void KFileItemListWidget::hoverSequenceIndexChanged(int sequenceIndex)
 
 void KFileItemListWidget::hoverSequenceEnded()
 {
 
 void KFileItemListWidget::hoverSequenceEnded()
 {

-    KFileItemListView* view = listView();
+    KFileItemListView *view = listView();

 
     if (!view) {
         return;
 
     if (!view) {
         return;


@@ -218,8 +243,9 @@ void KFileItemListWidget::hoverSequenceEnded()
     view->setHoverSequenceState(QUrl(), 0);
 }
 
     view->setHoverSequenceState(QUrl(), 0);
 }
 

-KFileItemListView* KFileItemListWidget::listView()
+KFileItemListView *KFileItemListWidget::listView()

 {
 {

-    return dynamic_cast<KFileItemListView*>(parentItem());
+    return dynamic_cast<KFileItemListView *>(parentItem());

 }
 
 }
 

+#include "moc_kfileitemlistwidget.cpp"