X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/31ee4085c2b2c374158fb956ac376399ff375b5a..bed969941463bfa89f38ada695090964e78642a9:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 9d75ad816..31c82d606 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -45,11 +45,9 @@ #include #include "dolphin_generalsettings.h" -#include "dolphinmainwindow.h" #include "filterbar/filterbar.h" #include "search/dolphinsearchbox.h" #include "statusbar/dolphinstatusbar.h" -#include "views/dolphinplacesmodel.h" #include "views/draganddrophelper.h" #include "views/viewmodecontroller.h" #include "views/viewproperties.h" @@ -64,7 +62,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_filterBar(0), m_statusBar(0), m_statusBarTimer(0), - m_statusBarTimestamp() + m_statusBarTimestamp(), + m_autoGrabFocus(true) { hide(); @@ -72,7 +71,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - m_urlNavigator = new KUrlNavigator(DolphinPlacesModel::instance(), url, this); + m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this); connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)), this, SLOT(dropUrls(KUrl,QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), @@ -90,7 +89,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_searchBox = new DolphinSearchBox(this); m_searchBox->hide(); connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox())); - connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString))); + connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching())); connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus())); m_messageWidget = new KMessageWidget(this); @@ -111,8 +110,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(delayedStatusBarUpdate())); connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)), this, SLOT(slotViewUrlAboutToBeChanged(KUrl))); connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(showErrorMessage(QString))); - connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(showInfoMessage(QString))); - connect(m_view, SIGNAL(operationCompletedMessage(QString)), m_statusBar, SLOT(setText(QString))); + connect(m_view, SIGNAL(urlIsFileError(KUrl)), this, SLOT(slotUrlIsFileError(KUrl))); connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)), this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl))); @@ -125,10 +123,12 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_statusBar = new DolphinStatusBar(this); m_statusBar->setUrl(m_view->url()); m_statusBar->setZoomLevel(m_view->zoomLevel()); - connect(m_view, SIGNAL(urlChanged(KUrl)), m_statusBar, SLOT(setUrl(KUrl))); - connect(m_view, SIGNAL(zoomLevelChanged(int,int)), m_statusBar, SLOT(setZoomLevel(int))); - connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopDirectoryLoading())); - connect(m_statusBar, SIGNAL(zoomLevelChanged(int)), this, SLOT(slotStatusBarZoomLevelChanged(int))); + connect(m_view, SIGNAL(urlChanged(KUrl)), m_statusBar, SLOT(setUrl(KUrl))); + connect(m_view, SIGNAL(zoomLevelChanged(int,int)), m_statusBar, SLOT(setZoomLevel(int))); + connect(m_view, SIGNAL(infoMessage(QString)), m_statusBar, SLOT(setText(QString))); + connect(m_view, SIGNAL(operationCompletedMessage(QString)), m_statusBar, SLOT(setText(QString))); + connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopDirectoryLoading())); + connect(m_statusBar, SIGNAL(zoomLevelChanged(int)), this, SLOT(slotStatusBarZoomLevelChanged(int))); m_statusBarTimer = new QTimer(this); m_statusBarTimer->setSingleShot(true); @@ -180,6 +180,16 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } +void DolphinViewContainer::setAutoGrabFocus(bool grab) +{ + m_autoGrabFocus = grab; +} + +bool DolphinViewContainer::autoGrabFocus() const +{ + return m_autoGrabFocus; +} + const DolphinStatusBar* DolphinViewContainer::statusBar() const { return m_statusBar; @@ -210,16 +220,6 @@ DolphinView* DolphinViewContainer::view() return m_view; } -const DolphinSearchBox* DolphinViewContainer::searchBox() const -{ - return m_searchBox; -} - -DolphinSearchBox* DolphinViewContainer::searchBox() -{ - return m_searchBox; -} - void DolphinViewContainer::showMessage(const QString& msg, MessageType type) { if (msg.isEmpty()) { @@ -297,6 +297,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) m_searchBox->setSearchPath(url); } } else { + m_view->setViewPropertiesContext(QString()); + // Restore the URL for the URL navigator. If Dolphin has been // started with a search-URL, the home URL is used as fallback. const KUrl url = m_searchBox->searchPath(); @@ -308,8 +310,6 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) } } } - - emit searchModeChanged(enabled); } bool DolphinViewContainer::isSearchModeEnabled() const @@ -317,6 +317,22 @@ bool DolphinViewContainer::isSearchModeEnabled() const return m_searchBox->isVisible(); } +QString DolphinViewContainer::placesText() const +{ + QString text; + + if (isSearchModeEnabled()) { + text = m_searchBox->searchPath().fileName() + QLatin1String(": ") + m_searchBox->text(); + } else { + text = url().fileName(); + if (text.isEmpty()) { + text = url().host(); + } + } + + return text; +} + void DolphinViewContainer::setUrl(const KUrl& newUrl) { if (newUrl != m_urlNavigator->locationUrl()) { @@ -408,6 +424,12 @@ void DolphinViewContainer::slotDirectoryLoadingCompleted() } } +void DolphinViewContainer::slotUrlIsFileError(const KUrl& url) +{ + const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + slotItemActivated(item); +} + void DolphinViewContainer::slotItemActivated(const KFileItem& item) { // It is possible to activate items on inactive views by @@ -508,7 +530,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url) setSearchModeEnabled(isSearchUrl(url)); m_view->setUrl(url); - if (isActive() && !isSearchUrl(url)) { + if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) { // When an URL has been entered, the view should get the focus. // The focus must be requested asynchronously, as changing the URL might create // a new view widget. @@ -517,7 +539,7 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url) } else if (KProtocolManager::isSourceProtocol(url)) { QString app = "konqueror"; if (url.protocol().startsWith(QLatin1String("http"))) { - showMessage(i18nc("@info:status", + showMessage(i18nc("@info:status", // krazy:exclude=qmethods "Dolphin does not support web pages, the web browser has been launched"), Information); @@ -587,11 +609,11 @@ void DolphinViewContainer::slotHistoryChanged() } } -void DolphinViewContainer::startSearching(const QString &text) +void DolphinViewContainer::startSearching() { - Q_UNUSED(text); const KUrl url = m_searchBox->urlForSearching(); if (url.isValid() && !url.isEmpty()) { + m_view->setViewPropertiesContext("search"); m_urlNavigator->setLocationUrl(url); } } @@ -617,11 +639,6 @@ void DolphinViewContainer::showErrorMessage(const QString& msg) showMessage(msg, Error); } -void DolphinViewContainer::showInfoMessage(const QString& msg) -{ - showMessage(msg, Information); -} - bool DolphinViewContainer::isSearchUrl(const KUrl& url) const { const QString protocol = url.protocol();