fixed wrong logic for showing the space info: if the progress bar is shown, the space...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 46937fe1a50f477997fd953b0efbb94e5b05e57a..37b835622c27ee5c406a9d5d5b3aa88d3dc6d9ce 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -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>
 
@@ -355,9 +355,15 @@ void DolphinMainWindow::updateNewMenu()
 
 void DolphinMainWindow::properties()
 {
+    KPropertiesDialog* dialog = 0;
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if (list.isEmpty()) {
+        const KUrl url = activeViewContainer()->url();
+        dialog = new KPropertiesDialog(url, this);
+    } else {
+        dialog = new KPropertiesDialog(list, this);
+    }
 
-    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->show();
     dialog->raise();
@@ -584,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
@@ -988,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);