Get lumina-pdf all up and running again.

1. Abstract out the backend renderer into a new class
2. The Renderer can be selected at build time by setting the "USE_MUPDF" build flag to use mupdf instead of poppler (default).

1 files changed, 8 insertions, 12 deletions

diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.h b/src-qt5/desktop-utils/lumina-pdf/mainUI.h
index bc121f7c..68245f16 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.h
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.h
@@ -19,8 +19,7 @@
 #include <QApplication>
 #include <QMenu>
 
-#include <mupdf/fitz.h>
-#include <mupdf/pdf.h>
+#include "Renderer.h"
 #include "PresentationLabel.h"
 #include "propDialog.h"
 #include "PrintWidget.h"
@@ -39,17 +38,14 @@ public:
 	void loadFile(QString path);
 
 private:
-	fz_document *DOC;
-	pdf_document *PDOC;
-  fz_context *CTX;
-  QSizeF pageSize;
+	QSizeF pageSize;
 	PrintWidget *WIDGET;
 	Ui::MainUI *ui;
 	PropDialog *PROPDIALOG;
 	QPrintDialog *PrintDLG;
 	QString lastdir;
 	bool matchCase;
-  QList<TextData*> results;
+	QList<TextData*> results;
 	int currentHighlight;
 
 	//Other Interface elements
@@ -62,10 +58,10 @@ private:
 	QAction *clockAct, *pageAct;
 
 	//PDF Page Loading cache variables
+	Renderer *BACKEND;
 	QHash<int, QImage> loadingHash;
-	int numPages;
 
-	void loadPage(int num, fz_document *doc, MainUI *obj, QSize dpi);
+	void loadPage(int num, MainUI *obj, QSize dpi);
 
 	//Functions/variables for the presentation mode
 	PresentationLabel *presentationLabel;
@@ -83,7 +79,7 @@ private slots:
 	void nextPage(){ ShowPage( WIDGET->currentPage()+1 ); } //currentPage() starts at 1 rather than 0
 	void prevPage(){ ShowPage( WIDGET->currentPage()-1 ); } //currentPage() starts at 1 rather than 0
 	void firstPage(){ ShowPage(1); }
-	void lastPage(){ ShowPage(numPages); }
+	void lastPage(){ ShowPage(BACKEND->numPages()); }
 	void startPresentationHere(){ startPresentation(false); }
 	void startPresentationBeginning(){ startPresentation(true); }
 	void closePresentation(){ endPresentation(); }
@@ -101,11 +97,11 @@ private slots:
 	void updatePageNumber();
 	void showContextMenu(const QPoint&){ contextMenu->popup(QCursor::pos()); }
 	void updateContextMenu();
-  //void setScroll(bool);
+	//void setScroll(bool);
 
 signals:
 	void PageLoaded(int);
-  void sendDocument(fz_document*);
+	void sendDocument(fz_document*);
 
 protected:
 	void keyPressEvent(QKeyEvent*);