]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinmainwindow.cpp
Move "Filter"-action to the bottom and apply icon + shortcut
[dolphin.git] / src / dolphinmainwindow.cpp
index fb248c24c581d5330383714dae022c46c83abad6..54e6d8b6c39394bff578547e006c4d7dea2146b9 100644 (file)
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinremoteencoding.h"
 
 #include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-#include "search/dolphinsearchoptionsconfigurator.h"
-#endif
 
 #include "dolphinapplication.h"
 #include "dolphincontextmenu.h"
-#include "dolphinnewmenu.h"
-#include "search/dolphinsearchbox.h"
-#include "settings/dolphinsettings.h"
-#include "settings/dolphinsettingsdialog.h"
+#include "dolphinnewfilemenu.h"
 #include "dolphinviewcontainer.h"
+#include "mainwindowadaptor.h"
+#include "panels/filter/filterpanel.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
-#include "mainwindowadaptor.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"
 
 #ifndef Q_OS_WIN
 #include "panels/terminal/terminalpanel.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "draganddrophelper.h"
 
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kactionmenu.h>
 #include <kconfig.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>
+#include <kdualaction.h>
 #include <kfiledialog.h>
 #include <kfileplacesmodel.h>
 #include <kglobal.h>
@@ -106,24 +105,25 @@ Q_DECLARE_METATYPE(ClosedTab)
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
-    m_newMenu(0),
+    m_newFileMenu(0),
     m_showMenuBar(0),
     m_tabBar(0),
     m_activeViewContainer(0),
     m_centralWidgetLayout(0),
-    m_searchBox(0),
-#ifdef HAVE_NEPOMUK
-    m_searchOptionsConfigurator(0),
-#endif
     m_id(id),
     m_tabIndex(0),
     m_viewTab(),
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_settingsDialog(0),
-    m_captionStatJob(0),
-    m_lastHandleUrlStatJob(0)
+    m_lastHandleUrlStatJob(0),
+    m_filterDockIsTemporaryVisible(false)
 {
+    // Workaround for a X11-issue in combination with KModifierInfo
+    // (see DolphinContextMenu::initializeModifierKeyInfo() for
+    // more information):
+    DolphinContextMenu::initializeModifierKeyInfo();
+
     setObjectName("Dolphin#");
 
     m_viewTab.append(ViewTab());
@@ -342,15 +342,6 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     emit selectionChanged(selection);
 }
 
-void DolphinMainWindow::slotWheelMoved(int wheelDelta)
-{
-    if (wheelDelta > 0) {
-        activatePrevTab();
-    } else {
-        activateNextTab();
-    }
-}
-
 void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
 {
     emit requestItemInfo(item);
@@ -387,12 +378,18 @@ void DolphinMainWindow::openNewMainWindow()
 
 void DolphinMainWindow::openNewTab()
 {
+    const bool isUrlEditable =  m_activeViewContainer->urlNavigator()->isUrlEditable();
+
     openNewTab(m_activeViewContainer->url());
     m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
 
+    // The URL navigator of the new tab should have the same editable state
+    // as the current tab
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
-    if (navigator->isUrlEditable()) {
-        // if a new tab is opened and the URL is editable, assure that
+    navigator->setUrlEditable(isUrlEditable);
+
+    if (isUrlEditable) {
+        // If a new tab is opened and the URL is editable, assure that
         // the user can edit the URL without manually setting the focus
         navigator->setFocus();
     }
@@ -468,17 +465,27 @@ void DolphinMainWindow::activatePrevTab()
 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-    if ((list.count() == 1) && list[0].isDir()) {
-        openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);
+    if (list.isEmpty()) {
+        openNewTab(m_activeViewContainer->url());
+    } else if ((list.count() == 1) && list[0].isDir()) {
+        openNewTab(list[0].url());
     }
 }
 
 void DolphinMainWindow::openInNewWindow()
 {
+    KUrl newWindowUrl;
+
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-    if ((list.count() == 1) && list[0].isDir()) {
+    if (list.isEmpty()) {
+        newWindowUrl = m_activeViewContainer->url();
+    } else if ((list.count() == 1) && list[0].isDir()) {
+        newWindowUrl = list[0].url();
+    }
+
+    if (!newWindowUrl.isEmpty()) {
         DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
-        window->changeUrl(m_activeViewContainer->view()->selectedUrls()[0]);
+        window->changeUrl(newWindowUrl);
         window->show();
     }
 }
@@ -529,7 +536,6 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         dialog->setCaption(i18nc("@title:window", "Confirmation"));
         dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
         dialog->setModal(true);
-        dialog->showButtonSeparator(true);
         dialog->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit());
         dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")));
         dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel());
@@ -566,6 +572,14 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     settings.save();
 
+    if (m_filterDockIsTemporaryVisible) {
+        QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
+        if (filterDock != 0) {
+            filterDock->hide();
+        }
+        m_filterDockIsTemporaryVisible = false;
+    }
+
     KXmlGuiWindow::closeEvent(event);
 }
 
