Copying kpdf_experiments into branch and reordering directories. Look there

for the file naming map and file  versioning. Please wait until the commit
storm ends to report any bug. Albert and Enrico
Includes change.

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

main.cpp

@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "kpdf_shell.h"
+#include "shell.h"
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>

part.cpp

@@ -50,17 +50,17 @@
 
 #include "xpdf/GlobalParams.h"
 
-#include "kpdf_part.h"
-#include "pageview.h"
-#include "thumbnaillist.h"
-#include "searchwidget.h"
-#include "document.h"
-#include "page.h"
-#include "toc.h"
-#include "preferencesdialog.h"
-#include "propertiesdialog.h"
-#include "presentationwidget.h"
-#include "settings.h"
+#include "part.h"
+#include "ui/pageview.h"
+#include "ui/thumbnaillist.h"
+#include "ui/searchwidget.h"
+#include "ui/toc.h"
+#include "ui/propertiesdialog.h"
+#include "ui/presentationwidget.h"
+#include "conf/preferencesdialog.h"
+#include "conf/settings.h"
+#include "core/document.h"
+#include "core/page.h"
 
 typedef KParts::GenericFactory<KPDF::Part> KPDFPartFactory;
 K_EXPORT_COMPONENT_FACTORY(libkpdfpart, KPDFPartFactory)
@@ -203,7 +203,7 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
 	connect( m_dirtyHandler, SIGNAL( timeout() ),this, SLOT( slotDoFileDirty() ) );
 
 	// set our XML-UI resource file
-	setXMLFile("kpdf_part.rc");
+	setXMLFile("part.rc");
 	updateActions();
 	slotWatchFile();
 }
@@ -688,4 +688,4 @@ void BrowserExtension::print()
 	static_cast<Part*>(parent())->slotPrint();
 }
 
-#include "kpdf_part.moc"
+#include "part.moc"

part.h

@@ -19,8 +19,8 @@
 #include <kparts/browserextension.h>
 #include <kparts/part.h>
 
-#include "kpdf_dcop.h"
-#include "document.h"
+#include "dcop.h"
+#include "core/document.h"
 
 class QWidget;
 class QSplitter;

shell.cpp

@@ -17,9 +17,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "kpdf_shell.h"
-#include "kpdf_shell.moc"
-
+// qt/kde includes
+#include <qcursor.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kedittoolbar.h>
@@ -36,7 +35,8 @@
 #include <kio/netaccess.h>
 #include <kmainwindowiface.h> 
 
-#include <qcursor.h>
+// local includes
+#include "shell.h"
 
 using namespace KPDF;
 
@@ -44,7 +44,7 @@ Shell::Shell()
   : KParts::MainWindow(0, "KPDF::Shell"), m_menuBarWasShown(true), m_toolBarWasShown(true)
 {
   // set the shell's ui resource file
-  setXMLFile("kpdf_shell.rc");
+  setXMLFile("shell.rc");
 
   // this routine will find and load our Part.  it finds the Part by
   // name which is a bad idea usually.. but it's alright in this
@@ -259,4 +259,4 @@ void Shell::slotUpdateFullScreen()
     }
 }
 
-// vim:ts=2:sw=2:tw=78:et
+#include "shell.moc"

ui/pageview.cpp

@@ -2,7 +2,7 @@
  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>                  *
  *   Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>            *
  *                                                                         *
- *   With portions of code from kpdf_pagewidget.cc by:                     *
+ *   With portions of code from kpdf/kpdf_pagewidget.cc by:                *
  *     Copyright (C) 2002 by Wilco Greven <greven@kde.org>                 *
  *     Copyright (C) 2003 by Christophe Devriese                           *
  *                           <Christophe.Devriese@student.kuleuven.ac.be>  *
@@ -128,8 +128,8 @@ PageView::PageView( QWidget *parent, KPDFDocument *document )
     // conntect the padding of the viewport to pixmaps requests
     connect( this, SIGNAL(contentsMoving(int, int)), this, SLOT(slotRequestVisiblePixmaps(int, int)) );
 
-    // ### [RELEASE: REMOVE] show initial warning for dev_version > 2004-Dec-04
-    d->messageWindow->display( "kpdf_experiments is taking its way to HEAD! ;-)", PageViewMessage::Warning, 8000 );
+    // show initial welcome text
+    d->messageWindow->display( i18n( "Welcome" ), PageViewMessage::Info, 2000 );
 
     // set a corner button to resize the view to the page size
 //    QPushButton * resizeButton = new QPushButton( viewport() );

ui/pageview.h

@@ -2,7 +2,7 @@
  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>                  *
  *   Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>            *
  *                                                                         *
- *   With portions of code from kpdf_pagewidget.h by:                      *
+ *   With portions of code from kpdf/kpdf_pagewidget.h by:                 *
  *     Copyright (C) 2002 by Wilco Greven <greven@kde.org>                 *
  *     Copyright (C) 2003 by Christophe Devriese                           *
  *                           <Christophe.Devriese@student.kuleuven.ac.be>  *