X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/adde3d4e3cd21d35be78c6a827b4b69a05d6e10c..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 8f934d163..86aefe959 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "dolphinviewcontainer.h" -#include +#include #include #include @@ -27,23 +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 "dolphin_generalsettings.h" #include "dolphinmainwindow.h" @@ -53,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" @@ -71,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(); @@ -102,59 +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); - - // TODO: In the case of the column view the directory lister changes. Let the DolphinView - // inform the container about this information for KDE SC 4.7 - 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(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())); - connect(m_view, SIGNAL(startedPathLoading(KUrl)), - this, SLOT(slotStartedPathLoading())); - connect(m_view, SIGNAL(finishedPathLoading(KUrl)), - this, SLOT(slotFinishedPathLoading())); - connect(m_view, SIGNAL(writeStateChanged(bool)), - this, SIGNAL(writeStateChanged(bool))); + 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&))); @@ -241,6 +201,10 @@ bool DolphinViewContainer::isFilterBarVisible() const void DolphinViewContainer::setSearchModeEnabled(bool enabled) { if (enabled == isSearchModeEnabled()) { + if (enabled && !m_searchBox->hasFocus()) { + m_searchBox->setFocus(); + m_searchBox->selectAll(); + } return; } @@ -297,6 +261,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible) if (visible) { m_filterBar->show(); m_filterBar->setFocus(); + m_filterBar->selectAll(); } else { closeFilterBar(); } @@ -371,7 +336,7 @@ void DolphinViewContainer::slotFinishedPathLoading() 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); @@ -584,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); }