* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 6d735b587c10d5eb1c6f4eb41f93865c6622c70b..45603c28682fc59d06157f2f87ad332f5c8468f1 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,8 +19,9 @@
 
 #include "dolphinviewactionhandler.h"
 
 
 #include "dolphinviewactionhandler.h"
 

-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"

 #include "dolphinview.h"
 #include "dolphinview.h"

+#include "zoomlevelinfo.h"

 
 #include <konq_operations.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);
     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
     connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir()));
 
     // Edit menu


@@ -159,7 +161,7 @@ void DolphinViewActionHandler::createActions()
 
     // Tools menu
 
 
     // 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"));
     findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));


@@ -495,12 +497,12 @@ void DolphinViewActionHandler::slotZoomLevelChanged(int level)
 {
     QAction* zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn));
     if (zoomInAction != 0) {
 {
     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) {
     }
 
     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 +521,7 @@ void DolphinViewActionHandler::slotAdjustViewProperties()
 
 void DolphinViewActionHandler::slotFindFile()
 {
 
 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()
 }
 
 void DolphinViewActionHandler::slotProperties()