X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1f5f7f0092871fec525773a6cce158413e18a265..4ad4d4785cb1ad88351711de0ec0c1f0e4e5185a:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 9da51a60c..da7466947 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -21,13 +21,13 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -39,40 +39,42 @@ #include #include #include -#include +#include #include +#include #include +#include +#include #include -#include "dolphinmodel.h" -#include "dolphincolumnview.h" -#include "dolphincontroller.h" -#include "dolphinstatusbar.h" +#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 "kurlnavigator.h" -#include "viewproperties.h" +#include "filterbar/filterbar.h" +#include "search/dolphinsearchbox.h" #include "settings/dolphinsettings.h" -#include "dolphin_generalsettings.h" - -DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, - QWidget* parent, - const KUrl& url) : +#include "statusbar/dolphinstatusbar.h" +#include "views/dolphincolumnview.h" +#include "views/dolphindetailsview.h" +#include "views/dolphindirlister.h" +#include "views/dolphinsortfilterproxymodel.h" +#include "views/draganddrophelper.h" +#include "views/dolphiniconsview.h" +#include "views/dolphinmodel.h" +#include "views/dolphinviewcontroller.h" +#include "views/viewmodecontroller.h" +#include "views/viewproperties.h" + +DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : QWidget(parent), - m_showProgress(false), 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_statusBarTimestamp(), m_dirLister(0), m_proxyModel(0) { @@ -87,11 +89,21 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(dropUrls(const 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(); 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_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_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); @@ -99,19 +111,23 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, 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); 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(updateStatusBar())); + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), - this, SLOT(updateStatusBar())); + 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&)), @@ -121,17 +137,9 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), this, SLOT(openFile(const KUrl&))); - m_view = new DolphinView(this, - url, - m_dirLister, - m_dolphinModel, - m_proxyModel); + 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&)), @@ -142,16 +150,31 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, 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&))); + this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)), + this, SLOT(saveViewState())); + connect(m_urlNavigator, SIGNAL(historyChanged()), + this, SLOT(slotHistoryChanged())); + // initialize status bar m_statusBar = new DolphinStatusBar(this, m_view); + 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&)), @@ -162,39 +185,21 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, 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() { - m_urlNavigator->setUrl(newUrl); - if (newUrl != m_urlNavigator->url()) { - // 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_urlNavigator->locationUrl(); } void DolphinViewContainer::setActive(bool active) @@ -202,7 +207,7 @@ void DolphinViewContainer::setActive(bool active) m_urlNavigator->setActive(active); m_view->setActive(active); if (active) { - m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + emit writeStateChanged(m_isFolderWritable); } } @@ -223,6 +228,49 @@ bool DolphinViewContainer::isFilterBarVisible() const return m_filterBar->isVisible(); } +void DolphinViewContainer::setSearchModeEnabled(bool enabled) +{ + 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); + } 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()) { + if (isSearchUrl(url)) { + m_urlNavigator->goHome(); + } else { + m_urlNavigator->setLocationUrl(url); + } + } + } +} + +bool DolphinViewContainer::isSearchModeEnabled() const +{ + return m_searchBox->isVisible(); +} + +void DolphinViewContainer::setUrl(const KUrl& newUrl) +{ + if (newUrl != m_urlNavigator->locationUrl()) { + m_urlNavigator->setLocationUrl(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()) { + emit writeStateChanged(false); + } + } +} + void DolphinViewContainer::showFilterBar(bool show) { Q_ASSERT(m_filterBar != 0); @@ -233,41 +281,77 @@ void DolphinViewContainer::showFilterBar(bool show) } } -bool DolphinViewContainer::isUrlEditable() const +void DolphinViewContainer::delayedStatusBarUpdate() { - return m_urlNavigator->isUrlEditable(); + 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::updateProgress(int percent) +void DolphinViewContainer::updateStatusBar() { - if (!m_showProgress) { - // Only show the directory loading progress if the status bar does - // not contain another progress information. This means that - // the directory loading progress information has the lowest priority. - const QString progressText(m_statusBar->progressText()); - const QString loadingText(i18nc("@info:progress", "Loading folder...")); - m_showProgress = progressText.isEmpty() || (progressText == loadingText); - if (m_showProgress) { - m_statusBar->setProgressText(loadingText); - m_statusBar->setProgress(0); - } + 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 + 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); + + m_statusBar->setDefaultText(newMessage); + + if (updateStatusBarMsg) { + m_statusBar->setMessage(newMessage, DolphinStatusBar::Default); } +} - if (m_showProgress) { - m_statusBar->setProgress(percent); +void DolphinViewContainer::initializeProgress() +{ + if (isSearchUrl(url())) { + // Search KIO-slaves usually don't provide any progress information. Give + // an immediate hint to the user that a searching is done: + updateStatusBar(); + m_statusBar->setProgressText(i18nc("@info", "Searching...")); + m_statusBar->setProgress(-1); + } + } + +void DolphinViewContainer::updateProgress(int percent) +{ + if (m_statusBar->progressText().isEmpty()) { + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); } + m_statusBar->setProgress(percent); } void DolphinViewContainer::slotDirListerCompleted() { - if (m_showProgress) { + if (!m_statusBar->progressText().isEmpty()) { m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); - m_showProgress = false; } - updateStatusBar(); - QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection); + if (isSearchUrl(url()) && (m_dirLister->items().count() == 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. @@ -276,19 +360,25 @@ void DolphinViewContainer::slotDirListerCompleted() // it is unclear whether writing is supported m_isFolderWritable = true; } else { - KonqFileItemCapabilities capabilities(KFileItemList() << item); + KFileItemListProperties capabilities(KFileItemList() << item); m_isFolderWritable = capabilities.supportsWriting(); } if (isActive()) { - m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + emit writeStateChanged(m_isFolderWritable); } } void DolphinViewContainer::showItemInfo(const KFileItem& item) { if (item.isNull()) { - m_statusBar->clear(); + // Only clear the status bar if unimportant messages are shown. + // This prevents that information- or error-messages get hidden + // by moving the mouse above the viewport or when closing the + // context menu. + if (m_statusBar->type() == DolphinStatusBar::Default) { + m_statusBar->clear(); + } } else { m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); } @@ -317,74 +407,45 @@ void DolphinViewContainer::closeFilterBar() emit showFilterBarChanged(false); } -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); - } -} - void DolphinViewContainer::setNameFilter(const QString& nameFilter) { m_view->setNameFilter(nameFilter); - updateStatusBar(); -} - -void DolphinViewContainer::openContextMenu(const KFileItem& item, - const KUrl& url, - const QList& customActions) -{ - DolphinContextMenu contextMenu(m_mainWindow, item, url); - contextMenu.setCustomActions(customActions); - contextMenu.open(); + delayedStatusBarUpdate(); } -void DolphinViewContainer::saveContentsPos(int x, int y) -{ - m_urlNavigator->savePosition(x, y); -} - -void DolphinViewContainer::restoreContentsPos() +void DolphinViewContainer::activate() { - if (!url().isEmpty()) { - const QPoint pos = m_urlNavigator->savedPosition(); - m_view->setContentsPosition(pos.x(), pos.y()); - } + setActive(true); } -void DolphinViewContainer::activate() +void DolphinViewContainer::saveViewState() { - setActive(true); + QByteArray locationState; + QDataStream stream(&locationState, QIODevice::WriteOnly); + m_view->saveState(stream); + m_urlNavigator->saveLocationState(locationState); } -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()) { + // 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); + } + + 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)) { @@ -396,24 +457,24 @@ void DolphinViewContainer::restoreView(const KUrl& url) const QString browser = config.readEntry("BrowserApplication"); if (!browser.isEmpty()) { app = browser; + if (app.startsWith('!')) { + // a literal command has been configured, remove the '!' prefix + app = app.mid(1); + } } } else { showErrorMessage(i18nc("@info:status", "Protocol not supported by Dolphin, Konqueror has been launched")); } - const QString command = app + ' ' + url.pathOrUrl(); + + const QString secureUrl = KShell::quoteArg(url.pathOrUrl()); + const QString command = app + ' ' + secureUrl; KRun::runCommand(command, app, app, this); } else { showErrorMessage(i18nc("@info:status", "Invalid protocol")); } } -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); @@ -424,7 +485,13 @@ 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); + m_urlNavigator->blockSignals(block); } @@ -433,6 +500,42 @@ void DolphinViewContainer::requestFocus() m_view->setFocus(); } +void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion) +{ + DolphinSettings& settings = DolphinSettings::instance(); + settings.generalSettings()->setUrlCompletionMode(completion); + settings.save(); +} + +void DolphinViewContainer::slotHistoryChanged() +{ + QByteArray locationState = m_urlNavigator->locationState(); + + if (!locationState.isEmpty()) { + QDataStream stream(&locationState, QIODevice::ReadOnly); + m_view->restoreState(stream); + } +} + +void DolphinViewContainer::startSearching(const QString &text) +{ + Q_UNUSED(text); + const KUrl url = m_searchBox->urlForSearching(); + if (url.isValid() && !url.isEmpty()) { + m_urlNavigator->setLocationUrl(url); + } +} + +void DolphinViewContainer::closeSearchBox() +{ + setSearchModeEnabled(false); +} + +bool DolphinViewContainer::isSearchUrl(const KUrl& url) const +{ + return url.protocol().contains("search"); +} + void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { KUrl url = item.targetUrl(); @@ -458,6 +561,16 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item) } } + if (item.mimetype() == "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(); }