Port to KStandardAction::RenameFile

It was introduced in kconfig(widgets) 5.25. Using the standard action
results in less code and no need to hardcode the F2 shortcut.

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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7ee9562ae4f82e38f6ed8a15c0bf8c80f561c98c..b297fb7fb5c4fb875f517d86df6c3622c4b0ccb1 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -392,8 +392,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     addSeparator();
 
     // Insert 'Rename'
-    QAction* renameAction = collection->action(QStringLiteral("rename"));
-    addAction(renameAction);
+    addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));
 
     // Insert 'Move to Trash' and/or 'Delete'
     if (properties.supportsDeleting()) {

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 47a249c6a1d9b8d80424fe830ef536f7a57f2e58..6701fbcfa7e97315c988b5ff8df4bf2400654a07 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1308,7 +1308,7 @@ void DolphinMainWindow::updateEditActions()
         stateChanged(QStringLiteral("has_selection"));
 
         KActionCollection* col = actionCollection();
-        QAction* renameAction      = col->action(QStringLiteral("rename"));
+        QAction* renameAction      = col->action(KStandardAction::name(KStandardAction::RenameFile));
         QAction* moveToTrashAction = col->action(KStandardAction::name(KStandardAction::MoveToTrash));
         QAction* deleteAction      = col->action(KStandardAction::name(KStandardAction::DeleteFile));
         QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0e771accba0e031dad132c840283527ab1faa4c8..c3862509664c64599a333f39c110af709e69582b 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -253,7 +253,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
     const bool hasSelection = !selection.isEmpty();
 
-    QAction* renameAction  = actionCollection()->action(QStringLiteral("rename"));
+    QAction* renameAction  = actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile));
     QAction* moveToTrashAction = actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash));
     QAction* deleteAction = actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile));
     QAction* editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType"));
@@ -447,7 +447,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         }
 
         if (supportsMoving) {
-            editActions.append(actionCollection()->action(QStringLiteral("rename")));
+            editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile)));
         }
 
         // Normally KonqPopupMenu only shows the "Create new" submenu in the current view

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 6d38cc3deda48718dadd24defa566c19665243a8..149fa198a4acfd785a56c9391a91df4b86349d6d 100644 (file)
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -1,10 +1,10 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphinpart" version="13" translationDomain="dolphin">
+<kpartgui name="dolphinpart" version="14" translationDomain="dolphin">
  <MenuBar>
   <Menu name="edit"><text>&amp;Edit</text>
    <Action name="new_menu"/>
    <Separator/>
-   <Action name="rename"/>
+   <Action name="renamefile"/>
    <Action name="movetotrash" />
    <Action name="deletefile"/>
    <Action name="editMimeType"/>
@@ -58,7 +58,7 @@
  </State>
  <State name="has_no_selection" >
   <disable>
-   <Action name="rename" />
+   <Action name="renamefile" />
    <Action name="movetotrash" />
    <Action name="deletefile" />
   </disable>

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index a8e6436b6711efc8334bafb6ed13c0eb542aed8b..f2ef106597c8f83682f7a3eb21931563e689eb3a 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="16">
+<kpartgui name="dolphin" version="17">
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
@@ -8,7 +8,7 @@
             <Action name="close_tab" />
            <Action name="undo_close_tab" />
             <Separator/>
-            <Action name="rename" />
+            <Action name="renamefile" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
             <Separator/>
@@ -56,7 +56,7 @@
             <Action name="edit_redo" />
             <Action name="edit_cut" />
             <Action name="edit_copy" />
-            <Action name="rename" />
+            <Action name="renamefile" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
             <Action name="invert_selection" />
@@ -69,7 +69,7 @@
         <enable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />
-            <Action name="rename" />
+            <Action name="renamefile" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
             <Action name="invert_selection" />
@@ -79,7 +79,7 @@
         <disable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />
-            <Action name="rename" />
+            <Action name="renamefile" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
             <Action name="delete_shortcut" />

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 5f98577b1852c99b7a79d7d9e1875d23e68be14b..538fd8a5166daba2ccc296b23ecf6dee7fc77a82 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -107,11 +107,7 @@ void DolphinViewActionHandler::createActions()
 
     // File menu
 
-    QAction* rename = m_actionCollection->addAction(QStringLiteral("rename"));
-    rename->setText(i18nc("@action:inmenu File", "Rename..."));
-    m_actionCollection->setDefaultShortcut(rename, Qt::Key_F2);
-    rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
-    connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename);
+    KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection);
 
     KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
     KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);