Allow zooming in and zooming out in the icons view.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index edb57ef7f..491411cb2 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -250,11 +250,11 @@ void DolphinMainWindow::slotViewModeChanged()
     updateViewActions();

 }

 

-void DolphinMainWindow::slowShowPreviewChanged()

+void DolphinMainWindow::slotShowPreviewChanged()

 {

-    KToggleAction* showPreviewAction =

-        static_cast<KToggleAction*>(actionCollection()->action("show_preview"));

-    showPreviewAction->setChecked(m_activeView->showPreview());

+    // It is not enough to update the 'Show Preview' action, also

+    // the 'Zoom In' and 'Zoom Out' actions must be adapted.

+    updateViewActions();

 }

 

 void DolphinMainWindow::slotShowHiddenFilesChanged()

@@ -329,6 +329,7 @@ void DolphinMainWindow::slotHistoryChanged()
 void DolphinMainWindow::slotUrlChanged(const KUrl& url)

 {

     updateEditActions();

+    updateViewActions();

     updateGoActions();

     setCaption(url.fileName());

 }

@@ -1349,7 +1350,7 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
     connect(view, SIGNAL(modeChanged()),

             this, SLOT(slotViewModeChanged()));

     connect(view, SIGNAL(showPreviewChanged()),

-            this, SLOT(slowShowPreviewChanged()));

+            this, SLOT(slotShowPreviewChanged()));

     connect(view, SIGNAL(showHiddenFilesChanged()),

             this, SLOT(slotShowHiddenFilesChanged()));

     connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),