respect the inline-renaming setting also for the Folder Panel (= treeview)

svn path=/trunk/KDE/kdebase/apps/; revision=824946

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index f15ac0c6e1d51da4192fe4f1d604fc059dd91056..db2366689e88eda455ee551d4680af689f8e8203 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -31,7 +31,6 @@
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 
-#include "renamedialog.h"
 #include "treeviewsidebarpage.h"
 
 #include <QtGui/QApplication>
@@ -152,17 +151,7 @@ void TreeViewContextMenu::paste()
 
 void TreeViewContextMenu::rename()
 {
-    KFileItemList item;
-    item.append(m_fileInfo);
-    RenameDialog dialog(m_parent, item);
-    if (dialog.exec() == QDialog::Accepted) {
-        const QString& newName = dialog.newName();
-        if (!newName.isEmpty()) {
-            KUrl newUrl = m_fileInfo.url();
-            newUrl.setFileName(newName);
-            KonqOperations::rename(m_parent, m_fileInfo.url(), newUrl);
-        }
-    }
+    m_parent->rename(m_fileInfo);
 }
 
 void TreeViewContextMenu::moveToTrash()

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index d5f5f40532a284f9933d35c68a90a5d766648170..8258fbfc8d390b3896edde13937e693324220524 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -24,12 +24,15 @@
 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
+#include "dolphin_generalsettings.h"
+#include "renamedialog.h"
 #include "sidebartreeview.h"
 #include "treeviewcontextmenu.h"
 
 #include <kfileplacesmodel.h>
 #include <kdirlister.h>
 #include <kfileitem.h>
+#include <konq_operations.h>
 
 #include <QApplication>
 #include <QItemSelection>
@@ -81,6 +84,28 @@ bool TreeViewSidebarPage::showHiddenFiles() const
     return FoldersPanelSettings::showHiddenFiles();
 }
 
+
+void TreeViewSidebarPage::rename(const KFileItem& item)
+{
+    if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        m_treeView->edit(proxyIndex);
+    } else {
+        KFileItemList items;
+        items.append(item);
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Accepted) {
+            const QString& newName = dialog.newName();
+            if (!newName.isEmpty()) {
+                KUrl newUrl = item.url();
+                newUrl.setFileName(newName);
+                KonqOperations::rename(this, item.url(), newUrl);
+            }
+        }
+    }
+}
+
 void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
     if (!url.isValid() || (url == SidebarPage::url())) {

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index ba820ff20c0e4632ce4de84b06805f2442b325af..6bc0ae6c3a44e856bdafc49e360d73dad1ad375f 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -51,6 +51,8 @@ public:
     void setShowHiddenFiles(bool show);
     bool showHiddenFiles() const;
 
+    void rename(const KFileItem& item);
+
 signals:
     /**
      * Is emitted if the an URL change is requested.