diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphincolumnview.cpp | 3 | ||||
| -rw-r--r-- | src/dolphincolumnviewcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 13 | ||||
| -rw-r--r-- | src/dolphinview.h | 1 |
4 files changed, 3 insertions, 16 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 6d265c01f..c89a645de 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -134,7 +134,10 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, } updateDecorationSize(dolphinView->showPreview()); + updateBackground(); m_extensionsFactory = new ViewExtensionsFactory(this, controller); + + m_dirLister->openUrl(url, KDirLister::NoFlags); } DolphinColumnView::~DolphinColumnView() diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp index 839407117..6f1418436 100644 --- a/src/dolphincolumnviewcontainer.cpp +++ b/src/dolphincolumnviewcontainer.cpp @@ -160,8 +160,6 @@ void DolphinColumnViewContainer::showColumn(const KUrl& url) columnIndex++; DolphinColumnView* column = new DolphinColumnView(viewport(), this, childUrl); - column->setActive(false); - m_columns.append(column); // Before invoking layoutColumns() the column must be set visible temporary. diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 2fa351b32..c5f6c91d3 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -1211,14 +1211,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload) KDirLister* dirLister = m_viewAccessor.dirLister(); dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - - KDirLister* rootDirLister = m_viewAccessor.rootDirLister(); - if (dirLister != rootDirLister) { - // In the case of the column view the root directory lister can be different. Assure - // that it gets synchronized (clients from DolphinView are not aware that internally - // different directory listers are used). - rootDirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - } } void DolphinView::applyViewProperties() @@ -1507,11 +1499,6 @@ KUrl DolphinView::ViewAccessor::rootUrl() const return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl(); } -KDirLister* DolphinView::ViewAccessor::rootDirLister() const -{ - return static_cast<DolphinModel*>(m_proxyModel->sourceModel())->dirLister(); -} - bool DolphinView::ViewAccessor::supportsCategorizedSorting() const { return m_iconsView != 0; diff --git a/src/dolphinview.h b/src/dolphinview.h index a00e5427b..cab9fa560 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -747,7 +747,6 @@ private: QWidget* layoutTarget() const; KUrl rootUrl() const; - KDirLister* rootDirLister() const; bool supportsCategorizedSorting() const; bool itemsExpandable() const; |
