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 688a4da083d0c5b15022f2c246d4e9cac5a6a542..e0548ab2a5072c899fb0295b139079e4bfd8d309 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,12 +21,12 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 

-#include <kmimetype.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()


@@ -46,6 +46,15 @@ QString KFileItemListWidgetInformant::itemText(int index, const KItemListView* v
     return item.text();
 }
 
     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
 {


@@ -69,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);
     }


@@ -81,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)
 {


@@ -124,7 +142,8 @@ int KFileItemListWidget::selectionLength(const QString& text) const
         return selectionLength;
     }
 
         return selectionLength;
     }
 

-    const QString extension = KMimeType::extractKnownExtension(text);
+    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
     if (extension.isEmpty()) {
         // For an unknown extension just exclude the extension after
         // the last point. This does not work for multiple extensions like


@@ -143,4 +162,3 @@ int KFileItemListWidget::selectionLength(const QString& text) const
     return selectionLength;
 }
 
     return selectionLength;
 }
 

-#include "kfileitemlistwidget.moc"