Move the "Find File..." action from DolphinMainWindow to DolphinViewActionHandler...

CCMAIL: bramschoenmakers@kde.nl
CCMAIL: faure@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=826383

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 6822250e1706b4becaff9795694b26821e50c04f..37b835622c27ee5c406a9d5d5b3aa88d3dc6d9ce 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -61,18 +61,18 @@
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kurlnavigator.h>
 #include <konq_fileitemcapabilities.h>
 #include <konqmimedata.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
-#include <ktoggleaction.h>
 #include <krun.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstandardaction.h>
 #include <ktabbar.h>
+#include <ktoggleaction.h>
+#include <kurlnavigator.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 
@@ -590,11 +590,6 @@ void DolphinMainWindow::goHome()
     m_activeViewContainer->urlNavigator()->goHome();
 }
 
-void DolphinMainWindow::findFile()
-{
-    KRun::run("kfind", m_activeViewContainer->url(), this);
-}
-
 void DolphinMainWindow::compareFiles()
 {
     // The method is only invoked if exactly 2 files have
@@ -994,12 +989,6 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
-    QAction* findFile = actionCollection()->addAction("find_file");
-    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
-    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
-    findFile->setIcon(KIcon("edit-find"));
-    connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
-
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index db8034139876310055742ed308d6bf38ac1032b9..ce6dc660632cdd611f36a8ff4cb477482a5d25de 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -266,9 +266,6 @@ private slots:
     /** Goes to the home URL. */
     void goHome();
 
-    /** Opens KFind for the current shown directory. */
-    void findFile();
-
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index b606c33ea3007ed4a30e00a727a020ad8b457218..3c42ff1aecfc98e7c23ec59ea78462fd05b24d40 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -28,6 +28,7 @@
 #include <kactioncollection.h>
 #include <klocale.h>
 #include <ktoggleaction.h>
+#include <krun.h>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
@@ -146,6 +147,14 @@ void DolphinViewActionHandler::createActions()
     KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
     adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
     connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(slotAdjustViewProperties()));
+
+    // Tools menu
+
+    QAction* findFile = m_actionCollection->addAction("find_file");
+    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
+    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
+    findFile->setIcon(KIcon("edit-find"));
+    connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
@@ -492,3 +501,8 @@ void DolphinViewActionHandler::slotAdjustViewProperties()
     ViewPropertiesDialog dlg(m_currentView);
     dlg.exec();
 }
+
+void DolphinViewActionHandler::slotFindFile()
+{
+    KRun::run("kfind", m_currentView->url(), m_currentView->window());
+}

diff --git a/src/dolphinviewactionhandler.h b/src/dolphinviewactionhandler.h
index 4cc63b86ae46a596d3501783f243e0a9a65869f3..5c13299a1b7a5dfd4c3c208b57d4908edaeb64d1 100644 (file)
--- a/src/dolphinviewactionhandler.h
+++ b/src/dolphinviewactionhandler.h
@@ -173,6 +173,11 @@ private Q_SLOTS:
      */
     void slotAdjustViewProperties();
 
+    /**
+     * Opens the Find File dialog for the currently shown directory.
+     */
+    void slotFindFile();
+
 private:
     /**
      * Create all the actions.