Fixed minor regression introduced with the column view refactoring: When switching...

The KFilePreviewGenerator initialized in the ViewExtensionsFactory wants a valid icon size to accept previews. Fixed + Q_ASSERT added to prevent such a mistake in future.

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index ef0dc05ef864c7bd39d8dc2d50a5cfd539da013b..2d3bcb826d7165a5bfb4160151a0c518d496e1bb 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -142,8 +142,8 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
         m_proxyModel->setFilterRegExp(nameFilter);
     }
 
-    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
     updateDecorationSize(dolphinView->showPreview());
+    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
 }
 
 DolphinColumnView::~DolphinColumnView()

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index cf487b5e7e7efa6d64aa220cd4c98a3e3a664365..3dca2da28eb0762b3df8dfcd3d06f7cb0a110f3e 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -151,11 +151,11 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     connect(m_expandableFoldersAction, SIGNAL(toggled(bool)),
             this, SLOT(setFoldersExpandable(bool)));
 
+    updateDecorationSize(view->showPreview());
+
     m_extensionsFactory = new ViewExtensionsFactory(this, controller);
     m_extensionsFactory->fileItemDelegate()->setMinimizedNameColumn(true);
     m_extensionsFactory->setAutoFolderExpandingEnabled(settings->expandableFolders());
-
-    updateDecorationSize(view->showPreview());
 }
 
 DolphinDetailsView::~DolphinDetailsView()

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 50a08f4ed92bfdabd6bcbe34b45e53730de914cc..bd070ad1c7dfa9adf7117a6ea96d10e44f54af0f 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -120,8 +120,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
             this, SLOT(slotGlobalSettingsChanged(int)));
 
-    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
     updateGridSize(view->showPreview(), 0);
+    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
 }
 
 DolphinIconsView::~DolphinIconsView()

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index dff8120c71edb4ac5f065a3d9ec3d8576185105c..476f6591d32034d599137bb3eca3b94ed82f8761 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -246,7 +246,7 @@ void DolphinView::setMode(Mode mode)
     emit modeChanged();
 
     updateZoomLevel(oldZoomLevel);
-    if (m_showPreview) {
+    if (m_showPreview) {   
         loadDirectory(viewPropsUrl);
     }
 }
@@ -1173,7 +1173,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
     }
 
-    m_viewAccessor.dirLister()->stop();
     m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 }
 

diff --git a/src/viewextensionsfactory.cpp b/src/viewextensionsfactory.cpp
index a6555ae0be792b56f9b8701583cc41895ef9ee41..e3ec6466406fb6ccdcf347838f7040e74a513def 100644 (file)
--- a/src/viewextensionsfactory.cpp
+++ b/src/viewextensionsfactory.cpp
@@ -63,6 +63,7 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
     }
 
     // initialize preview generator
+    Q_ASSERT(view->iconSize().isValid());
     m_previewGenerator = new KFilePreviewGenerator(view);
     m_previewGenerator->setPreviewShown(controller->dolphinView()->showPreview());
     connect(controller, SIGNAL(zoomLevelChanged(int)),