SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 99054387af998a7d4dc6c1ca01f95c7d7a905628..404c6eae095a54c2a9d01c8d3decbb5edc8269d6 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,10 +19,9 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
-
 #include <konq_operations.h>
 
 #include <kaction.h>
@@ -32,6 +31,7 @@
 #include <krun.h>
 #include <kpropertiesdialog.h>
 
+
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
       m_actionCollection(collection),
@@ -68,6 +68,11 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
             this, SLOT(slotZoomLevelChanged(int)));
 }
 
+DolphinView* DolphinViewActionHandler::currentView()
+{
+    return m_currentView;
+}
+
 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
@@ -75,6 +80,7 @@ void DolphinViewActionHandler::createActions()
     KAction* newDirAction = m_actionCollection->addAction("create_dir");
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
+    newDirAction->setIcon(KIcon("folder-new"));
     connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir()));
 
     // Edit menu
@@ -82,6 +88,7 @@ void DolphinViewActionHandler::createActions()
     KAction* rename = m_actionCollection->addAction("rename");
     rename->setText(i18nc("@action:inmenu File", "Rename..."));
     rename->setShortcut(Qt::Key_F2);
+    rename->setIcon(KIcon("edit-rename"));
     connect(rename, SIGNAL(triggered()), this, SLOT(slotRename()));
 
     KAction* moveToTrash = m_actionCollection->addAction("move_to_trash");
@@ -111,6 +118,7 @@ void DolphinViewActionHandler::createActions()
     KAction *propertiesAction = m_actionCollection->addAction( "properties" );
     // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :)
     propertiesAction->setText( i18nc("@action:inmenu File", "Properties") );
+    propertiesAction->setIcon(KIcon("document-properties"));
     propertiesAction->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 
@@ -151,7 +159,7 @@ void DolphinViewActionHandler::createActions()
 
     KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
-    showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
+    showHiddenFiles->setShortcuts(QList<QKeySequence>() << Qt::ALT + Qt::Key_Period << Qt::Key_F8);
     connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
 
     KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
@@ -160,7 +168,7 @@ void DolphinViewActionHandler::createActions()
 
     // Tools menu
 
-    QAction* findFile = m_actionCollection->addAction("find_file");
+    KAction* 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"));
@@ -337,6 +345,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const
     return QString(); // can't happen
 }
 
+KActionCollection* DolphinViewActionHandler::actionCollection()
+{
+    return m_actionCollection;
+}
+
 void DolphinViewActionHandler::updateViewActions()
 {
     QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName());
@@ -520,7 +533,7 @@ void DolphinViewActionHandler::slotAdjustViewProperties()
 
 void DolphinViewActionHandler::slotFindFile()
 {
-    KRun::run("kfind", m_currentView->url(), m_currentView->window());
+    KRun::run("kfind %u", m_currentView->url(), m_currentView->window());
 }
 
 void DolphinViewActionHandler::slotProperties()