Commiting some stuff for the moment. I'll work on it some more during the

weekend.

svn path=/trunk/kdegraphics/kpdf/; revision=177554

kpdf/kpdf_part.cpp

@@ -60,14 +60,20 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
                                WhitePixel(display, screen), false, 5);
 
   // create our actions
-  KStdAction::prior (this, SLOT(displayPreviousPage()), 
-                     actionCollection(), "previous_page");
-  KStdAction::next  (this, SLOT(displayNextPage()),
-                     actionCollection(), "next_page" );
+  KStdAction::find    (this, SLOT(find()), 
+                       actionCollection(), "find");
+  KStdAction::findNext(this, SLOT(findNext()), 
+                       actionCollection(), "find_next");
 
   m_fitWidth = new KToggleAction(i18n("Fit Width"), 0,
-                                 this, SLOT(fitWidthToggled()),
-                                 actionCollection(), "fit_width");
+                       this, SLOT(fitWidthToggled()),
+                       actionCollection(), "fit_width");
+
+  KStdAction::prior(this, SLOT(displayPreviousPage()), 
+                    actionCollection(), "previous_page");
+  KStdAction::next (this, SLOT(displayNextPage()),
+                    actionCollection(), "next_page" );
+
 
   // set our XML-UI resource file
   setXMLFile("kpdf_part.rc");

kpdf/kpdf_part.h

@@ -72,6 +72,9 @@ namespace KPDF
     virtual bool openFile();
 
   protected slots:
+    void find()     { /* stub */ };
+    void findNext() { /* stub */ };
+
     void displayNextPage();
     void displayPreviousPage();
 

kpdf/kpdf_part.rc

@@ -1,14 +1,20 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kpdf_part" version="2">
+<kpartgui name="kpdf_part" version="3">
 <MenuBar>
+  <Menu name="edit"><text>&amp;Edit</text>
+    <Action name="find"/>
+    <Action name="find_next"/>
+  </Menu>
   <Menu name="view"><text>&amp;View</text>
     <Action name="fit_width"/>
   </Menu>
+  <Menu name="go"><text>&amp;Go</text>
+    <Action name="previous_page"/>
+    <Action name="next_page"/>
+  </Menu>
 </MenuBar>
 <ToolBar name="mainToolBar">
-  <Action name="file_print"/>
   <Action name="previous_page"/>
   <Action name="next_page"/>
-  <Separator/>
 </ToolBar>
 </kpartgui>

kpdf/kpdf_shell.rc

@@ -1,9 +1,10 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kpdf_shell" version="2">
+<kpartgui name="kpdf_shell" version="3">
 <MenuBar>
-  <Menu name="file"><text>&amp;File</text>
+  <Menu name="file">
     <DefineGroup name="file_save" append="save_merge"/>
     <DefineGroup name="file_print" append="print_merge"/>
   </Menu>
+  <Merge/>
 </MenuBar>
 </kpartgui>