@@ -632,16 +646,16 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
 
 void DolphinMainWindow::updateNewMenu()
 {
-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->checkUpToDate();
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
 }
 
 void DolphinMainWindow::createDirectory()
 {
-    m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
-    m_newMenu->setPopupFiles(activeViewContainer()->url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+    m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+    m_newFileMenu->createDirectory();
 }
 
 void DolphinMainWindow::quit()
@@ -724,6 +738,11 @@ void DolphinMainWindow::paste()
     m_activeViewContainer->view()->paste();
 }
 
+void DolphinMainWindow::find()
+{
+    m_activeViewContainer->setSearchModeEnabled(true);
+}
+
 void DolphinMainWindow::updatePasteAction()
 {
     QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
@@ -793,6 +812,17 @@ void DolphinMainWindow::reloadView()
 
 void DolphinMainWindow::stopLoading()
 {
+    m_activeViewContainer->view()->stopLoading();
+}
+
+void DolphinMainWindow::enableStopAction()
+{
+    actionCollection()->action("stop")->setEnabled(true);
+}
+
+void DolphinMainWindow::disableStopAction()
+{
+    actionCollection()->action("stop")->setEnabled(false);
 }
 
 void DolphinMainWindow::toggleFilterBarVisibility(bool show)
@@ -824,7 +854,15 @@ void DolphinMainWindow::replaceLocation()
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
-    m_activeViewContainer->urlNavigator()->goBack();
+    
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->goBack();
+    
+    if (urlNavigator->locationState().isEmpty()) {
+        // An empty location state indicates a redirection URL,
+        // which must be skipped too
+        urlNavigator->goBack();       
+    }
 }
 
 void DolphinMainWindow::goForward()
@@ -885,30 +923,31 @@ void DolphinMainWindow::compareFiles()
 
     KUrl urlA;
     KUrl urlB;
-    KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();
 
-    switch (urls.count()) {
+    KFileItemList items = m_viewTab[m_tabIndex].primaryView->view()->selectedItems();
+
+    switch (items.count()) {
     case 0: {
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
-        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
-        Q_ASSERT(urls.count() == 2);
-        urlA = urls[0];
-        urlB = urls[1];
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+        Q_ASSERT(items.count() == 2);
+        urlA = items[0].url();
+        urlB = items[1].url();
         break;
     }
 
     case 1: {
-        urlA = urls[0];
+        urlA = items[0].url();
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
-        urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
-        Q_ASSERT(urls.count() == 1);
-        urlB = urls[0];
+        items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+        Q_ASSERT(items.count() == 1);
+        urlB = items[0].url();
         break;
     }
 
     case 2: {
-        urlA = urls[0];
-        urlB = urls[1];
+        urlA = items[0].url();
+        urlB = items[1].url();
         break;
     }
 
@@ -952,7 +991,7 @@ void DolphinMainWindow::openTerminal()
 void DolphinMainWindow::editSettings()
 {
     if (m_settingsDialog == 0) {
-        const KUrl& url = activeViewContainer()->url();
+        const KUrl url = activeViewContainer()->url();
         m_settingsDialog = new DolphinSettingsDialog(url, this);
         m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
         m_settingsDialog->show();
@@ -1116,21 +1155,6 @@ void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& can
     canDecode = KUrl::List::canDecode(event->mimeData());
 }
 
-void DolphinMainWindow::searchItems()
-{
-#ifdef HAVE_NEPOMUK
-    const KUrl nepomukSearchUrl = m_searchOptionsConfigurator->nepomukSearchUrl();
-    m_activeViewContainer->setUrl(nepomukSearchUrl);
-#endif
-}
-
-void DolphinMainWindow::showSearchOptions()
-{
-#ifdef HAVE_NEPOMUK
-    m_searchOptionsConfigurator->show();
-#endif
-}
-
 void DolphinMainWindow::handleUrl(const KUrl& url)
 {
     delete m_lastHandleUrlStatJob;
@@ -1171,26 +1195,57 @@ void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
     }
 }
 
-void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
+void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 {
-    m_captionStatJob = 0;
-    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
-    const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
-    setCaption(name);
+    newFileMenu()->setEnabled(isFolderWritable);
 }
 
-void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
+void DolphinMainWindow::slotSearchModeChanged(bool enabled)
 {
-    newMenu()->setEnabled(isFolderWritable);
+    QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
+    if (filterDock == 0) {
+        return;
+    }
+
+    if (enabled) {
+        if (!filterDock->isVisible()) {
+            m_filterDockIsTemporaryVisible = true;
+        }
+        filterDock->show();
+    } else {
+        if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
+            filterDock->hide();
+        }
+        m_filterDockIsTemporaryVisible = false;
+    }
 }
 
 void DolphinMainWindow::openContextMenu(const KFileItem& item,
                                         const KUrl& url,
                                         const QList<QAction*>& customActions)
 {
-    DolphinContextMenu contextMenu(this, item, url);
-    contextMenu.setCustomActions(customActions);
-    contextMenu.open();
+    QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, item, url);
+    contextMenu->setCustomActions(customActions);
+    const DolphinContextMenu::Command command = contextMenu->open();
+
+    switch (command) {
+    case DolphinContextMenu::OpenParentFolderInNewWindow: {
+        DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+        window->changeUrl(item.url().upUrl());
+        window->show();
+        break;
+    }
+
+    case DolphinContextMenu::OpenParentFolderInNewTab:
+        openNewTab(item.url().upUrl());
+        break;
+
+    case DolphinContextMenu::None:
+    default:
+        break;
+    }
+
+    delete contextMenu;
 }
 
 void DolphinMainWindow::init()
