From ecdb0c3f58229bc9e87699b85838eec0aeb1ef39 Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sun, 28 Oct 2012 20:12:04 +0100
Subject: Extended/Completed Frank's commit
 7ca682fe903d6abfc44e2f26878e19ddc48b5633.

* Implemented Rename-Inline-Option in Settings Dialog
* Re-enable renaming items with the rename dialog in Folderview-Panel

BUG: 306705
REVIEW: 107072
---
 src/panels/folders/folderspanel.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/panels/folders/folderspanel.cpp')

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 13093fff6..6e3a7678f 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -24,6 +24,7 @@
 #include "treeviewcontextmenu.h"
 #include "foldersitemlistwidget.h"
 
+#include <views/renamedialog.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kfileitemlistwidget.h>
@@ -90,8 +91,16 @@ bool FoldersPanel::autoScrolling() const
 
 void FoldersPanel::rename(const KFileItem& item)
 {
-    const int index = m_model->index(item);
-    m_controller->view()->editRole(index, "text");
+    if (GeneralSettings::renameInline()) {
+        const int index = m_model->index(item);
+        m_controller->view()->editRole(index, "text");
+    } else {
+        RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        dialog->raise();
+        dialog->activateWindow();
+    }
 }
 
 bool FoldersPanel::urlChanged()
-- 
cgit v1.3