Make RenameDialog modal again.

Summary:
The rename dialog used to be modal, but commit
828ba8902ce16819a385832b487e60eab36e54ca changed the behavior without
really explaining why.

Test Plan: disable inline renaming and rename something.

Reviewers: #vdg, ngraham

Reviewed By: #vdg, ngraham

Subscribers: ngraham, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D17621

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 7a0b4b6b245b88beb31ba1053eef49e23532dba4..c98a2150cf8fdec26afd3586f14ed6fe8de13f6b 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -105,9 +105,7 @@ void FoldersPanel::rename(const KFileItem& item)
         m_controller->view()->editRole(index, "text");
     } else {
         RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);
-        dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
+        dialog->open();
     }
 }
 

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 617c41acecfa6e48cd02cbcff357eb20893f02ec..e3a986e118e5b9a7787020642e575505cc78849d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -638,9 +638,7 @@ void DolphinView::renameSelectedItems()
         RenameDialog* dialog = new RenameDialog(this, items);
         connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished);
 
-        dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
+        dialog->open();
     }
 
     // Assure that the current index remains visible when KFileItemModel