@@ -1212,7 +1267,7 @@ void DolphinMainWindow::init()
 
     setupActions();
 
-    const KUrl& homeUrl = generalSettings->homeUrl();
+    const KUrl homeUrl(generalSettings->homeUrl());
     setUrlAsCaption(homeUrl);
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
@@ -1232,14 +1287,6 @@ void DolphinMainWindow::init()
     connect(this, SIGNAL(urlChanged(const KUrl&)),
             m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
 
-#ifdef HAVE_NEPOMUK
-    m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this);
-    m_searchOptionsConfigurator->hide();
-    connect(m_searchOptionsConfigurator, SIGNAL(searchOptionsChanged()),
-            this, SLOT(searchItems()));
-    connect(this, SIGNAL(urlChanged(KUrl)), m_searchOptionsConfigurator, SLOT(setDirectory(KUrl)));
-#endif
-
     m_tabBar = new KTabBar(this);
     m_tabBar->setMovable(true);
     m_tabBar->setTabsClosable(true);
@@ -1253,8 +1300,6 @@ void DolphinMainWindow::init()
             this, SLOT(openNewTab()));
     connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
             this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
-    connect(m_tabBar, SIGNAL(wheelDelta(int)),
-            this, SLOT(slotWheelMoved(int)));
     connect(m_tabBar, SIGNAL(mouseMiddleClick(int)),
             this, SLOT(closeTab(int)));
     connect(m_tabBar, SIGNAL(tabMoved(int, int)),
@@ -1268,9 +1313,6 @@ void DolphinMainWindow::init()
     m_centralWidgetLayout = new QVBoxLayout(centralWidget);
     m_centralWidgetLayout->setSpacing(0);
     m_centralWidgetLayout->setMargin(0);
-#ifdef HAVE_NEPOMUK
-    m_centralWidgetLayout->addWidget(m_searchOptionsConfigurator);
-#endif
     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
 
@@ -1279,28 +1321,18 @@ void DolphinMainWindow::init()
     emit urlChanged(homeUrl);
 
     setupGUI(Keys | Save | Create | ToolBar);
-
-    m_searchBox->setParent(toolBar("searchToolBar"));
-    m_searchBox->show();
-    connect(m_searchBox, SIGNAL(requestSearchOptions()),
-            this, SLOT(showSearchOptions()));
-#ifdef HAVE_NEPOMUK
-    connect(m_searchBox, SIGNAL(searchTextChanged(QString)),
-            m_searchOptionsConfigurator, SLOT(setCustomSearchQuery(QString)));
-#endif
-
     stateChanged("new_file");
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
-    updatePasteAction();
-    updateGoActions();
 
     if (generalSettings->splitView()) {
         toggleSplitView();
     }
+    updateEditActions();
     updateViewActions();
+    updateGoActions();
 
     QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
     showFilterBarAction->setChecked(generalSettings->filterBar());
@@ -1339,9 +1371,9 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     updateViewActions();
     updateGoActions();
 
-    const KUrl& url = m_activeViewContainer->url();
+    const KUrl url = m_activeViewContainer->url();
     setUrlAsCaption(url);
-    if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab.count() > 1) {
         m_tabBar->setTabText(m_tabIndex, tabName(url));
         m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
     }
