Update name of the delete action in the .rc files

Summary:
Small regression in commit 68bb0ec22a. We need to use the new (standard)
name for the delete action, otherwise it won't be properly
enabled/disabled.

BUG: 378154
FIXED-IN: 17.03.90

Reviewers: emmanuelp

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

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 725320b28a528a6fad913356c2b60d6acff87095..01bd60009f1a5945c766ae73a435bbfe248385f1 100644 (file)
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">

-<kpartgui name="dolphinpart" version="11" translationDomain="dolphin">
+<kpartgui name="dolphinpart" version="12" translationDomain="dolphin">

  <MenuBar>
   <Menu name="edit"><text>&amp;Edit</text>
    <Action name="new_menu"/>
    <Separator/>
    <Action name="rename"/>
    <Action name="move_to_trash" />
  <MenuBar>
   <Menu name="edit"><text>&amp;Edit</text>
    <Action name="new_menu"/>
    <Separator/>
    <Action name="rename"/>
    <Action name="move_to_trash" />

-   <Action name="delete"/>
+   <Action name="deletefile"/>

    <Action name="editMimeType"/>
    <Action name="properties"/>
    <Separator/>
    <Action name="editMimeType"/>
    <Action name="properties"/>
    <Separator/>


@@ -53,14 +53,14 @@
 <State name="has_selection" >
   <enable>
    <Action name="move_to_trash" />
 <State name="has_selection" >
   <enable>
    <Action name="move_to_trash" />

-   <Action name="delete" />
+   <Action name="deletefile" />

   </enable>
  </State>
  <State name="has_no_selection" >
   <disable>
    <Action name="rename" />
    <Action name="move_to_trash" />
   </enable>
  </State>
  <State name="has_no_selection" >
   <disable>
    <Action name="rename" />
    <Action name="move_to_trash" />

-   <Action name="delete" />
+   <Action name="deletefile" />

   </disable>
 </State>
 </kpartgui>
   </disable>
 </State>
 </kpartgui>

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index c446656561d8b03e88dc7a862b3685ba095218c5..9354882468bc1507e4b2f1b362ed31b060777bbb 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">

-<kpartgui name="dolphin" version="14">
+<kpartgui name="dolphin" version="15">

     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />


@@ -10,7 +10,7 @@
             <Separator/>
             <Action name="rename" />
             <Action name="move_to_trash" />
             <Separator/>
             <Action name="rename" />
             <Action name="move_to_trash" />

-            <Action name="delete" />
+            <Action name="deletefile" />

             <Separator/>
             <Action name="properties" />
         </Menu>
             <Separator/>
             <Action name="properties" />
         </Menu>


@@ -58,7 +58,7 @@
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />

-            <Action name="delete" />
+            <Action name="deletefile" />

             <Action name="invert_selection" />
             <Separator/>
             <Action name="go_back" />
             <Action name="invert_selection" />
             <Separator/>
             <Action name="go_back" />


@@ -71,7 +71,7 @@
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />

-            <Action name="delete" />
+            <Action name="deletefile" />

             <Action name="invert_selection" />
         </enable>
     </State>
             <Action name="invert_selection" />
         </enable>
     </State>


@@ -81,7 +81,7 @@
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />
             <Action name="edit_copy" />
             <Action name="rename" />
             <Action name="move_to_trash" />

-            <Action name="delete" />
+            <Action name="deletefile" />

             <Action name="delete_shortcut" />
             <Action name="invert_selection" />
         </disable>
             <Action name="delete_shortcut" />
             <Action name="invert_selection" />
         </disable>