X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/487215f0c459ca38c68619325edac4a2fe42ca4b..40c71d5ce0f6978ce48eb67fd73ed211bab4e887:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index ece22f4c0..e10072d2a 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Peter Penz * + * Copyright (C) 2007 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,65 +18,51 @@ ***************************************************************************/ #include "dolphinviewcontainer.h" -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include -#include - -#include "dolphinmodel.h" -#include "dolphincolumnview.h" -#include "dolphincontroller.h" +#include +#include +#include +#include +#include + +#include "dolphin_generalsettings.h" #include "dolphinmainwindow.h" -#include "dolphindirlister.h" -#include "dolphinsortfilterproxymodel.h" -#include "dolphindetailsview.h" -#include "dolphiniconsview.h" -#include "dolphincontextmenu.h" -#include "draganddrophelper.h" -#include "filterbar.h" +#include "filterbar/filterbar.h" +#include "search/dolphinsearchbox.h" #include "statusbar/dolphinstatusbar.h" -#include "viewproperties.h" -#include "settings/dolphinsettings.h" -#include "dolphin_generalsettings.h" +#include "views/dolphinplacesmodel.h" +#include "views/draganddrophelper.h" +#include "views/viewmodecontroller.h" +#include "views/viewproperties.h" -DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, - QWidget* parent, - const KUrl& url) : +DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : QWidget(parent), - m_isFolderWritable(false), - m_mainWindow(mainWindow), m_topLayout(0), m_urlNavigator(0), + m_searchBox(0), m_view(0), m_filterBar(0), m_statusBar(0), m_statusBarTimer(0), - m_dirLister(0), - m_proxyModel(0) + m_statusBarTimestamp() { hide(); @@ -84,139 +70,99 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), - this, SLOT(dropUrls(const KUrl&, QDropEvent*))); + m_urlNavigator = new KUrlNavigator(DolphinPlacesModel::instance(), url, this); + connect(m_urlNavigator, SIGNAL(urlsDropped(KUrl,QDropEvent*)), + this, SLOT(dropUrls(KUrl,QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)), this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion))); - const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const GeneralSettings* settings = GeneralSettings::self(); m_urlNavigator->setUrlEditable(settings->editableUrl()); m_urlNavigator->setShowFullPath(settings->showFullPath()); - m_urlNavigator->setHomeUrl(settings->homeUrl()); + m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl())); KUrlComboBox* editor = m_urlNavigator->editor(); editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode())); - m_dirLister = new DolphinDirLister(); - m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(window()); - m_dirLister->setDelayedMimeTypes(true); - - m_dolphinModel = new DolphinModel(this); - m_dolphinModel->setDirLister(m_dirLister); - m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); - - m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dolphinModel); - m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - - connect(m_dirLister, SIGNAL(started(KUrl)), - this, SLOT(initializeProgress())); - connect(m_dirLister, SIGNAL(clear()), - this, SLOT(delayedStatusBarUpdate())); - connect(m_dirLister, SIGNAL(percent(int)), - this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), - this, SLOT(delayedStatusBarUpdate())); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(slotDirListerCompleted())); - connect(m_dirLister, SIGNAL(infoMessage(const QString&)), - this, SLOT(showInfoMessage(const QString&))); - connect(m_dirLister, SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); - connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), - this, SLOT(openFile(const KUrl&))); - - m_view = new DolphinView(this, url, m_proxyModel); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), - m_urlNavigator, SLOT(setUrl(const KUrl&))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), - this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); - connect(m_view, SIGNAL(contentsMoved(int, int)), - this, SLOT(saveContentsPos(int, int))); - connect(m_view, SIGNAL(requestItemInfo(KFileItem)), - this, SLOT(showItemInfo(KFileItem))); - connect(m_view, SIGNAL(errorMessage(const QString&)), - this, SLOT(showErrorMessage(const QString&))); - connect(m_view, SIGNAL(infoMessage(const QString&)), - this, SLOT(showInfoMessage(const QString&))); - connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), - this, SLOT(showOperationCompletedMessage(const QString&))); - connect(m_view, SIGNAL(itemTriggered(KFileItem)), - this, SLOT(slotItemTriggered(KFileItem))); - connect(m_view, SIGNAL(startedPathLoading(const KUrl&)), - this, SLOT(saveRootUrl(const KUrl&))); - connect(m_view, SIGNAL(redirection(KUrl, KUrl)), - this, SLOT(redirect(KUrl, KUrl))); - connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), - this, SLOT(delayedStatusBarUpdate())); - - connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(restoreView(const KUrl&))); + 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(returnPressed(QString)), this, SLOT(requestFocus())); + + m_view = new DolphinView(url, this); + connect(m_view, SIGNAL(urlChanged(KUrl)), m_urlNavigator, SLOT(setUrl(KUrl))); + connect(m_view, SIGNAL(writeStateChanged(bool)), this, SIGNAL(writeStateChanged(bool))); + connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(showItemInfo(KFileItem))); + connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(showErrorMessage(QString))); + connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(showInfoMessage(QString))); + connect(m_view, SIGNAL(itemActivated(KFileItem)), this, SLOT(slotItemActivated(KFileItem))); + connect(m_view, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(redirect(KUrl,KUrl))); + connect(m_view, SIGNAL(directoryLoadingStarted()), this, SLOT(slotDirectoryLoadingStarted())); + connect(m_view, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted())); + connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(delayedStatusBarUpdate())); + connect(m_view, SIGNAL(directoryLoadingProgress(int)), this, SLOT(updateDirectoryLoadingProgress(int))); + connect(m_view, SIGNAL(directorySortingProgress(int)), this, SLOT(updateDirectorySortingProgress(int))); + connect(m_view, SIGNAL(infoMessage(QString)), this, SLOT(showInfoMessage(QString))); + connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(showErrorMessage(QString))); + connect(m_view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(delayedStatusBarUpdate())); + connect(m_view, SIGNAL(operationCompletedMessage(QString)), this, SLOT(showOperationCompletedMessage(QString))); + connect(m_view, SIGNAL(urlAboutToBeChanged(KUrl)), this, SLOT(slotViewUrlAboutToBeChanged(KUrl))); + + connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(KUrl)), + this, SLOT(slotUrlNavigatorLocationAboutToBeChanged(KUrl))); + connect(m_urlNavigator, SIGNAL(urlChanged(KUrl)), + this, SLOT(slotUrlNavigatorLocationChanged(KUrl))); connect(m_urlNavigator, SIGNAL(historyChanged()), this, SLOT(slotHistoryChanged())); + // initialize status bar m_statusBar = new DolphinStatusBar(this, m_view); + connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopLoading())); + m_statusBarTimer = new QTimer(this); m_statusBarTimer->setSingleShot(true); m_statusBarTimer->setInterval(300); connect(m_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar())); + KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); + connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), + this, SLOT(delayedStatusBarUpdate())); + + // initialize filter bar m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); - connect(m_filterBar, SIGNAL(filterChanged(const QString&)), - this, SLOT(setNameFilter(const QString&))); + connect(m_filterBar, SIGNAL(filterChanged(QString)), + this, SLOT(setNameFilter(QString))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); - connect(m_view, SIGNAL(urlChanged(const KUrl&)), + connect(m_view, SIGNAL(urlChanged(KUrl)), m_filterBar, SLOT(clear())); m_topLayout->addWidget(m_urlNavigator); + m_topLayout->addWidget(m_searchBox); m_topLayout->addWidget(m_view); m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); -} - -DolphinViewContainer::~DolphinViewContainer() -{ - m_dirLister->disconnect(); - delete m_proxyModel; - m_proxyModel = 0; - delete m_dolphinModel; - m_dolphinModel = 0; - m_dirLister = 0; // deleted by m_dolphinModel + setSearchModeEnabled(isSearchUrl(url)); } -void DolphinViewContainer::setUrl(const KUrl& newUrl) +DolphinViewContainer::~DolphinViewContainer() { - if (newUrl != m_urlNavigator->url()) { - m_urlNavigator->setUrl(newUrl); - // Temporary disable the 'File'->'Create New...' menu until - // the write permissions can be checked in a fast way at - // DolphinViewContainer::slotDirListerCompleted(). - m_isFolderWritable = false; - if (isActive()) { - m_mainWindow->newMenu()->menu()->setEnabled(false); - } - } } -const KUrl& DolphinViewContainer::url() const +KUrl DolphinViewContainer::url() const { - return m_urlNavigator->url(); + return m_view->url(); } void DolphinViewContainer::setActive(bool active) { m_urlNavigator->setActive(active); m_view->setActive(active); - if (active) { - m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); - } } bool DolphinViewContainer::isActive() const @@ -225,10 +171,60 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } -void DolphinViewContainer::refresh() +const DolphinStatusBar* DolphinViewContainer::statusBar() const +{ + return m_statusBar; +} + +DolphinStatusBar* DolphinViewContainer::statusBar() +{ + return m_statusBar; +} + +const KUrlNavigator* DolphinViewContainer::urlNavigator() const +{ + return m_urlNavigator; +} + +KUrlNavigator* DolphinViewContainer::urlNavigator() +{ + return m_urlNavigator; +} + +const DolphinView* DolphinViewContainer::view() const +{ + return m_view; +} + +DolphinView* DolphinViewContainer::view() +{ + return m_view; +} + +const DolphinSearchBox* DolphinViewContainer::searchBox() const { - m_view->refresh(); - m_statusBar->refresh(); + return m_searchBox; +} + +DolphinSearchBox* DolphinViewContainer::searchBox() +{ + return m_searchBox; +} + +void DolphinViewContainer::readSettings() +{ + if (GeneralSettings::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(GeneralSettings::editableUrl()); + m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath()); + m_urlNavigator->setHomeUrl(KUrl(GeneralSettings::homeUrl())); + setFilterBarVisible(GeneralSettings::filterBar()); + } + + m_view->readSettings(); + m_statusBar->readSettings(); } bool DolphinViewContainer::isFilterBarVisible() const @@ -236,99 +232,193 @@ bool DolphinViewContainer::isFilterBarVisible() const return m_filterBar->isVisible(); } -void DolphinViewContainer::showFilterBar(bool show) +void DolphinViewContainer::setSearchModeEnabled(bool enabled) { - Q_ASSERT(m_filterBar != 0); - if (show) { - m_filterBar->show(); + if (enabled == isSearchModeEnabled()) { + if (enabled && !m_searchBox->hasFocus()) { + m_searchBox->setFocus(); + m_searchBox->selectAll(); + } + return; + } + + m_searchBox->setVisible(enabled); + m_urlNavigator->setVisible(!enabled); + + if (enabled) { + KUrl url = m_urlNavigator->locationUrl(); + m_searchBox->setText(QString()); + m_searchBox->setReadOnly(isSearchUrl(url), 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. + 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 { - closeFilterBar(); + // 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()) { + if (isSearchUrl(url)) { + m_urlNavigator->goHome(); + } else { + m_urlNavigator->setLocationUrl(url); + } + } } + + emit searchModeChanged(enabled); } -bool DolphinViewContainer::isUrlEditable() const +bool DolphinViewContainer::isSearchModeEnabled() const { - return m_urlNavigator->isUrlEditable(); + return m_searchBox->isVisible(); +} + +void DolphinViewContainer::setUrl(const KUrl& newUrl) +{ + if (newUrl != m_urlNavigator->locationUrl()) { + m_urlNavigator->setLocationUrl(newUrl); + } +} + +void DolphinViewContainer::setFilterBarVisible(bool visible) +{ + Q_ASSERT(m_filterBar); + if (visible) { + m_filterBar->show(); + m_filterBar->setFocus(); + m_filterBar->selectAll(); + } else { + closeFilterBar(); + } } 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() { - // 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 text(m_view->statusBarText()); - m_statusBar->setDefaultText(text); - - if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); + m_statusBarTimestamp.start(); + + const QString newMessage = m_view->statusBarText(); + m_statusBar->setDefaultText(newMessage); + + // We don't want to override errors. Other messages are only protected by + // the Statusbar itself depending on timings (see DolphinStatusBar::setMessage). + if (m_statusBar->type() != DolphinStatusBar::Error) { + m_statusBar->setMessage(newMessage, DolphinStatusBar::Default); } } -void DolphinViewContainer::initializeProgress() +void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) { - if (url().protocol() == "nepomuksearch") { - // The Nepomuk IO-slave does not provide any progress information. Give - // an immediate hint to the user that a searching is done: - m_statusBar->setProgressText(i18nc("@info", "Searching...")); - m_statusBar->setProgress(-1); + if (m_statusBar->progressText().isEmpty()) { + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); } - } + m_statusBar->setProgress(percent); +} -void DolphinViewContainer::updateProgress(int percent) +void DolphinViewContainer::updateDirectorySortingProgress(int percent) { if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); + m_statusBar->setProgressText(i18nc("@info:progress", "Sorting...")); } m_statusBar->setProgress(percent); } -void DolphinViewContainer::slotDirListerCompleted() +void DolphinViewContainer::slotDirectoryLoadingStarted() +{ + if (isSearchUrl(url())) { + // Search KIO-slaves usually don't provide any progress information. Give + // a hint to the user that a searching is done: + updateStatusBar(); + m_statusBar->setProgressText(i18nc("@info", "Searching...")); + m_statusBar->setProgress(-1); + } else { + // Trigger an undetermined progress indication. The progress + // information in percent will be triggered by the percent() signal + // of the directory lister later. + updateDirectoryLoadingProgress(-1); + } +} + +void DolphinViewContainer::slotDirectoryLoadingCompleted() { if (!m_statusBar->progressText().isEmpty()) { m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); } - if ((url().protocol() == "nepomuksearch") && (m_dirLister->items().count() == 0)) { + if (isSearchUrl(url()) && m_view->itemsCount() == 0) { // The dir lister has been completed on a Nepomuk-URI and no items have been found. Instead // of showing the default status bar information ("0 items") a more helpful information is given: m_statusBar->setMessage(i18nc("@info:status", "No items found."), DolphinStatusBar::Information); } else { updateStatusBar(); } +} - // Enable the 'File'->'Create New...' menu only if the directory - // supports writing. - KFileItem item = m_dirLister->rootItem(); - if (item.isNull()) { - // it is unclear whether writing is supported - m_isFolderWritable = true; - } else { - KFileItemListProperties capabilities(KFileItemList() << item); - m_isFolderWritable = capabilities.supportsWriting(); +void DolphinViewContainer::slotItemActivated(const KFileItem& item) +{ + // It is possible to activate items on inactive views by + // drag & drop operations. Assure that activating an item always + // results in an active view. + m_view->setActive(true); + + KUrl url = item.targetUrl(); + + if (item.isDir()) { + m_view->setUrl(url); + return; + } + + if (GeneralSettings::browseThroughArchives() && item.isFile() && url.isLocalFile()) { + // Generic mechanism for redirecting to tar:// when clicking on a tar file, + // zip:// when clicking on a zip file, etc. + // The .protocol file specifies the mimetype that the kioslave handles. + // Note that we don't use mimetype inheritance since we don't want to + // open OpenDocument files as zip folders... + const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype()); + if (!protocol.isEmpty()) { + url.setProtocol(protocol); + m_view->setUrl(url); + return; + } } - if (isActive()) { - m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + if (item.mimetype() == QLatin1String("application/x-desktop")) { + // Redirect to the URL in Type=Link desktop files + KDesktopFile desktopFile(url.toLocalFile()); + if (desktopFile.hasLinkType()) { + url = desktopFile.readUrl(); + m_view->setUrl(url); + return; + } } + + item.run(); } void DolphinViewContainer::showItemInfo(const KFileItem& item) @@ -342,7 +432,8 @@ void DolphinViewContainer::showItemInfo(const KFileItem& item) m_statusBar->clear(); } } else { - m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); + const QString message = item.isDir() ? item.text() : item.getStatusBarInfo(); + m_statusBar->setMessage(message, DolphinStatusBar::Default); } } @@ -375,39 +466,45 @@ void DolphinViewContainer::setNameFilter(const QString& nameFilter) delayedStatusBarUpdate(); } -void DolphinViewContainer::openContextMenu(const KFileItem& item, - const KUrl& url, - const QList& customActions) +void DolphinViewContainer::activate() { - DolphinContextMenu contextMenu(m_mainWindow, item, url); - contextMenu.setCustomActions(customActions); - contextMenu.open(); + setActive(true); } -void DolphinViewContainer::saveContentsPos(int x, int y) +void DolphinViewContainer::slotViewUrlAboutToBeChanged(const KUrl& url) { - // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the - // view state in KDE 4.5, this funciton can be removed. - m_urlNavigator->savePosition(x, y); + // URL changes of the view can happen in two ways: + // 1. The URL navigator gets changed and will trigger the view to update its URL + // 2. The URL of the view gets changed and will trigger the URL navigator to update + // its URL (e.g. by clicking on an item) + // In this scope the view-state may only get saved in case 2: + if (url != m_urlNavigator->locationUrl()) { + saveViewState(); + } } -void DolphinViewContainer::activate() +void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url) { - setActive(true); + // URL changes of the view can happen in two ways: + // 1. The URL navigator gets changed and will trigger the view to update its URL + // 2. The URL of the view gets changed and will trigger the URL navigator to update + // its URL (e.g. by clicking on an item) + // In this scope the view-state may only get saved in case 1: + if (url != m_view->url()) { + saveViewState(); + } } -void DolphinViewContainer::restoreView(const KUrl& url) +void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url) { if (KProtocolManager::supportsListing(url)) { - m_view->updateView(url, m_urlNavigator->savedRootUrl()); - if (isActive()) { + setSearchModeEnabled(isSearchUrl(url)); + m_view->setUrl(url); + + 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. Using QTimer::singleShow() works reliable, however - // QMetaObject::invokeMethod() with a queued connection does not work, which might - // indicate that we should pass a hint to DolphinView::updateView() - // regarding the focus instead. To test: Enter an URL and press CTRL+Enter. - // Expected result: The view should get the focus. + // a new view widget. QTimer::singleShot(0, this, SLOT(requestFocus())); } } else if (KProtocolManager::isSourceProtocol(url)) { @@ -437,15 +534,9 @@ void DolphinViewContainer::restoreView(const KUrl& url) } } -void DolphinViewContainer::saveRootUrl(const KUrl& url) -{ - Q_UNUSED(url); - m_urlNavigator->saveRootUrl(m_view->rootUrl()); -} - void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) { - DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this); + DragAndDropHelper::dropUrls(KFileItem(), destination, event); } void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) @@ -453,7 +544,14 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) Q_UNUSED(oldUrl); const bool block = m_urlNavigator->signalsBlocked(); m_urlNavigator->blockSignals(true); - m_urlNavigator->setUrl(newUrl); + + // Assure that the location state is reset for redirection URLs. This + // allows to skip redirection URLs when going back or forward in the + // URL history. + m_urlNavigator->saveLocationState(QByteArray()); + m_urlNavigator->setLocationUrl(newUrl); + setSearchModeEnabled(isSearchUrl(newUrl)); + m_urlNavigator->blockSignals(block); } @@ -464,59 +562,50 @@ void DolphinViewContainer::requestFocus() void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion) { - DolphinSettings& settings = DolphinSettings::instance(); - settings.generalSettings()->setUrlCompletionMode(completion); - settings.save(); + GeneralSettings::setUrlCompletionMode(completion); } void DolphinViewContainer::slotHistoryChanged() { - const int index = m_urlNavigator->historyIndex(); - if (index > 0) { - // The "Go Forward" action is enabled. Try to mark - // the previous directory as active item: - const KUrl url = m_urlNavigator->historyUrl(index - 1); - m_view->activateItem(url); - QPoint pos = m_urlNavigator->savedPosition(); - m_view->setRestoredContentsPosition(pos); + QByteArray locationState = m_urlNavigator->locationState(); + if (!locationState.isEmpty()) { + QDataStream stream(&locationState, QIODevice::ReadOnly); + m_view->restoreState(stream); } } -void DolphinViewContainer::slotItemTriggered(const KFileItem& item) +void DolphinViewContainer::startSearching(const QString &text) { - KUrl url = item.targetUrl(); - - if (item.isDir()) { - m_view->setUrl(url); - return; + Q_UNUSED(text); + const KUrl url = m_searchBox->urlForSearching(); + if (url.isValid() && !url.isEmpty()) { + m_urlNavigator->setLocationUrl(url); } +} - const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - const bool browseThroughArchives = settings->browseThroughArchives(); - if (browseThroughArchives && item.isFile() && url.isLocalFile()) { - // Generic mechanism for redirecting to tar:// when clicking on a tar file, - // zip:// when clicking on a zip file, etc. - // The .protocol file specifies the mimetype that the kioslave handles. - // Note that we don't use mimetype inheritance since we don't want to - // open OpenDocument files as zip folders... - const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype()); - if (!protocol.isEmpty()) { - url.setProtocol(protocol); - m_view->setUrl(url); - return; - } - } +void DolphinViewContainer::closeSearchBox() +{ + setSearchModeEnabled(false); +} - item.run(); +void DolphinViewContainer::stopLoading() +{ + m_view->stopLoading(); + m_statusBar->setProgress(100); +} + +bool DolphinViewContainer::isSearchUrl(const KUrl& url) const +{ + const QString protocol = url.protocol(); + return protocol.contains("search") || (protocol == QLatin1String("nepomuk")); } -void DolphinViewContainer::openFile(const KUrl& url) +void DolphinViewContainer::saveViewState() { - // Using m_dolphinModel for getting the file item instance is not possible - // here: openFile() is triggered by an error of the directory lister - // job, so the file item must be received "manually". - const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - slotItemTriggered(item); + QByteArray locationState; + QDataStream stream(&locationState, QIODevice::WriteOnly); + m_view->saveState(stream); + m_urlNavigator->saveLocationState(locationState); } #include "dolphinviewcontainer.moc"