[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kviewshell-0.7/kviewshell
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2006-03-21 9:43:24
Message-ID: 1142934204.789194.853.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 520923 by whuss:

Reenable inverse search for the DVI and PDF plugins.

 M  +3 -2      plugins/dvi/kdvi_multipage.cpp  
 M  +3 -3      plugins/dvi/kdvi_multipage.h  
 M  +3 -2      plugins/pdf/pdfMultipage.cpp  
 M  +4 -5      plugins/pdf/pdfMultipage.h  
 M  +10 -2     shell/kmultipage.cpp  
 M  +10 -1     shell/kmultipage.h  
 M  +2 -8      shell/kviewpart.cpp  
 M  +0 -7      shell/kviewpart.h  


--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/kdvi_multipage.cpp \
#520922:520923 @@ -406,9 +406,10 @@
 }
 
 
-void KDVIMultiPage::initializePageCache()
+DocumentPageCache* KDVIMultiPage::initializePageCache()
 {
-  //@@@@@@@@@@@  pageCache = new DVIPageCache();
+  DocumentPageCache* pageCache = new DVIPageCache();
+  return pageCache;
 }
 
 
--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/kdvi_multipage.h \
#520922:520923 @@ -37,11 +37,11 @@
 
   static KAboutData* createAboutData();
 
-private:
+  virtual DocumentPageCache* initializePageCache();
+
   virtual DocumentWidget* createDocumentWidget(PageView *parent, DocumentPageCache \
*cache);  
-  virtual void initializePageCache();
-
+private:
   /** Used to enable the export menu when a file is successfully
       loaded. */
   virtual void enableActions(bool);
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/pdfMultipage.cpp \
#520922:520923 @@ -118,9 +118,10 @@
   return documentWidget;
 }
 
-void PdfMultiPage::initializePageCache()
+DocumentPageCache* PdfMultiPage::initializePageCache()
 {
-  //@@@@@@@@@@  pageCache = new PdfPageCache();
+  DocumentPageCache* pageCache = new PdfPageCache();
+  return pageCache;
 }
 
 void PdfMultiPage::addConfigDialogs(KConfigDialog* configDialog)
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/pdfMultipage.h #520922:520923
@@ -123,15 +123,14 @@
 
   virtual void addConfigDialogs(KConfigDialog* configDialog);
 
+  virtual DocumentPageCache* initializePageCache();
+
+  virtual DocumentWidget* createDocumentWidget(PageView *parent, DocumentPageCache \
*cache); +
 protected:
   virtual void setFile(bool success);
   virtual void enableActions(bool);
 
-private:
-  virtual DocumentWidget* createDocumentWidget(PageView *parent, DocumentPageCache \
                *cache);
-
-  virtual void initializePageCache();
-
  private:
   /** This member holds the renderer which is used by the demo implementation */
   PdfRenderer     pdfRenderer;
--- branches/work/kviewshell-0.7/kviewshell/shell/kmultipage.cpp #520922:520923
@@ -1,6 +1,7 @@
 // -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; c-brace-offset: 0; -*-
 #include <config.h>
 
+#include "documentPageCache.h"
 #include "documentWidget.h"
 #include "kmultipage.h"
 #include "kprintDialogPage_pageoptions.h"
@@ -144,9 +145,9 @@
 }
 
 
-DocumentWidget* KMultiPage::createDocumentWidget(QWidget *parent, DocumentPageCache \
*pageCache) +DocumentWidget* KMultiPage::createDocumentWidget(PageView *parent, \
DocumentPageCache *pageCache)  {
-  DocumentWidget* documentWidget = new DocumentWidget((PageView *)parent, pageCache, \
"singlePageWidget"); +  DocumentWidget* documentWidget = new DocumentWidget(parent, \
pageCache, "singlePageWidget");  return documentWidget;
 }
 
@@ -258,6 +259,13 @@
 }
 
 
+DocumentPageCache* KMultiPage::initializePageCache()
+{
+  DocumentPageCache* pageCache = new DocumentPageCache();
+  return pageCache;
+}
+
+
 bool KMultiPage::openFile()
 {
   if (renderer.isNull()) {
--- branches/work/kviewshell-0.7/kviewshell/shell/kmultipage.h #520922:520923
@@ -10,6 +10,8 @@
 
 class DocumentPageCache;
 class DocumentWidget;
+class PageView;
+
 class KConfigDialog;
 class KPrinter;
 
@@ -235,7 +237,7 @@
      should also reimplement this method to ensure that your new
      DocumentWidgets will be used. This function is also the right
      place to connect to signals emitted by DocumentWidget. */
-  virtual DocumentWidget* createDocumentWidget(QWidget *parent, DocumentPageCache \
*cache); +  virtual DocumentWidget* createDocumentWidget(PageView *parent, \
DocumentPageCache *cache);  
 
   /** Update GUI after loading or closing of a file
@@ -258,6 +260,13 @@
       disable menu items, etc. */
   virtual void setFile(bool success);
 
+  /** This function creates the page cache. If a multipage implementation needs
+     additional functionaly from the cache overwrite this function to create a
+     subclass of DocumentPageCache.
+     @warning This function is called by the constructor, never call it explicitly.
+  */
+  virtual DocumentPageCache* initializePageCache();
+
 protected:
   /* Used to enable/disable Actions of multiPage implementations.
      enableActions(true) should be called whenever a file is
--- branches/work/kviewshell-0.7/kviewshell/shell/kviewpart.cpp #520922:520923
@@ -272,7 +272,7 @@
   multiPage->setParentViewPart(this);
 
   // Initialize documentPageCache.
-  initializePageCache();
+  pageCache = multiPage->initializePageCache();
   pageCache->setRenderer(multiPage->getRenderer());
   
   _markList->setPageCache(pageCache);
@@ -953,7 +953,7 @@
     }
 
     // Initialize documentPageCache.
-    initializePageCache();
+    pageCache = multiPage->initializePageCache();
     pageCache->setRenderer(multiPage->getRenderer());
     
     _markList->setPageCache(pageCache);
@@ -2415,12 +2415,6 @@
 }
 
 
-void KViewPart::initializePageCache()
-{
-  pageCache = new DocumentPageCache();
-}
-
-
 void KViewPart::doExportText()
 {
   if (multiPage.isNull()) {
--- branches/work/kviewshell-0.7/kviewshell/shell/kviewpart.h #520922:520923
@@ -337,13 +337,6 @@
 
   void setViewMode();
 
-  /** This function creates the page cache. If a multipage implementation needs
-     additional functionaly from the cache overwrite this function to create a
-     subclass of DocumentPageCache.
-     @warning This function is called by the constructor, never call it explicitly.
-  */
-  virtual void initializePageCache();
-
   // The next two functions are used for the autozoom feature
   // TODO optimize (the calculation of the widest page needs to be done only once
   // per document, not everytime calculateFitToWidthZoomValue() is called)


[prev in list] [next in list] [prev in thread] [next in thread]