@@ -1352,8 +1384,8 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newMenu = new DolphinNewMenu(this, this);
-    KMenu* menu = m_newMenu->menu();
+    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
@@ -1398,6 +1430,8 @@ void DolphinMainWindow::setupActions()
     // due to the long text, the text "Paste" is used:
     paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
 
+    KStandardAction::find(this, SLOT(find()), actionCollection());
+
     KAction* selectAll = actionCollection()->addAction("select_all");
     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
@@ -1467,11 +1501,6 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
-    KToggleAction* showSearchBar = actionCollection()->add<KToggleAction>("show_search_bar");
-    showSearchBar->setText(i18nc("@action:inmenu Tools", "Show Search Bar"));
-    showSearchBar->setShortcut(Qt::CTRL | Qt::Key_S);
-    connect(showSearchBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
-
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setIcon(KIcon("view-filter"));
@@ -1491,7 +1520,7 @@ void DolphinMainWindow::setupActions()
     connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
 
     // setup 'Settings' menu
-    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
+    m_showMenuBar = KStandardAction::showHideMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
@@ -1523,16 +1552,6 @@ void DolphinMainWindow::setupActions()
     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
     openInNewWindow->setIcon(KIcon("window-new"));
     connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
-
-    // 'Search' toolbar
-    m_searchBox = new DolphinSearchBox(this);
-    connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(searchItems()));
-
-    KAction* search = new KAction(this);
-    actionCollection()->addAction("search_bar", search);
-    search->setText(i18nc("@action:inmenu", "Search Bar"));
-    search->setDefaultWidget(m_searchBox);
-    search->setShortcutConfigurable(false);
 }
 
 void DolphinMainWindow::setupDockWidgets()
@@ -1545,12 +1564,9 @@ void DolphinMainWindow::setupDockWidgets()
     connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
     infoDock->setWidget(infoPanel);
 
-    KAction* infoAction = new KAction(this);
-    infoAction->setText(i18nc("@title:window", "Information"));
-    infoAction->setShortcut(Qt::Key_F11);
+    QAction* infoAction = infoDock->toggleViewAction();
     infoAction->setIcon(KIcon("dialog-information"));
-    actionCollection()->addAction("show_info_panel", infoAction);
-    connect(infoAction, SIGNAL(triggered()), infoDock->toggleViewAction(), SLOT(trigger()));
+    infoAction->setShortcut(Qt::Key_F11);
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
@@ -1567,12 +1583,9 @@ void DolphinMainWindow::setupDockWidgets()
     FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
     foldersDock->setWidget(foldersPanel);
 
-    KAction* foldersAction = new KAction(this);
-    foldersAction->setText(i18nc("@title:window", "Folders"));
+    QAction* foldersAction = foldersDock->toggleViewAction();
     foldersAction->setShortcut(Qt::Key_F7);
     foldersAction->setIcon(KIcon("folder"));
-    actionCollection()->addAction("show_folders_panel", foldersAction);
-    connect(foldersAction, SIGNAL(triggered()), foldersDock->toggleViewAction(), SLOT(trigger()));
 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
@@ -1590,23 +1603,41 @@ void DolphinMainWindow::setupDockWidgets()
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
 
-    KAction* terminalAction = new KAction(this);
-    terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
+    QAction* terminalAction = terminalDock->toggleViewAction();
     terminalAction->setShortcut(Qt::Key_F4);
     terminalAction->setIcon(KIcon("utilities-terminal"));
-    actionCollection()->addAction("show_terminal_panel", terminalAction);
-    connect(terminalAction, SIGNAL(triggered()), terminalDock->toggleViewAction(), SLOT(trigger()));
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalPanel, SLOT(setUrl(KUrl)));
 #endif
 
