X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a5cf21ff06aff44cde563eaceae3c6cef452ee48..22b050a1d04e22097bc9d149e8e73b2d7fdfcdcc:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 2fb7565f1..7fd0cfa29 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -74,6 +74,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_filterBar(0), m_statusBar(0), m_statusBarTimer(0), + m_statusBarTimestamp(), m_dirLister(0), m_proxyModel(0) { @@ -102,6 +103,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : 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(returnPressed(QString)), this, SLOT(requestFocus())); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); @@ -109,7 +111,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : m_dirLister->setDelayedMimeTypes(true); m_dolphinModel = new DolphinModel(this); - m_dolphinModel->setDirLister(m_dirLister); + m_dolphinModel->setDirLister(m_dirLister); // m_dolphinModel takes ownership of m_dirLister m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); m_proxyModel = new DolphinSortFilterProxyModel(this); @@ -124,6 +126,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : this, SLOT(updateProgress(int))); connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SLOT(delayedStatusBarUpdate())); + connect(m_dirLister, SIGNAL(newItems(KFileItemList)), + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), @@ -191,13 +195,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : DolphinViewContainer::~DolphinViewContainer() { - m_dirLister->disconnect(); - - delete m_proxyModel; - m_proxyModel = 0; - delete m_dolphinModel; - m_dolphinModel = 0; - m_dirLister = 0; // deleted by m_dolphinModel } KUrl DolphinViewContainer::url() const @@ -222,6 +219,16 @@ bool DolphinViewContainer::isActive() const void DolphinViewContainer::refresh() { + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + if (settings->modifiedStartupSettings()) { + // The startup settings should only get applied if they have been + // modified by the user. Otherwise keep the (possibly) different current + // settings of the URL navigator and the filterbar. + m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); + setFilterBarVisible(settings->filterBar()); + } + m_view->refresh(); m_statusBar->refresh(); } @@ -233,24 +240,43 @@ bool DolphinViewContainer::isFilterBarVisible() const void DolphinViewContainer::setSearchModeEnabled(bool enabled) { + if (enabled == isSearchModeEnabled()) { + return; + } + m_searchBox->setVisible(enabled); m_urlNavigator->setVisible(!enabled); if (enabled) { - // Remember the current URL, so that it can be restored - // when switching back to the URL navigator - const KUrl url = m_urlNavigator->locationUrl(); - m_searchBox->setSearchPath(url); + // Remember the most recent non-search URL as search path + // of the search-box, so that it can be restored + // when switching back to the URL navigator. + KUrl url = m_urlNavigator->locationUrl(); + + int index = m_urlNavigator->historyIndex(); + const int historySize = m_urlNavigator->historySize(); + while (isSearchUrl(url) && (index < historySize)) { + ++index; + url = m_urlNavigator->locationUrl(index); + } + + if (!isSearchUrl(url)) { + m_searchBox->setSearchPath(url); + } } else { // 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(); - if (url.isValid() && !url.isEmpty() && !isSearchUrl(url)) { - m_urlNavigator->setLocationUrl(url); - } else { - m_urlNavigator->goHome(); + if (url.isValid() && !url.isEmpty()) { + if (isSearchUrl(url)) { + m_urlNavigator->goHome(); + } else { + m_urlNavigator->setLocationUrl(url); + } } } + + emit searchModeChanged(enabled); } bool DolphinViewContainer::isSearchModeEnabled() const @@ -272,10 +298,10 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl) } } -void DolphinViewContainer::showFilterBar(bool show) +void DolphinViewContainer::setFilterBarVisible(bool visible) { Q_ASSERT(m_filterBar != 0); - if (show) { + if (visible) { m_filterBar->show(); } else { closeFilterBar(); @@ -284,32 +310,39 @@ void DolphinViewContainer::showFilterBar(bool show) void DolphinViewContainer::delayedStatusBarUpdate() { - // Invoke updateStatusBar() with a small delay. This assures that - // when a lot of delayedStatusBarUpdates() are done in a short time, - // no bottleneck is given. - m_statusBarTimer->start(); + if (m_statusBarTimer->isActive() && (m_statusBarTimestamp.elapsed() > 2000)) { + // No update of the statusbar has been done during the last 2 seconds, + // although an update has been requested. Trigger an immediate update. + m_statusBarTimer->stop(); + updateStatusBar(); + } else { + // Invoke updateStatusBar() with a small delay. This assures that + // when a lot of delayedStatusBarUpdates() are done in a short time, + // no bottleneck is given. + m_statusBarTimer->start(); + } } void DolphinViewContainer::updateStatusBar() { + m_statusBarTimestamp.start(); + // As the item count information is less important // in comparison with other messages, it should only // be shown if: // - the status bar is empty or // - shows already the item count information or // - shows only a not very important information - // - if any progress is given don't show the item count info at all - const QString msg = m_statusBar->message(); - const bool updateStatusBarMsg = (msg.isEmpty() - || (msg == m_statusBar->defaultText()) - || (m_statusBar->type() == DolphinStatusBar::Information)) - && (m_statusBar->progress() == 100); + const QString newMessage = m_view->statusBarText(); + const QString currentMessage = m_statusBar->message(); + const bool updateStatusBarMsg = currentMessage.isEmpty() + || (currentMessage == m_statusBar->defaultText()) + || (m_statusBar->type() == DolphinStatusBar::Information); - const QString text = m_view->statusBarText(); - m_statusBar->setDefaultText(text); + m_statusBar->setDefaultText(newMessage); if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); + m_statusBar->setMessage(newMessage, DolphinStatusBar::Default); } } @@ -423,20 +456,10 @@ void DolphinViewContainer::saveViewState() void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url) { if (KProtocolManager::supportsListing(url)) { - // Assure that the search box is shown instead of the URL navigator in case - // that the URL \p url is a search URL (e. g. nepomuksearch:// or filenamesearch://). - if (isSearchUrl(url)) { - if (!m_searchBox->isVisible()) { - m_searchBox->setVisible(true); - m_urlNavigator->setVisible(false); - } - } else if (!m_urlNavigator->isVisible()) { - m_urlNavigator->setVisible(true); - m_searchBox->setVisible(false); - } + setSearchModeEnabled(isSearchUrl(url)); m_view->setUrl(url); - if (isActive()) { + if (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. @@ -485,6 +508,7 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) // URL history. m_urlNavigator->saveLocationState(QByteArray()); m_urlNavigator->setLocationUrl(newUrl); + setSearchModeEnabled(isSearchUrl(newUrl)); m_urlNavigator->blockSignals(block); } @@ -527,7 +551,8 @@ void DolphinViewContainer::closeSearchBox() bool DolphinViewContainer::isSearchUrl(const KUrl& url) const { - return url.protocol().contains("search"); + const QString protocol = url.protocol(); + return protocol.contains("search") || (protocol == QLatin1String("nepomuk")); } void DolphinViewContainer::slotItemTriggered(const KFileItem& item)