From 7e8c8bd85f8e3a592476b7ac12448d13e09971e8 Mon Sep 17 00:00:00 2001
From: Stephan Binner <binner@kde.org>
Date: Sat, 3 Jan 2004 10:38:06 +0000
Subject: [PATCH] Menu entries order fixes

svn path=/trunk/kdegraphics/kpdf/; revision=276290
---
 kpdf/kpdf_part.rc   | 11 ++++++-----
 kpdf/kpdf_shell.cpp |  2 +-
 kpdf/kpdf_shell.rc  |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kpdf/kpdf_part.rc b/kpdf/kpdf_part.rc
index cc4703b21..fd3d773f0 100644
--- a/kpdf/kpdf_part.rc
+++ b/kpdf/kpdf_part.rc
@@ -1,9 +1,10 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kpdf_part" version="11">
+<kpartgui name="kpdf_part" version="12">
 <MenuBar>
   <Menu name="file"><text>&amp;File</text>
-    <Action name="file_print"/>
-    <Action name="file_print_preview"/>
+    <Action name="file_print" group="file_print"/>
+    <Action name="file_print_preview" group="file_print"/>
+    <Separator group="file_print"/>
   </Menu>
   <Menu name="edit"><text>&amp;Edit</text>
     <Action name="find"/>
@@ -25,8 +26,8 @@
     <Action name="goToPage"/>
   </Menu>
   <Menu name="settings"><text>&amp;Settings</text>
-    <Action name="show_scrollbars"/>
-    <Action name="show_page_list"/>
+    <Action name="show_scrollbars" group="show_merge"/>
+    <Action name="show_page_list" group="show_merge"/>
   </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar">
diff --git a/kpdf/kpdf_shell.cpp b/kpdf/kpdf_shell.cpp
index 1664c8dac..cb8c535df 100644
--- a/kpdf/kpdf_shell.cpp
+++ b/kpdf/kpdf_shell.cpp
@@ -116,7 +116,7 @@ Shell::setupActions()
 
   KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), 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)
     createStandardStatusBarAction();
 #endif
diff --git a/kpdf/kpdf_shell.rc b/kpdf/kpdf_shell.rc
index 3cf7d3c23..459d991e6 100644
--- a/kpdf/kpdf_shell.rc
+++ b/kpdf/kpdf_shell.rc
@@ -9,7 +9,7 @@
     <Action name="fullscreen"/>
   </Menu>
   <Menu name="settings">
-    <Action name="showmenubar" append="show_merge"/>
+    <DefineGroup name="show_merge" append="show_merge"/>
   </Menu>
   <Merge/>
 </MenuBar>