Commit 7e8c8bd8 authored by Stephan Binner's avatar Stephan Binner

Menu entries order fixes

svn path=/trunk/kdegraphics/kpdf/; revision=276290
parent 0226b0bf
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kpdf_part" version="11"> <kpartgui name="kpdf_part" version="12">
<MenuBar> <MenuBar>
<Menu name="file"><text>&amp;File</text> <Menu name="file"><text>&amp;File</text>
<Action name="file_print"/> <Action name="file_print" group="file_print"/>
<Action name="file_print_preview"/> <Action name="file_print_preview" group="file_print"/>
<Separator group="file_print"/>
</Menu> </Menu>
<Menu name="edit"><text>&amp;Edit</text> <Menu name="edit"><text>&amp;Edit</text>
<Action name="find"/> <Action name="find"/>
...@@ -25,8 +26,8 @@ ...@@ -25,8 +26,8 @@
<Action name="goToPage"/> <Action name="goToPage"/>
</Menu> </Menu>
<Menu name="settings"><text>&amp;Settings</text> <Menu name="settings"><text>&amp;Settings</text>
<Action name="show_scrollbars"/> <Action name="show_scrollbars" group="show_merge"/>
<Action name="show_page_list"/> <Action name="show_page_list" group="show_merge"/>
</Menu> </Menu>
</MenuBar> </MenuBar>
<ToolBar name="mainToolBar"> <ToolBar name="mainToolBar">
......
...@@ -116,7 +116,7 @@ Shell::setupActions() ...@@ -116,7 +116,7 @@ Shell::setupActions()
KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection());
m_showMenuBarAction = KStdAction::showMenubar( this, SLOT( slotShowMenubar() ), actionCollection(), "showmenubar" ); m_showMenuBarAction = KStdAction::showMenubar( this, SLOT( slotShowMenubar() ), actionCollection(), "options_show_menubar" );
#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) #if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
createStandardStatusBarAction(); createStandardStatusBarAction();
#endif #endif
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Action name="fullscreen"/> <Action name="fullscreen"/>
</Menu> </Menu>
<Menu name="settings"> <Menu name="settings">
<Action name="showmenubar" append="show_merge"/> <DefineGroup name="show_merge" append="show_merge"/>
</Menu> </Menu>
<Merge/> <Merge/>
</MenuBar> </MenuBar>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment