show column mode in viewport context menu (thanks to Thomas Georgiou for the patch)

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 0b9b1e6fa3c768d6e203ff39fb48a76110df7f7b..43718a0d17aa9f0131328bcdc240f3672bf82c14 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -21,6 +21,7 @@
 
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
+#include "dolphinitemcategorizer.h"
 
 #include "dolphin_iconsmodesettings.h"
 
@@ -32,7 +33,7 @@
 #include <QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
-    QListView(parent),
+    KListView(parent),
     m_controller(controller)
 {
     Q_ASSERT(controller != 0);
@@ -56,7 +57,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
-    m_viewOptions = QListView::viewOptions();
+    m_viewOptions = KListView::viewOptions();
+    m_viewOptions.showDecorationSelected = true;
 
     QFont font(settings->fontFamily(), settings->fontSize());
     font.setItalic(settings->italicFont());
@@ -68,8 +70,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     if (settings->arrangement() == QListView::TopToBottom) {
         setFlow(QListView::LeftToRight);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;
-    }
-    else {
+    } else {
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
@@ -86,13 +87,13 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const
 
 void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
 {
-    QListView::contextMenuEvent(event);
+    KListView::contextMenuEvent(event);
     m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event)
 {
-    QListView::mouseReleaseEvent(event);
+    KListView::mouseReleaseEvent(event);
     m_controller->triggerActivation();
 }
 
@@ -112,7 +113,7 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
                                           event->source());
         event->acceptProposedAction();
     }
-    QListView::dropEvent(event);
+    KListView::dropEvent(event);
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview)
@@ -153,8 +154,7 @@ void DolphinIconsView::zoomIn()
         if (showPreview) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
-        }
-        else {
+        } else {
             newIconSize = increasedIconSize(oldIconSize);
             settings->setIconSize(newIconSize);
             if (settings->previewSize() < newIconSize) {
@@ -189,8 +189,7 @@ void DolphinIconsView::zoomOut()
                 newIconSize = previewSize;
                 settings->setIconSize(newIconSize);
             }
-        }
-        else {
+        } else {
             newIconSize = decreasedIconSize(settings->iconSize());
             settings->setIconSize(newIconSize);
         }
@@ -223,12 +222,12 @@ int DolphinIconsView::increasedIconSize(int size) const
     // TODO: get rid of K3Icon sizes
     int incSize = 0;
     switch (size) {
-        case K3Icon::SizeSmall:       incSize = K3Icon::SizeSmallMedium; break;
-        case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break;
-        case K3Icon::SizeMedium:      incSize = K3Icon::SizeLarge; break;
-        case K3Icon::SizeLarge:       incSize = K3Icon::SizeHuge; break;
-        case K3Icon::SizeHuge:        incSize = K3Icon::SizeEnormous; break;
-        default: Q_ASSERT(false); break;
+    case K3Icon::SizeSmall:       incSize = K3Icon::SizeSmallMedium; break;
+    case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break;
+    case K3Icon::SizeMedium:      incSize = K3Icon::SizeLarge; break;
+    case K3Icon::SizeLarge:       incSize = K3Icon::SizeHuge; break;
+    case K3Icon::SizeHuge:        incSize = K3Icon::SizeEnormous; break;
+    default: Q_ASSERT(false); break;
     }
     return incSize;
 }
@@ -238,12 +237,12 @@ int DolphinIconsView::decreasedIconSize(int size) const
     // TODO: get rid of K3Icon sizes
     int decSize = 0;
     switch (size) {
-        case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break;
-        case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break;
-        case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break;
-        case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break;
-        case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break;
-        default: Q_ASSERT(false); break;
+    case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break;
+    case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break;
+    case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break;
+    case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break;
+    case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break;
+    default: Q_ASSERT(false); break;
     }
     return decSize;
 }