After creating an item with the "Create New..." menu, the new item should get selecte...

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 6d735b587c10d5eb1c6f4eb41f93865c6622c70b..748856275990f429ceafe00da7f4078cb45d8797 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,8 +19,9 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
+#include "zoomlevelinfo.h"
 
 #include <konq_operations.h>
 
@@ -74,6 +75,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
@@ -81,6 +83,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");
@@ -110,6 +113,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()));
 
@@ -150,7 +154,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");
@@ -159,7 +163,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"));
@@ -495,12 +499,12 @@ void DolphinViewActionHandler::slotZoomLevelChanged(int level)
 {
     QAction* zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn));
     if (zoomInAction != 0) {
-        zoomInAction->setEnabled(level < m_currentView->zoomLevelMaximum());
+        zoomInAction->setEnabled(level < ZoomLevelInfo::maximumLevel());
     }
 
     QAction* zoomOutAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomOut));
     if (zoomOutAction != 0) {
-        zoomOutAction->setEnabled(level > m_currentView->zoomLevelMinimum());
+        zoomOutAction->setEnabled(level > ZoomLevelInfo::minimumLevel());
     }
 }
 
@@ -519,7 +523,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()