diff options
| author | Elvis Angelaccio <[email protected]> | 2017-03-29 13:37:02 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2017-03-29 19:07:44 +0200 |
| commit | d8282e929468dccb60d95da65483631c6556b937 (patch) | |
| tree | c6dcf6d32444e56f186a7955e060364f2a7b6655 | |
| parent | 4de29ad90dc626febc1cda52c714d2e72d336238 (diff) | |
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
| -rw-r--r-- | src/dolphinpart.rc | 8 | ||||
| -rw-r--r-- | src/dolphinui.rc | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc index 725320b28..01bd60009 100644 --- a/src/dolphinpart.rc +++ b/src/dolphinpart.rc @@ -1,12 +1,12 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="dolphinpart" version="11" translationDomain="dolphin"> +<kpartgui name="dolphinpart" version="12" translationDomain="dolphin"> <MenuBar> <Menu name="edit"><text>&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/> @@ -53,14 +53,14 @@ <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" /> - <Action name="delete" /> + <Action name="deletefile" /> </disable> </State> </kpartgui> diff --git a/src/dolphinui.rc b/src/dolphinui.rc index c44665656..935488246 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="dolphin" version="14"> +<kpartgui name="dolphin" version="15"> <MenuBar> <Menu name="file"> <Action name="new_menu" /> @@ -10,7 +10,7 @@ <Separator/> <Action name="rename" /> <Action name="move_to_trash" /> - <Action name="delete" /> + <Action name="deletefile" /> <Separator/> <Action name="properties" /> </Menu> @@ -58,7 +58,7 @@ <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" /> @@ -71,7 +71,7 @@ <Action name="edit_copy" /> <Action name="rename" /> <Action name="move_to_trash" /> - <Action name="delete" /> + <Action name="deletefile" /> <Action name="invert_selection" /> </enable> </State> @@ -81,7 +81,7 @@ <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> |