Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinui.rc

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 52826bb43a1a7556ddca433262caaab8b0235924..282ea63e5f2a0f74dbec5ced091cdbf66d949e97 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,32 +1,36 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">

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

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

-            <Action name="new_window" />
+            <Action name="file_new" />

             <Action name="new_tab" />
             <Action name="new_tab" />

-            <Action name="close_tab" />
+            <Action name="file_close" />
+           <Action name="undo_close_tab" />

             <Separator/>
             <Separator/>

-            <Action name="rename" />
-            <Action name="move_to_trash" />
-            <Action name="delete" />
+            <Action name="renamefile" />
+            <Action name="movetotrash" />
+            <Action name="deletefile" />
+            <Separator/>
+            <Action name="show_target" />

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

-            <Action name="select_all" />
+            <Action name="edit_select_all" />

             <Action name="invert_selection" />
         </Menu>
         <Menu name="view">
             <Action name="invert_selection" />
         </Menu>
         <Menu name="view">

-            <Action name="view_mode" />

             <Action name="sort" />
             <Action name="sort" />

+            <Action name="view_mode" />

             <Action name="additional_info" />
             <Action name="show_preview" />
             <Action name="show_in_groups" />
             <Action name="show_hidden_files" />
             <Separator/>
             <Action name="split_view" />
             <Action name="additional_info" />
             <Action name="show_preview" />
             <Action name="show_in_groups" />
             <Action name="show_hidden_files" />
             <Separator/>
             <Action name="split_view" />

-            <Action name="reload" />
+            <Action name="split_stash" />
+            <Action name="redisplay" />

             <Action name="stop" />
             <Separator/>
             <Action name="panels" />
             <Action name="stop" />
             <Separator/>
             <Action name="panels" />


@@ -54,9 +58,9 @@
             <Action name="edit_redo" />
             <Action name="edit_cut" />
             <Action name="edit_copy" />
             <Action name="edit_redo" />
             <Action name="edit_cut" />
             <Action name="edit_copy" />

-            <Action name="rename" />
-            <Action name="move_to_trash" />
-            <Action name="delete" />
+            <Action name="renamefile" />
+            <Action name="movetotrash" />
+            <Action name="deletefile" />

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


@@ -67,9 +71,9 @@
         <enable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />
         <enable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />

-            <Action name="rename" />
-            <Action name="move_to_trash" />
-            <Action name="delete" />
+            <Action name="renamefile" />
+            <Action name="movetotrash" />
+            <Action name="deletefile" />

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


@@ -77,9 +81,9 @@
         <disable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />
         <disable>
             <Action name="edit_cut" />
             <Action name="edit_copy" />

-            <Action name="rename" />
-            <Action name="move_to_trash" />
-            <Action name="delete" />
+            <Action name="renamefile" />
+            <Action name="movetotrash" />
+            <Action name="deletefile" />

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


@@ -96,6 +100,7 @@
         <Action name="edit_find"/>
         <Action name="show_preview" />
         <Action name="split_view" />
         <Action name="edit_find"/>
         <Action name="show_preview" />
         <Action name="split_view" />

+        <Action name="split_stash" />

     </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>
     </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>