X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a46551d63efd09b34fe33766533f6f5333737f22..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index a9328172d..c2ba82d0d 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -24,9 +24,9 @@
 
 #include "dolphin_iconsmodesettings.h"
 
-#include <assert.h>
 #include <kdirmodel.h>
 #include <kfileitem.h>
+#include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>
 
@@ -38,19 +38,26 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
 
+    viewport()->setAttribute(Qt::WA_Hover);
+
     connect(this, SIGNAL(clicked(const QModelIndex&)),
             controller, SLOT(triggerItem(const QModelIndex&)));
+    connect(this, SIGNAL(activated(const QModelIndex&)),
+            controller, SLOT(triggerItem(const QModelIndex&)));
     connect(controller, SIGNAL(showPreviewChanged(bool)),
             this, SLOT(updateGridSize(bool)));
+    connect(controller, SIGNAL(zoomIn()),
+            this, SLOT(zoomIn()));
+    connect(controller, SIGNAL(zoomOut()),
+            this, SLOT(zoomOut()));
 
     // apply the icons mode settings to the widget
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
 
-    setSpacing(settings->gridSpacing());
-
     m_viewOptions = QListView::viewOptions();
     m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
+
     updateGridSize(controller->showPreview());
 
     if (settings->arrangement() == QListView::TopToBottom) {
@@ -61,6 +68,12 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
+
+    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
+    const KFileItemDelegate::AdditionalInformation info =
+        static_cast<KFileItemDelegate::AdditionalInformation>(settings->additionalInfo());
+    delegate->setAdditionalInformation(info);
+    setItemDelegate(delegate);
 }
 
 DolphinIconsView::~DolphinIconsView()
@@ -125,6 +138,99 @@ void DolphinIconsView::updateGridSize(bool showPreview)
 
     m_viewOptions.decorationSize = QSize(size, size);
     setGridSize(QSize(gridWidth, gridHeight));
+
+    m_controller->setZoomInPossible(isZoomInPossible());
+    m_controller->setZoomOutPossible(isZoomOutPossible());
+}
+
+void DolphinIconsView::zoomIn()
+{
+    if (isZoomInPossible()) {
+        IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+
+        const bool showPreview = m_controller->showPreview();
+        if (showPreview) {
+            const int previewSize = increasedIconSize(settings->previewSize());
+            settings->setPreviewSize(previewSize);
+        }
+        else {
+            const int iconSize = increasedIconSize(settings->iconSize());
+            settings->setIconSize(iconSize);
+            if (settings->previewSize() < iconSize) {
+                // assure that the preview size is always >= the icon size
+                settings->setPreviewSize(iconSize);
+            }
+        }
+
+        updateGridSize(showPreview);
+    }
+}
+
+void DolphinIconsView::zoomOut()
+{
+    if (isZoomOutPossible()) {
+        IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+
+        const bool showPreview = m_controller->showPreview();
+        if (showPreview) {
+            const int previewSize = decreasedIconSize(settings->previewSize());
+            settings->setPreviewSize(previewSize);
+            if (settings->iconSize() > previewSize) {
+                // assure that the icon size is always <= the preview size
+                settings->setIconSize(previewSize);
+            }
+        }
+        else {
+            const int iconSize = decreasedIconSize(settings->iconSize());
+            settings->setIconSize(iconSize);
+        }
+
+        updateGridSize(showPreview);
+    }
+}
+
+bool DolphinIconsView::isZoomInPossible() const
+{
+    IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+    return size < K3Icon::SizeEnormous;
+}
+
+bool DolphinIconsView::isZoomOutPossible() const
+{
+    IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+    return size > K3Icon::SizeSmall;
+}
+
+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;
+    }
+    return incSize;
+}
+
+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;
+    }
+    return decSize;
 }
 
 #include "dolphiniconsview.moc"