#include <kprotocolmanager.h>
#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
#include <QtGui/QKeyEvent>
#include <QtGui/QItemSelection>
#include <QtGui/QBoxLayout>
#include <QtCore/QTimer>
#include <QtGui/QScrollBar>
+#include <kdesktopfile.h>
#include <kfileitemdelegate.h>
#include <kfileplacesmodel.h>
#include <kglobalsettings.h>
#include <kurlnavigator.h>
#include <krun.h>
-#include "dolphinmodel.h"
-#include "dolphincolumnview.h"
-#include "dolphincontroller.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 "statusbar/dolphinstatusbar.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_isFolderWritable(false),
- m_mainWindow(mainWindow),
m_topLayout(0),
m_urlNavigator(0),
+ m_searchBox(0),
m_view(0),
m_filterBar(0),
m_statusBar(0),
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)));
+
m_dirLister = new DolphinDirLister();
m_dirLister->setAutoUpdate(true);
m_dirLister->setMainWindow(window());
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<QAction*>&)),
- this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));
- 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(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);
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&)),
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 = 0; // deleted by m_dolphinModel
}
-void DolphinViewContainer::setUrl(const KUrl& newUrl)
-{
- 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_urlNavigator->locationUrl();
}
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);
}
}
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() && !isSearchUrl(url)) {
+ m_urlNavigator->setLocationUrl(url);
+ } else {
+ m_urlNavigator->goHome();
+ }
+ }
+}
+
+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);
}
}
-bool DolphinViewContainer::isUrlEditable() const
-{
- return m_urlNavigator->isUrlEditable();
-}
-
void DolphinViewContainer::delayedStatusBarUpdate()
{
// Invoke updateStatusBar() with a small delay. This assures that
|| (m_statusBar->type() == DolphinStatusBar::Information))
&& (m_statusBar->progress() == 100);
- const QString text(m_view->statusBarText());
+ const QString text = m_view->statusBarText();
m_statusBar->setDefaultText(text);
if (updateStatusBarMsg) {
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);
}
if (isActive()) {
- m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+ emit writeStateChanged(m_isFolderWritable);
}
}
delayedStatusBarUpdate();
}
-void DolphinViewContainer::openContextMenu(const KFileItem& item,
- const KUrl& url,
- const QList<QAction*>& customActions)
-{
- DolphinContextMenu contextMenu(m_mainWindow, item, url);
- contextMenu.setCustomActions(customActions);
- contextMenu.open();
-}
-
-void DolphinViewContainer::saveContentsPos(int x, int y)
+void DolphinViewContainer::activate()
{
- // 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);
+ 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());
+ // 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()) {
// 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)) {
}
}
-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);
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);
}
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::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();
}
}
+ 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();
}
projects / dolphin.git / blobdiff