Change "Date" to "Modified" and allow access to new "Accessed" time field

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

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 62a17710c948357e973bfe19c807e52996eacce0..e0548ab2a5072c899fb0295b139079e4bfd8d309 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -18,12 +18,15 @@
  ***************************************************************************/
 
 #include "kfileitemlistwidget.h"
  ***************************************************************************/
 
 #include "kfileitemlistwidget.h"

+#include "kfileitemmodel.h"
+#include "kitemlistview.h"

 
 

-#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>

 #include <KIO/MetaData>
 #include <QDateTime>
 #include <KIO/MetaData>
 #include <QDateTime>

+#include <KFormat>
+#include <QMimeDatabase>
+#include <QLocale>

 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()


@@ -34,6 +37,24 @@ KFileItemListWidgetInformant::~KFileItemListWidgetInformant()
 {
 }
 
 {
 }
 

+QString KFileItemListWidgetInformant::itemText(int index, const KItemListView* view) const
+{
+    Q_ASSERT(qobject_cast<KFileItemModel*>(view->model()));
+    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(view->model());
+
+    const KFileItem item = fileItemModel->fileItem(index);
+    return item.text();
+}
+
+bool KFileItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
+{
+    Q_ASSERT(qobject_cast<KFileItemModel*>(view->model()));
+    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(view->model());
+
+    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) const
 {


@@ -57,11 +78,11 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();
             }
         } else {
             const KIO::filesize_t size = roleValue.value<KIO::filesize_t>();

-            text = KGlobal::locale()->formatByteSize(size);
+            text = KFormat().formatByteSize(size);

         }
         }

-    } else if (role == "date") {
+    } else if (role == "modificationtime" || role == "accesstime") {

         const QDateTime dateTime = roleValue.toDateTime();
         const QDateTime dateTime = roleValue.toDateTime();

-        text = KGlobal::locale()->formatDateTime(dateTime);
+        text = QLocale().toString(dateTime, QLocale::ShortFormat);

     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }
     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }


@@ -69,6 +90,15 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
     return text;
 }
 
     return text;
 }
 

+QFont KFileItemListWidgetInformant::customizedFontForLinks(const QFont& baseFont) const
+{
+    // The customized font should be italic if the file is a symbolic link.
+    QFont font(baseFont);
+    font.setItalic(true);
+    return font;
+}
+
+

 KFileItemListWidget::KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KStandardItemListWidget(informant, parent)
 {
 KFileItemListWidget::KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KStandardItemListWidget(informant, parent)
 {


@@ -93,4 +123,42 @@ bool KFileItemListWidget::isHidden() const
     return data().value("text").toString().startsWith(QLatin1Char('.'));
 }
 
     return data().value("text").toString().startsWith(QLatin1Char('.'));
 }
 

-#include "kfileitemlistwidget.moc"
+QFont KFileItemListWidget::customizedFont(const QFont& baseFont) const
+{
+    // The customized font should be italic if the file is a symbolic link.
+    QFont font(baseFont);
+    font.setItalic(data().value("isLink").toBool());
+    return font;
+}
+
+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(data().value("isDir").toBool()) {
+        return selectionLength;
+    }
+
+    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
+        // *.tar.gz but usually this is anyhow a known extension.
+        selectionLength = text.lastIndexOf(QLatin1Char('.'));
+
+        // If no point could be found, use whole text length for selection.
+        if (selectionLength < 1) {
+            selectionLength = text.length();
+        }
+
+    } else {
+        selectionLength -= extension.length() + 1;
+    }
+
+    return selectionLength;
+}
+