[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kviewshell-0.7/kviewshell
From: Stefan Kebekus <kebekus () kde ! org>
Date: 2006-04-09 19:28:29
Message-ID: 1144610909.001107.18911.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 527970 by kebekus:
forgot to commit these changes
M +0 -1 plugins/dvi/Makefile.am
D plugins/dvi/dviPageCache.cpp
D plugins/dvi/dviPageCache.h
M +1 -8 plugins/dvi/kdvi_multipage.cpp
M +0 -2 plugins/dvi/kdvi_multipage.h
M +1 -1 plugins/pdf/Makefile.am
M +1 -7 plugins/pdf/pdfMultipage.cpp
M +1 -4 plugins/pdf/pdfMultipage.h
D plugins/pdf/pdfPageCache.cpp
D plugins/pdf/pdfPageCache.h
M +6 -3 plugins/pdf/pdfWidget.cpp
M +5 -5 shell/kviewpart.h
--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/Makefile.am #527969:527970
@@ -16,7 +16,6 @@
bigEndianByteReader.cpp \
dviexport.cpp \
dviFile.cpp \
- dviPageCache.cpp \
dviRenderer.cpp \
dviRenderer_draw.cpp \
dviRenderer_prescan.cpp \
--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/kdvi_multipage.cpp \
#527969:527970 @@ -3,7 +3,6 @@
#include "kdvi_multipage.h"
#include "dviFile.h"
-#include "dviPageCache.h"
#include "dviWidget.h"
#include "kprinterwrapper.h"
#include "kvs_debug.h"
@@ -407,15 +406,9 @@
}
-DocumentPageCache* KDVIMultiPage::initializePageCache()
-{
- DocumentPageCache* pageCache = new DVIPageCache();
- return pageCache;
-}
-
-
void KDVIMultiPage::showFindTextDialog()
{
+#warning FIXME
/*
if ((getRenderer().isNull()) || (getRenderer()->supportsTextSearch() == false))
return;
--- branches/work/kviewshell-0.7/kviewshell/plugins/dvi/kdvi_multipage.h \
#527969:527970 @@ -37,8 +37,6 @@
static KAboutData* createAboutData();
- virtual DocumentPageCache* initializePageCache();
-
virtual DocumentWidget* createDocumentWidget(PageView *parent, DocumentPageCache \
*cache);
private:
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/Makefile.am #527969:527970
@@ -14,7 +14,7 @@
kde_module_LTLIBRARIES = pdfviewpart.la
pdfviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
pdfviewpart_la_LIBADD = -lkdeprint -lkparts \
$(top_builddir)/kviewshell/shell/libkmultipage.la $(POPPLER_LIBS)
-pdfviewpart_la_SOURCES = pdfMultipage.cpp pdfRenderer.cpp pdfWidget.cpp \
pdfPageCache.cpp prefs.kcfgc \ +pdfviewpart_la_SOURCES = pdfMultipage.cpp \
pdfRenderer.cpp pdfWidget.cpp prefs.kcfgc \ optionDialogPdfWidget.cpp \
optionDialogPdfWidget_base.ui sourceSplitter.cpp pdfInfo.cpp \ propertiesdialog.cpp
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/pdfMultipage.cpp \
#527969:527970 @@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2005 by Stefan Kebekus *
+ * Copyright (C) 2005--2006 by Stefan Kebekus *
* kebekus@kde.org *
* *
* Copyright (C) 2005 by Wilfried Huss *
@@ -28,7 +28,6 @@
#include "pdfMultipage.h"
#include "pdfWidget.h"
-#include "pdfPageCache.h"
#include "optionDialogPdfWidget.h"
#include "prefs.h"
@@ -118,11 +117,6 @@
return documentWidget;
}
-DocumentPageCache* PdfMultiPage::initializePageCache()
-{
- DocumentPageCache* pageCache = new PdfPageCache();
- return pageCache;
-}
void PdfMultiPage::addConfigDialogs(KConfigDialog* configDialog)
{
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/pdfMultipage.h #527969:527970
@@ -1,7 +1,7 @@
// -*- C++ -*-
/***************************************************************************
- * Copyright (C) 2005 by Stefan Kebekus *
+ * Copyright (C) 2005--2006 by Stefan Kebekus *
* kebekus@kde.org *
* *
* Copyright (C) 2005 by Wilfried Huss *
@@ -33,7 +33,6 @@
class KAction;
class PageView;
-//class DocumentPageCache;
/*! \mainpage PdfMultiPage
@@ -123,8 +122,6 @@
virtual void addConfigDialogs(KConfigDialog* configDialog);
- virtual DocumentPageCache* initializePageCache();
-
virtual DocumentWidget* createDocumentWidget(PageView *parent, DocumentPageCache \
*cache);
protected:
--- branches/work/kviewshell-0.7/kviewshell/plugins/pdf/pdfWidget.cpp #527969:527970
@@ -22,7 +22,6 @@
#include <klocale.h>
#include "pdfWidget.h"
-#include "pdfPageCache.h"
#include "hyperlink.h"
#include "pageView.h"
#include "selection.h"
@@ -46,8 +45,11 @@
// with Control+Left Mousebutton
if (e->button() == MidButton || (e->button() == LeftButton && (e->state() & \
ControlButton))) {
+#warning FIXME
+ /*
PdfPageCache* pdfCache = static_cast<PdfPageCache*>(documentCache);
pdfCache->inverseSearch(pageNumber, inverseMap(e->pos()), true);
+ */
e->accept();
}
@@ -72,10 +74,11 @@
if ( e->state() == 0 )
{
- PdfPageCache* pdfCache = static_cast<PdfPageCache*>(documentCache);
+#warning FIXME
+ // PdfPageCache* pdfCache = static_cast<PdfPageCache*>(documentCache);
clearStatusBarTimer.stop();
- pdfCache->inverseSearch(pageNumber, e->pos());
+ // pdfCache->inverseSearch(pageNumber, e->pos());
if (!clearStatusBarTimer.isActive())
{
--- branches/work/kviewshell-0.7/kviewshell/shell/kviewpart.h #527969:527970
@@ -307,19 +307,19 @@
QGuardedPtr<PresentationWidget> presentationWidget;
-#warning This element shouldn't exist here. the widgets should be owned by the \
pageView +#warning This element should not exist here. the widgets should be owned by \
the pageView QPtrVector<DocumentWidget> widgetList;
History document_history;
/* The pageCache caches already drawn "documentPages" and invokes
the renderer if the needed page is not available in the cache. */
- DocumentPageCache* pageCache;
+ DocumentPageCache pageCache;
/* Returns the size of page 'page'. If the document does not
specify a size (which happens, e.g., for some DVI-files), then
the userPreferredSize is returned. */
- SimplePageSize sizeOfPage(const PageNumber& page = 1) const { return \
pageCache->sizeOfPage(page); } + SimplePageSize sizeOfPage(const PageNumber& page = \
1) const { return pageCache.sizeOfPage(page); }
/* Returns the number of the first (i.e. top-left) page in the
display. Such a number cannot be reasonably assigned
@@ -451,8 +451,8 @@
/* Sets the userPreferredSize, which is explained below */
- void setUserPreferredSize(const SimplePageSize& t) { \
pageCache->setUserPreferredSize(t); }
- void setUseDocumentSpecifiedSize(bool b) { \
pageCache->setUseDocumentSpecifiedSize(b); } + void setUserPreferredSize(const \
SimplePageSize& t) { pageCache.setUserPreferredSize(t); } + void \
setUseDocumentSpecifiedSize(bool b) { pageCache.setUseDocumentSpecifiedSize(b); }
/* Initialize/Update PageWidgets, thumbnail list and bookmark list
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic