Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinpart.rc

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 2e3f63e5c39b1e14bb2b729e3e56eeb2bf61b430..893d6c831ae7927b249c92cfb560cf3cc26cb479 100644 (file)
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -1,47 +1,35 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphinpart" version="6" >
+<kpartgui name="dolphinpart" version="10" >
  <MenuBar>
-  <Menu name="edit">
+  <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="editMimeType"/>
    <Action name="properties"/>
-   <Separator />
-   <Action name="select_all" />
-   <Action name="invert_selection" />
-  </Menu>
-  <Menu name="view">
-   <Menu name="sort">
-    <text context="@title:menu">Sort By</text>
-    <Action name="sort_by_name" />
-    <Action name="sort_by_size" />
-    <Action name="sort_by_date" />
-    <Action name="sort_by_permissions" />
-    <Action name="sort_by_owner" />
-    <Action name="sort_by_group" />
-    <Action name="sort_by_type" />
-    <Action name="sort_by_rating" />
-    <Action name="sort_by_tags" />
+   <Separator/>
+   <Menu name="selection">
+    <text context="@title:menu">Selection</text>
+    <Action name="select_items_matching" />
+    <Action name="unselect_items_matching" />
     <Separator/>
-    <Action name="descending" />
-   </Menu>
-   <Menu name="additional_info">
-    <text context="@title:menu">Additional Information</text>
-    <Action name="show_size_info" />
-    <Action name="show_date_info" />
-    <Action name="show_permissions_info" />
-    <Action name="show_owner_info" />
-    <Action name="show_group_info" />
-    <Action name="show_mime_info" />
+    <Action name="select_all" />
+    <Action name="unselect_all" />
+    <Action name="invert_selection" />
    </Menu>
+  </Menu>
+  <Menu name="view"><text>&amp;View</text>
+   <Action name="sort" />
+   <Action name="additional_info" />
    <Action name="show_preview" />
    <Action name="show_in_groups" />
    <Action name="show_hidden_files" />
    <Separator/>
    <Action name="view_properties" />
   </Menu>
-  <Menu name="go">
+  <Menu name="go"><text>&amp;Go</text>
     <Action name="go_applications"/>
     <Action name="go_network_folders"/>
     <Action name="go_settings"/>
@@ -49,22 +37,23 @@
     <Action name="go_trash"/>
     <Action name="go_autostart"/>
   </Menu>
-  <Menu name="tools">
+  <Menu name="tools"><text context="@title:menu">Tools</text>
+    <Action name="open_terminal"/>
     <Action name="find_file" />
     <Action name="show_filter_bar" />
     <Action name="compare_files" />
+    <Action name="change_remote_encoding" />
   </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar"><text context="@title:menu">Dolphin Toolbar</text>
   <Action name="icons" />
+  <Action name="compact" />
   <Action name="details" />
-  <Action name="columns" />
 </ToolBar>
 <State name="has_selection" >
   <enable>
    <Action name="move_to_trash" />
    <Action name="delete" />
-   <Action name="properties" />
   </enable>
  </State>
  <State name="has_no_selection" >
@@ -72,7 +61,6 @@
    <Action name="rename" />
    <Action name="move_to_trash" />
    <Action name="delete" />
-   <Action name="properties" />
   </disable>
 </State>
 </kpartgui>