revert fix for bug 167044 - although the crash is fixed the autoscroll does not work...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 46937fe1a50f477997fd953b0efbb94e5b05e57a..cebf34e2ad6d7c470e46b465882f0c31289e3f25 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -61,18 +61,17 @@
 #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>
 
@@ -353,17 +352,6 @@ void DolphinMainWindow::updateNewMenu()
     m_newMenu->setPopupFiles(activeViewContainer()->url());
 }
 
-void DolphinMainWindow::properties()
-{
-    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-
-    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-    dialog->raise();
-    dialog->activateWindow();
-}
-
 void DolphinMainWindow::quit()
 {
     close();
@@ -584,11 +572,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
@@ -916,11 +899,6 @@ void DolphinMainWindow::setupActions()
     connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));
     actionCollection()->addAction("close_tab", closeTab);
 
-    KAction* properties = actionCollection()->addAction("properties");
-    properties->setText(i18nc("@action:inmenu File", "Properties"));
-    properties->setShortcut(Qt::ALT | Qt::Key_Return);
-    connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
-
     KStandardAction::quit(this, SLOT(quit()), actionCollection());
 
     // setup 'Edit' menu
@@ -988,12 +966,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);