From 89def84e0ce8fd774e6245093c3615fe7d704d09 Mon Sep 17 00:00:00 2001
From: John Balcaen <mikala@mageia.org>
Date: Sat, 30 Jul 2011 02:18:31 +0000
Subject: Sync dolphinuirc with 4.7

---
 .../common/share/apps/dolphin/dolphinui.rc         | 65 +++++++++++-----------
 1 file changed, 31 insertions(+), 34 deletions(-)

(limited to 'kde4-profiles/common/share/apps')

diff --git a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
index 932c2df..ea7e9d1 100644
--- a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
+++ b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
@@ -1,32 +1,40 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="13">
+<kpartgui version="14" name="dolphin">
     <MenuBar>
         <Menu name="file">
-            <Action name="create_new" />
-            <Action name="new_window" />
-            <Action name="new_tab" />
-            <Action name="close_tab" />
+	  <text>&amp;File</text>
+            <Action name="create_new"/>
+            <Action name="new_window"/>
+            <Action name="new_tab"/>
+            <Action name="close_tab"/>
             <Separator/>
-            <Action name="rename" />
-            <Action name="move_to_trash" />
-            <Action name="delete" />
+            <Action name="rename"/>
+            <Action name="move_to_trash"/>
+            <Action name="delete"/>
             <Separator/>
-            <Action name="properties" />
-            <Separator weakSeparator="1" />
+            <Action name="properties"/>
+            <Separator weakSeparator="1"/>
             <Action name="file_quit"/>
         </Menu>
         <Menu name="edit">
+	  <text>&amp;Edit</text>
             <Action name="edit_undo" />
             <Separator weakSeparator="1" />
             <Action name="edit_cut" />
             <Action name="edit_copy" />
             <Action name="edit_paste" />
             <Separator weakSeparator="1" />
+	    <action name="edit_find"/>
+	    <Separator weakSeparator="1" />
             <Action name="select_all" />
             <Action name="invert_selection" />
         </Menu>
         <Menu name="view">
-            <Action name="view_mode" />
+	  <text>&amp;View</text>
+	    <Action name="view_zoom_in" />
+	    <Action name="view_zoom_out" />
+	    <Separator weakSeparator="1" />
+	    <Action name="view_mode" />
             <Action name="sort" />
             <Action name="additional_info" />
             <Action name="show_preview" />
@@ -47,15 +55,22 @@
             <Action name="view_properties" />
         </Menu>
         <Menu name="go">
+	  <text>&amp;Go</text>
+	  <Action name="go_up" />
+	  <Action name="go_back" />
+	  <Action name="go_forward" />
+	  <Action name="go_home" />
+	  <Separator weakSeparator="1"/>
             <Action name="closed_tabs" />
         </Menu>
         <Menu name="tools">
-            <Action name="find_file"/>
-            <Action name="show_filter_bar" />
-            <Action name="open_terminal" />
-            <Action name="compare_files" />
-            <Action name="change_remote_encoding" />
+	  <text>&amp;Tools</text>
+	 <Action name="show_filter_bar" />
+	 <Action name="open_terminal" />
+	 <Action name="compare_files" />
+	 <Action name="change_remote_encoding" />    
         </Menu>
+	
     </MenuBar>
     <State name="new_file">
         <disable>
@@ -80,7 +95,6 @@
             <Action name="move_to_trash" />
             <Action name="delete" />
             <Action name="invert_selection" />
-            <Action name="nepomuk_annotate" />
         </enable>
     </State>
     <State name="has_no_selection" >
@@ -92,25 +106,8 @@
             <Action name="delete" />
             <Action name="delete_shortcut" />
             <Action name="invert_selection" />
-            <Action name="nepomuk_annotate" />
         </disable>
     </State>
-    <ToolBar noMerge="1" name="mainToolBar" >
-        <text context="@title:menu">Main Toolbar</text>
-        <Action name="go_back" />
-        <Action name="go_forward" />
-        <Action name="go_up" />
-        <Separator name="separator_1" />
-        <Action name="icons" />
-        <Action name="details" />
-        <Action name="columns" />
-        <Separator name="separator_0" />
-        <Action name="edit_find"/>
-        <Action name="show_preview" />
-        <Action name="split_view" />
-        <Separator name="separator_2" />
-        <Action name="nepomuk_annotate" />
-    </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>
         <Action priority="0" name="go_forward"/>
-- 
cgit v1.2.1