X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/293e65797afd44a530df3435a8cc5b1b024aa3bb..0abbaf9e11d166da461bb33bc6abeb5ddfb5fa2c:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 01cc27896..6e5b00af2 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -60,9 +60,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, QWidget* parent, - const KUrl& url, - DolphinView::Mode mode, - bool showHiddenFiles) : + const KUrl& url) : QWidget(parent), m_showProgress(false), m_folderCount(0), @@ -90,6 +88,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(activated()), + this, SLOT(activate())); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); @@ -98,7 +98,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(this); - m_dirLister->setShowingDotFiles(showHiddenFiles); m_dirLister->setDelayedMimeTypes(true); m_dirModel = new KDirModel(); @@ -125,8 +124,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, url, m_dirLister, m_dirModel, - m_proxyModel, - mode); + m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)), @@ -258,11 +256,6 @@ void DolphinViewContainer::renameSelectedItems() } } -DolphinStatusBar* DolphinViewContainer::statusBar() const -{ - return m_statusBar; -} - bool DolphinViewContainer::isFilterBarVisible() const { return m_filterBar->isVisible(); @@ -279,11 +272,6 @@ KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const return m_dirModel->itemForIndex(dirModelIndex); } -DolphinMainWindow* DolphinViewContainer::mainWindow() const -{ - return m_mainWindow; -} - void DolphinViewContainer::updateProgress(int percent) { if (!m_showProgress) { @@ -487,5 +475,9 @@ void DolphinViewContainer::restoreContentsPos() } } +void DolphinViewContainer::activate() +{ + setActive(true); +} #include "dolphinviewcontainer.moc"