diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphincolumnview.cpp | 2 | ||||
| -rw-r--r-- | src/dolphindetailsview.cpp | 4 | ||||
| -rw-r--r-- | src/dolphiniconsview.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 3 | ||||
| -rw-r--r-- | src/viewextensionsfactory.cpp | 1 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index ef0dc05ef..2d3bcb826 100644 --- 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 cf487b5e7..3dca2da28 100644 --- 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 50a08f4ed..bd070ad1c 100644 --- 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 dff8120c7..476f6591d 100644 --- 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 a6555ae0b..e3ec64664 100644 --- 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)), |