From 97da051c21a5cc845ceac8a23a0809c84cca7eda Mon Sep 17 00:00:00 2001
From: John Balcaen <mikala@mageia.org>
Date: Sat, 24 Dec 2011 09:06:32 +0000
Subject: Update dolphin toolbar configuration for kde 4.8

---
 .../common/share/apps/dolphin/dolphinui.rc         | 75 ++++++++++------------
 1 file changed, 33 insertions(+), 42 deletions(-)

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

diff --git a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
index ea7e9d1..b9b9ca3 100644
--- a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
+++ b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc
@@ -1,40 +1,24 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="14" name="dolphin">
+<kpartgui name="dolphin" version="14">
     <MenuBar>
         <Menu name="file">
-	  <text>&amp;File</text>
-            <Action name="create_new"/>
-            <Action name="new_window"/>
-            <Action name="new_tab"/>
-            <Action name="close_tab"/>
+            <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="file_quit"/>
+            <Action name="properties" />
         </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">
-	  <text>&amp;View</text>
-	    <Action name="view_zoom_in" />
-	    <Action name="view_zoom_out" />
-	    <Separator weakSeparator="1" />
-	    <Action name="view_mode" />
+            <Action name="view_mode" />
             <Action name="sort" />
             <Action name="additional_info" />
             <Action name="show_preview" />
@@ -46,7 +30,7 @@
             <Action name="stop" />
             <Separator/>
             <Action name="panels" />
-            <Menu name="navigation_bar">
+            <Menu name="location_bar">
                 <text context="@title:menu">Location Bar</text>
                 <Action name="editable_location" />
                 <Action name="replace_location" />
@@ -55,24 +39,16 @@
             <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">
-	  <text>&amp;Tools</text>
-	 <Action name="show_filter_bar" />
-	 <Action name="open_terminal" />
-	 <Action name="compare_files" />
-	 <Action name="change_remote_encoding" />    
+            <Action name="show_filter_bar" />
+            <Action name="open_terminal" />
+            <Action name="compare_files" />
+            <Action name="change_remote_encoding" />
         </Menu>
-	
     </MenuBar>
-    <State name="new_file">
+    <State name="new_file" >
         <disable>
             <Action name="edit_undo" />
             <Action name="edit_redo" />
@@ -108,6 +84,21 @@
             <Action name="invert_selection" />
         </disable>
     </State>
+    <ToolBar noMerge="1" name="mainToolBar" >
+        <text context="@title:menu">Main Toolbar</text>
+        <Action name="go_home" />
+        <Action name="go_back" />
+        <Action name="go_forward" />
+        <Action name="go_up" />
+        <Separator name="separator_1" />
+        <Action name="icons" />
+        <Action name="compact" />
+        <Action name="details" />
+        <Separator name="separator_0" />
+        <Action name="edit_find"/>
+        <Action name="show_preview" />
+        <Action name="split_view" />
+    </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>
         <Action priority="0" name="go_forward"/>
@@ -115,12 +106,12 @@
         <Action priority="0" name="go_home"/>
         <Action priority="0" name="stop"/>
         <Action priority="0" name="icons"/>
+        <Action priority="0" name="compact"/>
         <Action priority="0" name="details"/>
-        <Action priority="0" name="columns"/>
         <Action priority="0" name="view_zoom_in"/>
         <Action priority="0" name="view_zoom_out"/>
         <Action priority="0" name="edit_cut"/>
         <Action priority="0" name="edit_copy"/>
         <Action priority="0" name="edit_paste"/>
-    </ActionProperties>  
+    </ActionProperties>
 </kpartgui>
-- 
cgit v1.2.1