diff options
author | John Balcaen <mikala@mageia.org> | 2011-03-11 17:01:55 +0000 |
---|---|---|
committer | John Balcaen <mikala@mageia.org> | 2011-03-11 17:01:55 +0000 |
commit | d13385df307f763129c3264e6c6d834d9cff73f2 (patch) | |
tree | 84c89fed71fab960f717b8e67ec57e893c6a8dec | |
parent | 1f23d6ad9547149a72efeed97f1c36b3bbd874e8 (diff) | |
download | config-d13385df307f763129c3264e6c6d834d9cff73f2.tar config-d13385df307f763129c3264e6c6d834d9cff73f2.tar.gz config-d13385df307f763129c3264e6c6d834d9cff73f2.tar.bz2 config-d13385df307f763129c3264e6c6d834d9cff73f2.tar.xz config-d13385df307f763129c3264e6c6d834d9cff73f2.zip |
Changes in dolphinui.rc:
- Add the ActionProperties from upstream
- Edit_find was added in previous commit back in mainToolBar
- Since edit_find is added, drop the searchToolBar
- Remove the Menu settings configuration (there's no changes from upstream except that the disable maintoolbar is at bottom of the menu)
- Move <State ..> under </MenuBar> (in order to ease diff with upstream dolphinui.rc)
- Use upstream Go menu (we don't add more data so let's use upstream configuration here)
-rw-r--r-- | kde4-profiles/common/share/apps/dolphin/dolphinui.rc | 125 |
1 files changed, 60 insertions, 65 deletions
diff --git a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc index c07657c..c7b392c 100644 --- a/kde4-profiles/common/share/apps/dolphin/dolphinui.rc +++ b/kde4-profiles/common/share/apps/dolphin/dolphinui.rc @@ -16,11 +16,11 @@ <Action name="file_quit"/> </Menu> <Menu name="edit"> - <Action name="edit_undo"/> - <Separator weakSeparator="1"/> - <Action name="edit_cut"/> - <Action name="edit_copy"/> - <Action name="edit_paste"/> + <Action name="edit_undo" /> + <Separator weakSeparator="1" /> + <Action name="edit_cut" /> + <Action name="edit_copy" /> + <Action name="edit_paste" /> <Separator weakSeparator="1"/> <Action name="select_all" /> <Action name="invert_selection" /> @@ -47,11 +47,6 @@ <Action name="view_properties" /> </Menu> <Menu name="go"> - <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"> @@ -61,74 +56,74 @@ <Action name="compare_files" /> <Action name="change_remote_encoding" /> </Menu> - <Menu name="settings"> - <text>Settings</text> - <Action name="options_show_menubar"/> - <Merge name="StandardToolBarMenuHandler"/> - <Merge name="KMDIViewActions"/> - <Separator weakSeparator="1"/> - <Action name="options_configure_keybinding"/> - <Action name="options_configure_toolbars"/> - <Action name="options_configure"/> - </Menu> - <Separator weakSeparator="1"/> </MenuBar> - <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> - <State name="new_file"> + <State name="new_file"> <disable> - <Action name="edit_undo"/> - <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="invert_selection"/> + <Action name="edit_undo" /> + <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="invert_selection" /> <Separator/> - <Action name="go_back"/> - <Action name="go_forward"/> + <Action name="go_back" /> + <Action name="go_forward" /> </disable> </State> - <State name="has_selection"> + <State name="has_selection" > <enable> <Action name="edit_cut"/> <Action name="edit_copy"/> <Action name="rename"/> - <Action name="move_to_trash"/> - <Action name="delete"/> - <Action name="invert_selection"/> - <Action name="nepomuk_annotate"/> + <Action name="move_to_trash" /> + <Action name="delete" /> + <Action name="invert_selection" /> + <Action name="nepomuk_annotate" /> </enable> </State> - <State name="has_no_selection"> + <State name="has_no_selection" > <disable> - <Action name="edit_cut"/> - <Action name="edit_copy"/> - <Action name="rename"/> - <Action name="move_to_trash"/> - <Action name="delete"/> - <Action name="delete_shortcut"/> - <Action name="invert_selection"/> - <Action name="nepomuk_annotate"/> + <Action name="edit_cut" /> + <Action name="edit_copy" /> + <Action name="rename" /> + <Action name="move_to_trash" /> + <Action name="delete" /> + <Action name="delete_shortcut" /> + <Action name="invert_selection" /> + <Action name="nepomuk_annotate" /> </disable> </State> - <ToolBar iconText="icononly" name="searchToolBar" newline="false"> - <text context="@title:menu">Search Toolbar</text> - <Action name="search_bar"/> + <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"/> + <Action priority="0" name="go_up"/> + <Action priority="0" name="go_home"/> + <Action priority="0" name="stop"/> + <Action priority="0" name="icons"/> + <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> </kpartgui> |