restore zooming functionality

svn path=/trunk/KDE/kdebase/apps/; revision=1016779

1 files changed, 22 insertions, 1 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 4b17c2c9e..14ee18bef 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -33,6 +33,7 @@
 #include "selectionmanager.h"
 #include "tooltips/tooltipmanager.h"
 #include "versioncontrolobserver.h"
+#include "zoomlevelinfo.h"
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>
@@ -167,7 +168,11 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
 
     new VersionControlObserver(this);*/
 
-    updateDecorationSize(m_container->m_controller->dolphinView()->showPreview());
+    DolphinController* controller = m_container->m_controller;
+    connect(controller, SIGNAL(zoomLevelChanged(int)),
+            this, SLOT(setZoomLevel(int)));
+
+    updateDecorationSize(dolphinView->showPreview());
 }
 
 DolphinColumnView::~DolphinColumnView()
@@ -453,6 +458,22 @@ void DolphinColumnView::currentChanged(const QModelIndex& current, const QModelI
     m_autoScroller->handleCurrentIndexChange(current, previous);
 }
 
+
+void DolphinColumnView::setZoomLevel(int level)
+{
+    const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);
+    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+
+    const bool showPreview = m_container->m_controller->dolphinView()->showPreview();
+    if (showPreview) {
+        settings->setPreviewSize(size);
+    } else {
+        settings->setIconSize(size);
+    }
+
+    updateDecorationSize(showPreview);
+}
+
 void DolphinColumnView::slotEntered(const QModelIndex& index)
 {
     m_container->m_controller->setItemView(this);