SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinui.rc

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index e1bb9ee58daa0ad0c8b2f556a1a7358d96a4ce6b..3e6e4c463034e4ec100188a0f623eedc7da619f3 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,6 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="29">
+<?xml version="1.0"?>
+<!DOCTYPE gui SYSTEM "kpartgui.dtd">
+<gui name="dolphin" version="46">
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
@@ -11,6 +12,7 @@
             <Action name="add_to_places" />
             <Separator/>
             <Action name="renamefile" />
+            <Action name="duplicate" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
             <Separator/>
@@ -19,6 +21,19 @@
             <Action name="properties" />
         </Menu>
         <Menu name="edit">
+            <Action name="edit_undo" />
+            <Separator />
+            <Action name="edit_cut" />
+            <Action name="edit_copy" />
+            <Action name="copy_location" />
+            <Action name="edit_paste" />
+            <Separator />
+            <Action name="show_filter_bar" />
+            <Action name="edit_find" />
+            <Separator />
+            <Action name="toggle_selection_mode" />
+            <Action name="copy_to_inactive_split_view" />
+            <Action name="move_to_inactive_split_view" />
             <Action name="edit_select_all" />
             <Action name="invert_selection" />
         </Menu>
@@ -33,8 +48,10 @@
             <Action name="show_preview" />
             <Action name="show_in_groups" />
             <Action name="show_hidden_files" />
+            <Action name="act_as_admin" />
             <Separator/>
-            <Action name="split_view" />
+            <Action name="split_view_menu" />
+            <Action name="popout_split_view" />
             <Action name="split_stash" />
             <Action name="redisplay" />
             <Action name="stop" />
@@ -53,10 +70,10 @@
             <Action name="closed_tabs" />
         </Menu>
         <Menu name="tools">
-            <Action name="show_filter_bar" />
             <Action name="open_preferred_search_tool" />
             <Action name="open_terminal" />
-            <Action name="focus_terminal_panel"/>
+            <Action name="open_terminal_here" />
+            <Action name="manage_disk_space" />
             <Action name="compare_files" />
             <Action name="change_remote_encoding" />
         </Menu>
@@ -66,7 +83,6 @@
             <Action name="edit_undo" />
             <Action name="edit_redo" />
             <Action name="edit_cut" />
-            <Action name="edit_copy" />
             <Action name="renamefile" />
             <Action name="movetotrash" />
             <Action name="deletefile" />
@@ -78,21 +94,11 @@
     </State>
     <State name="has_selection" >
         <enable>
-            <Action name="edit_cut" />
-            <Action name="edit_copy" />
-            <Action name="renamefile" />
-            <Action name="movetotrash" />
-            <Action name="deletefile" />
             <Action name="invert_selection" />
         </enable>
     </State>
     <State name="has_no_selection" >
         <disable>
-            <Action name="edit_cut" />
-            <Action name="edit_copy" />
-            <Action name="renamefile" />
-            <Action name="movetotrash" />
-            <Action name="deletefile" />
             <Action name="delete_shortcut" />
             <Action name="invert_selection" />
         </disable>
@@ -101,16 +107,12 @@
         <text context="@title:menu">Main Toolbar</text>
         <Action name="go_back" />
         <Action name="go_forward" />
-        <Separator name="separator_1" />
-        <Action name="icons" />
-        <Action name="compact" />
-        <Action name="details" />
-        <Separator name="separator_0" />
-        <Action name="sort" />
-        <Spacer name="spacer_0" />
+        <Action name="view_settings" />
+        <Action name="url_navigators" />
         <Action name="split_view" />
         <Action name="split_stash" />
         <Action name="toggle_search" />
+        <Action name="hamburger_menu" />
     </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>
@@ -121,6 +123,8 @@
         <Action priority="0" name="icons"/>
         <Action priority="0" name="compact"/>
         <Action priority="0" name="details"/>
+        <Action priority="0" name="view_mode" />
+        <Action priority="0" name="view_settings" />
         <Action priority="0" name="view_zoom_in"/>
         <Action priority="0" name="view_zoom_reset"/>
         <Action priority="0" name="view_zoom_out"/>
@@ -128,5 +132,6 @@
         <Action priority="0" name="edit_copy"/>
         <Action priority="0" name="edit_paste"/>
         <Action priority="0" name="toggle_search"/>
+        <Action priority="0" name="toggle_filter"/>
     </ActionProperties>
-</kpartgui>
+</gui>