summaryrefslogtreecommitdiff
path: root/src/rekonqui.rc
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-02-15 15:38:36 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-02-15 15:38:36 +0100
commit93562769c23827a1a6ddec63816ac7edbdeb98f6 (patch)
tree15d226ee3dae2da99eef768461e4e239d874be1b /src/rekonqui.rc
parentBrowserApplication --> Application (diff)
parentPreliminary flash support (diff)
downloadrekonq-93562769c23827a1a6ddec63816ac7edbdeb98f6.tar.xz
Merge branch 'master' into mainwindow
Diffstat (limited to 'src/rekonqui.rc')
-rw-r--r--src/rekonqui.rc25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 3a9ab682..0e372e82 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="rekonq" version="13">
+<kpartgui name="rekonq" version="27">
<MenuBar>
<!-- ============ FILE menu =========== -->
<Menu name="file" noMerge="1"><text>&amp;File</text>
@@ -28,8 +28,6 @@
<Action name="edit_copy" />
<Action name="edit_paste" />
<Separator/>
- <Action name="edit_select_all" />
- <Separator/>
<Action name="edit_find" />
<Action name="edit_find_next" />
<Action name="edit_find_prev" />
@@ -44,7 +42,6 @@
<Action name="smaller font" />
<Separator/>
<Action name="page source" />
- <Action name="fullscreen" />
</Menu>
<!-- ============ GO menu =========== -->
<Menu name="go" deleted="true">
@@ -57,26 +54,20 @@
<Action name="web inspector" />
</Menu>
<!-- ============ SETTINGS menu =========== -->
-<Menu name="settings" noMerge="1">
- <text>&amp;Settings</text>
- <!--
- Disable merging because we do not want the "fullscreen" action to appear
- here, since it is already in the "view" menu.
- -->
- <Action name="options_show_menubar"/>
- <Action name="options_configure_keybinding"/>
- <Action name="options_configure_toolbars"/>
- <Action name="options_configure"/>
-</Menu>
+<Menu name="settings">
+</Menu>
</MenuBar>
<!-- ============ Main ToolBar =========== -->
-
-<ToolBar name="mainToolBar" fullWidth="true" iconText="iconOnly" position="top" noMerge="1"><text>Main Toolbar</text>
+<ToolBar name="mainToolBar" iconText="iconOnly" newline="true" position="top" noMerge="1"><text>Main Toolbar</text>
<Action name="history back" />
<Action name="history forward" />
<Action name="stop reload" />
<Action name="go_home" />
</ToolBar>
+<!-- ============ Bookmarks ToolBar =========== -->
+<ToolBar name="bookmarksToolBar" iconSize="16" newline="true" position="top" noMerge="1" hidden="true"><text>Bookmarks Toolbar</text>
+</ToolBar>
+
</kpartgui>