X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4ad4d4785cb1ad88351711de0ec0c1f0e4e5185a..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index da7466947..86aefe959 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "dolphinviewcontainer.h" -#include +#include #include #include @@ -27,25 +27,23 @@ #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 "dolphin_generalsettings.h" #include "dolphinmainwindow.h" @@ -55,8 +53,6 @@ #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" @@ -66,7 +62,6 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : QWidget(parent), - m_isFolderWritable(false), m_topLayout(0), m_urlNavigator(0), m_searchBox(0), @@ -74,9 +69,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) + m_statusBarTimestamp() { hide(); @@ -105,55 +98,23 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : 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); - m_dirLister->setMainWindow(window()); - m_dirLister->setDelayedMimeTypes(true); - - m_dolphinModel = new DolphinModel(this); - 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(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(newItems(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(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(redirection(KUrl, KUrl)), - this, SLOT(redirect(KUrl, KUrl))); - connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), - this, SLOT(delayedStatusBarUpdate())); + m_view = new DolphinView(url, this); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const 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(const QString&)), this, SLOT(showErrorMessage(const QString&))); + connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(itemTriggered(KFileItem)), this, SLOT(slotItemTriggered(KFileItem))); + connect(m_view, SIGNAL(redirection(KUrl, KUrl)), this, SLOT(redirect(KUrl, KUrl))); + connect(m_view, SIGNAL(startedPathLoading(KUrl)), this, SLOT(slotStartedPathLoading())); + connect(m_view, SIGNAL(finishedPathLoading(KUrl)), this, SLOT(slotFinishedPathLoading())); + connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(delayedStatusBarUpdate())); + connect(m_view, SIGNAL(pathLoadingProgress(int)), this, SLOT(updateProgress(int))); + connect(m_view, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); + connect(m_view, SIGNAL(urlIsFileError(const KUrl&)), this, SLOT(openFile(const KUrl&))); + connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), this, SLOT(delayedStatusBarUpdate())); + connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), this, SLOT(showOperationCompletedMessage(const QString&))); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&))); @@ -164,6 +125,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : // 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); @@ -206,9 +169,6 @@ void DolphinViewContainer::setActive(bool active) { m_urlNavigator->setActive(active); m_view->setActive(active); - if (active) { - emit writeStateChanged(m_isFolderWritable); - } } bool DolphinViewContainer::isActive() const @@ -219,6 +179,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(); } @@ -230,14 +200,33 @@ bool DolphinViewContainer::isFilterBarVisible() const void DolphinViewContainer::setSearchModeEnabled(bool enabled) { + 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) { - // 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. @@ -250,6 +239,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) } } } + + emit searchModeChanged(enabled); } bool DolphinViewContainer::isSearchModeEnabled() const @@ -261,21 +252,16 @@ 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) +void DolphinViewContainer::setFilterBarVisible(bool visible) { Q_ASSERT(m_filterBar != 0); - if (show) { + if (visible) { m_filterBar->show(); + m_filterBar->setFocus(); + m_filterBar->selectAll(); } else { closeFilterBar(); } @@ -319,54 +305,44 @@ void DolphinViewContainer::updateStatusBar() } } -void DolphinViewContainer::initializeProgress() +void DolphinViewContainer::updateProgress(int percent) +{ + if (m_statusBar->progressText().isEmpty()) { + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); + } + m_statusBar->setProgress(percent); +} + +void DolphinViewContainer::slotStartedPathLoading() { 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: + // 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. + updateProgress(-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() +void DolphinViewContainer::slotFinishedPathLoading() { if (!m_statusBar->progressText().isEmpty()) { m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); } - if (isSearchUrl(url()) && (m_dirLister->items().count() == 0)) { + if (isSearchUrl(url()) && (m_view->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. - 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(); - } - - if (isActive()) { - emit writeStateChanged(m_isFolderWritable); - } } void DolphinViewContainer::showItemInfo(const KFileItem& item) @@ -429,17 +405,7 @@ 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() && !isSearchUrl(url)) { @@ -491,6 +457,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); } @@ -531,9 +498,15 @@ void DolphinViewContainer::closeSearchBox() setSearchModeEnabled(false); } +void DolphinViewContainer::stopLoading() +{ + m_view->stopLoading(); +} + 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) @@ -576,9 +549,6 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item) void DolphinViewContainer::openFile(const KUrl& url) { - // 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); }