Create a SidebarTreeView which will include support for drag & drop in later releases...

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index ef45250653dfd13ea5521e167ae157585b053faa..c2ba82d0d4f385bc89198398da5bed7f57e2bae8 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -38,8 +38,12 @@ 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()),
@@ -152,6 +156,10 @@ void DolphinIconsView::zoomIn()
         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);
@@ -167,6 +175,10 @@ void DolphinIconsView::zoomOut()
         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());