kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the "Find File..." action from DolphinMainWindow to DolphinViewActionHandler, so that is used in DolphinPart and hence also in Konqueror. Thanks to Bram for the patch!

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

svn path=/trunk/KDE/kdebase/apps/; revision=826383
This commit is contained in:
Peter Penz 2008-06-30 16:37:08 +00:00
parent 823b033ab7
commit 3bc3ca1458
4 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dolphinmainwindow.cpp
View file

@ -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);

3
src/dolphinmainwindow.h
View file

@ -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();

14
src/dolphinviewactionhandler.cpp
View file

@ -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());
}

5
src/dolphinviewactionhandler.h
View file

@ -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.