#include <krun.h>
#include "dolphin_generalsettings.h"
-#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphinviewcontroller.h"
#include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphindetailsview.h"
-#include "dolphiniconsview.h"
-#include "draganddrophelper.h"
-#include "filterbar.h"
+#include "filterbar/filterbar.h"
+#include "search/dolphinsearchbox.h"
#include "settings/dolphinsettings.h"
#include "statusbar/dolphinstatusbar.h"
-#include "viewmodecontroller.h"
-#include "viewproperties.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_isFolderWritable(false),
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)
{
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);
m_dirLister->setMainWindow(window());
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);
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&)),
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);
+
+ setSearchModeEnabled(isSearchUrl(url));
}
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
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()) {
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);
}
}
void DolphinViewContainer::initializeProgress()
{
- if (url().protocol() == "nepomuksearch") {
- // The Nepomuk IO-slave does not provide any progress information. Give
+ 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);
}
m_statusBar->setProgress(100);
}
- if ((url().protocol() == "nepomuksearch") && (m_dirLister->items().count() == 0)) {
+ 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);
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);
+ }
+
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. 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)) {
Q_UNUSED(oldUrl);
const bool block = m_urlNavigator->signalsBlocked();
m_urlNavigator->blockSignals(true);
+
+ // 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);
}
}
}
+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();
projects / dolphin.git / blobdiff