X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/36e89e9fa614cbc428ada94784147dca341d2fb7..4383f4238ee61668d82e45f08935a9b99892f16e:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e3f3a4d10..3c6d4c722 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -28,6 +28,7 @@
 #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"
@@ -52,6 +53,7 @@
 #include <kconfig.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>
+#include <kdualaction.h>
 #include <kfiledialog.h>
 #include <kfileplacesmodel.h>
 #include <kglobal.h>
@@ -114,7 +116,8 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_actionHandler(0),
     m_remoteEncoding(0),
     m_settingsDialog(0),
-    m_lastHandleUrlStatJob(0)
+    m_lastHandleUrlStatJob(0),
+    m_filterDockIsTemporaryVisible(false)
 {
     // Workaround for a X11-issue in combination with KModifierInfo
     // (see DolphinContextMenu::initializeModifierKeyInfo() for
@@ -569,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);
 }
 
@@ -919,7 +930,7 @@ void DolphinMainWindow::compareFiles()
     case 0: {
         Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
-        Q_ASSERT(urls.count() == 2);
+        Q_ASSERT(items.count() == 2);
         urlA = items[0].url();
         urlB = items[1].url();
         break;
@@ -1189,13 +1200,33 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
     newFileMenu()->setEnabled(isFolderWritable);
 }
 
+void DolphinMainWindow::slotSearchModeChanged(bool enabled)
+{
+    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);
-    const DolphinContextMenu::Command command = contextMenu.open();
+    QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, item, url);
+    contextMenu->setCustomActions(customActions);
+    const DolphinContextMenu::Command command = contextMenu->open();
 
     switch (command) {
     case DolphinContextMenu::OpenParentFolderInNewWindow: {
@@ -1213,6 +1244,8 @@ void DolphinMainWindow::openContextMenu(const KFileItem& item,
     default:
         break;
     }
+
+    delete contextMenu;
 }
 
 void DolphinMainWindow::init()
@@ -1487,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
@@ -1560,6 +1593,22 @@ void DolphinMainWindow::setupDockWidgets()
     connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
 
+    // 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->setIcon(KIcon("dialog-facet"));
+   addDockWidget(Qt::RightDockWidgetArea, filterDock);
+   connect(this, SIGNAL(urlChanged(KUrl)),
+           filterPanel, SLOT(setUrl(KUrl)));
+#endif
+
     // setup "Terminal"
 #ifndef Q_OS_WIN
     QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
@@ -1583,6 +1632,9 @@ void DolphinMainWindow::setupDockWidgets()
     if (firstRun) {
         infoDock->hide();
         foldersDock->hide();
+#ifdef HAVE_NEPOMUK
+        filterDock->hide();
+#endif
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #endif
@@ -1614,6 +1666,9 @@ void DolphinMainWindow::setupDockWidgets()
     panelsMenu->addAction(placesAction);
     panelsMenu->addAction(infoAction);
     panelsMenu->addAction(foldersAction);
+#ifdef HAVE_NEPOMUK
+    panelsMenu->addAction(filterAction);
+#endif
 #ifndef Q_OS_WIN
     panelsMenu->addAction(terminalAction);
 #endif
@@ -1716,6 +1771,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)),