From fa255857a05f1408fe1e1df8bc7c377a3058f655 Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Wed, 12 Sep 2012 21:13:26 +0200
Subject: Re-enable renaming items with the rename dialog

User feedback has shown that many users used the dialog for renaming
files. Since the dialog is still used when renaming multiple files, I
think there is no good reason not to use it for renaming single files
as well if the user wants.

Note that we cannot add an option in the settings dialog due to string
freeze issues. For the time being, you will have to add the line
"RenameInline=false" to the [General] section of
$KDEHOME/share/config/dolphinrc.

BUG: 304627
FIXED-IN: 4.9.2
---
 src/settings/dolphin_generalsettings.kcfg | 4 ++++
 src/views/dolphinview.cpp                 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 9f261dc5f..050750199 100644
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -52,6 +52,10 @@
             <label>Ask for confirmation when closing windows with multiple tabs.</label>
             <default>true</default>
         </entry>
+        <entry name="RenameInline" type="Bool">
+            <label>Rename inline</label>
+            <default>true</default>
+        </entry>
         <entry name="ShowSelectionToggle" type="Bool">
             <label>Show selection toggle</label>
             <default>true</default>
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 72ccb8372..b5dba04ad 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -635,7 +635,7 @@ void DolphinView::renameSelectedItems()
          return;
      }
 
-     if (items.count() == 1) {
+     if (items.count() == 1 && GeneralSettings::renameInline()) {
          const int index = m_model->index(items.first());
          m_view->editRole(index, "text");
      } else {
-- 
cgit v1.3