+    // setup "Filter"
+#ifdef HAVE_NEPOMUK
+    QDockWidget* filterDock = new QDockWidget(i18nc("@title:window", "Filter"));
+    filterDock->setObjectName("filterDock");
+    filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    Panel* filterPanel = new FilterPanel(filterDock);
+    connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+    filterDock->setWidget(filterPanel);
+
+    QAction* filterAction = filterDock->toggleViewAction();
+    filterAction->setShortcut(Qt::Key_F12);
+    filterAction->setIcon(KIcon("view-filter"));
+    addDockWidget(Qt::RightDockWidgetArea, filterDock);
+    connect(this, SIGNAL(urlChanged(KUrl)),
+           filterPanel, SLOT(setUrl(KUrl)));
+#endif
+
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
+        infoDock->hide();
         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
+#endif
+#ifdef HAVE_NEPOMUK
+        filterDock->hide();
 #endif
     }
 
@@ -1620,18 +1651,28 @@ void DolphinMainWindow::setupDockWidgets()
     placesPanel->setModel(DolphinSettings::instance().placesModel());
     placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-    KAction* placesAction = new KAction(this);
-    placesAction->setText(i18nc("@title:window", "Places"));
+    QAction* placesAction = placesDock->toggleViewAction();
     placesAction->setShortcut(Qt::Key_F9);
     placesAction->setIcon(KIcon("bookmarks"));
-    actionCollection()->addAction("show_places_panel", placesAction);
-    connect(placesAction, SIGNAL(triggered()), placesDock->toggleViewAction(), SLOT(trigger()));
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
     connect(this, SIGNAL(urlChanged(KUrl)),
             placesPanel, SLOT(setUrl(KUrl)));
+
+    KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
+    actionCollection()->addAction("panels", panelsMenu);
+    panelsMenu->setDelayed(false);
+    panelsMenu->addAction(placesAction);
+    panelsMenu->addAction(infoAction);
+    panelsMenu->addAction(foldersAction);
+#ifndef Q_OS_WIN
+    panelsMenu->addAction(terminalAction);
+#endif
+#ifdef HAVE_NEPOMUK
+    panelsMenu->addAction(filterAction);
+#endif
 }
 
 void DolphinMainWindow::updateEditActions()
@@ -1678,7 +1719,7 @@ void DolphinMainWindow::updateViewActions()
 void DolphinMainWindow::updateGoActions()
 {
     QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
-    const KUrl& currentUrl = m_activeViewContainer->url();
+    const KUrl currentUrl = m_activeViewContainer->url();
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
@@ -1731,6 +1772,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(updateFilterBarAction(bool)));
     connect(container, SIGNAL(writeStateChanged(bool)),
             this, SLOT(slotWriteStateChanged(bool)));
+    connect(container, SIGNAL(searchModeChanged(bool)),
+            this, SLOT(slotSearchModeChanged(bool)));
 
     DolphinView* view = container->view();
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
@@ -1743,6 +1786,10 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, SLOT(openNewTab(const KUrl&)));
     connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
             this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));
+    connect(view, SIGNAL(startedPathLoading(KUrl)),
+            this, SLOT(enableStopAction()));
+    connect(view, SIGNAL(finishedPathLoading(KUrl)),
+            this, SLOT(disableStopAction()));
 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
@@ -1828,26 +1875,18 @@ QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) co
 
 void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
 {
-    delete m_captionStatJob;
-    m_captionStatJob = 0;
-
-    if (url.protocol() == QLatin1String("file")) {
-        QString caption;
-        if (url.equals(KUrl("file:///"))) {
-            caption = '/';
-        } else {
-            caption = url.fileName();
-            if (caption.isEmpty()) {
-                caption = url.protocol();
-            }
+    QString caption;
+    if (!url.isLocalFile()) {
+        caption.append(url.protocol() + " - ");
+        if (url.hasHost()) {
+            caption.append(url.host() + " - ");
         }
-
-        setCaption(caption);
-    } else {
-        m_captionStatJob = KIO::stat(url, KIO::HideProgressInfo);
-        connect(m_captionStatJob, SIGNAL(result(KJob*)),
-                this, SLOT(slotCaptionStatFinished(KJob*)));
     }
+
+    const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
+    caption.append(fileName);
+
+    setCaption(caption);
 }
 
 QString DolphinMainWindow::squeezedText(const QString& text) const