From c5dd6943ef23e9b9145a053d1d6f724700136eda Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Thu, 18 Dec 2014 09:51:57 +0000
Subject: [PATCH] [Add] Added page margins.

---
 src/pdf_file_widget.cpp    |  4 +++-
 src/pdf_jam.cpp            |  9 ++++++++-
 src/pdf_jam.h              | 20 +++-----------------
 src/pdf_page_widget.cpp    |  2 +-
 src/pdf_preview_widget.cpp | 24 ++++++++++++------------
 src/pdf_table_widget.cpp   |  1 -
 src/pdf_table_widget.h     |  2 --
 7 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/pdf_file_widget.cpp b/src/pdf_file_widget.cpp
index 624621d..82f55b4 100644
--- a/src/pdf_file_widget.cpp
+++ b/src/pdf_file_widget.cpp
@@ -10,6 +10,8 @@
 #define CHILD_AREA_WIDTH        150
 #define CHILD_AREA_HEIGHT       150
 
+#define CHILD_AREA_SIDE_MARGIN  6
+
 PagesContainerWidget::PagesContainerWidget(QWidget* parent) {
   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
   setAcceptDrops(true);
@@ -23,7 +25,7 @@ int PagesContainerWidget::getPagesCount() const {
 }
 
 QSize PagesContainerWidget::sizeHint() const {
-  return QSize(CHILD_AREA_WIDTH*getPagesCount(), CHILD_AREA_HEIGHT + 20);
+  return QSize((CHILD_AREA_SIDE_MARGIN + CHILD_AREA_WIDTH)*getPagesCount(), CHILD_AREA_HEIGHT + 22);
 }
 
 void PagesContainerWidget::addPageWidget(PDFPageWidget* pageWidget) {
diff --git a/src/pdf_jam.cpp b/src/pdf_jam.cpp
index 44a62bd..138e215 100644
--- a/src/pdf_jam.cpp
+++ b/src/pdf_jam.cpp
@@ -7,7 +7,7 @@
 PDFJam::PDFJam(void) {
   
 }
-
+#if 0
 /* Ensure the folder exists. */
 void PDFJam::makeFolder(QString path) {
   QString tmp = "mkdir -p %1";
@@ -61,4 +61,11 @@ void PDFJam::run(void) {
 
   /*system("echo 'tata' > /tmp/test.txt");*/
 }
+#endif
+
+void PDFJam::run(void) {
+
+}
+
+
 
diff --git a/src/pdf_jam.h b/src/pdf_jam.h
index 14b8252..e0014a3 100644
--- a/src/pdf_jam.h
+++ b/src/pdf_jam.h
@@ -1,28 +1,14 @@
 #pragma once
-#include <QThread>
-#include <QMutex>
-#include <poppler-qt5.h>
-#include <QImage>
 
-class PDFPageWidget;
-class QImage;
-
-class PDFJam : public QThread {
-  Q_OBJECT
+class PDFJam {/*: public QThread {*/
+  /*Q_OBJECT*/
 public:
   PDFJam(void);
 
-  void pushCommand(QString);
-  void loadFile(QString fileName, int, int);
-  void makeFolder(QString);
-
 protected:
   void run(void);
 
 private:
-  QVector<QString> cmdQueue;
-  QString nextCommand();
-  bool isQueueEmpty();
-  QMutex mutex;
+  volatile bool stopped;
 };
 
diff --git a/src/pdf_page_widget.cpp b/src/pdf_page_widget.cpp
index 7c4b5cd..5e91218 100644
--- a/src/pdf_page_widget.cpp
+++ b/src/pdf_page_widget.cpp
@@ -35,8 +35,8 @@ PDFPageWidget::PDFPageWidget(QWidget* parent) :
   QVBoxLayout* vbox = new QVBoxLayout();
   vbox->addStretch(1);
   vbox->addLayout(hbox);
+  vbox->setContentsMargins(0, 3, 0, 3);
   this->setLayout(vbox);
-  vbox->setContentsMargins(0, 0, 0, 0);
 }
 
 void PDFPageWidget::setButton(QPushButton* btn) {
diff --git a/src/pdf_preview_widget.cpp b/src/pdf_preview_widget.cpp
index b75fd32..5d8b1d7 100644
--- a/src/pdf_preview_widget.cpp
+++ b/src/pdf_preview_widget.cpp
@@ -12,20 +12,21 @@ void PDFPreviewWidget::setImage(QImage image) {
 }
 
 void PDFPreviewWidget::regenImage(void) {
-  double dpi;
-  double dpi2;
-  QSize targetSize  = this->size();
-  QSizeF oriSize    = pPage->pageSizeF();
-  double oriDpi     = 72;
-  dpi   = targetSize.height() / (float)oriSize.height()*72;
-  dpi2  = targetSize.width()  / (float)oriSize.width()*72;
-  dpi   = dpi<dpi2?dpi:dpi2;
-  previewImage = pPage->renderToImage(dpi, dpi);
+  if(pPage != NULL) {
+    double dpi;
+    double dpi2;
+    QSize targetSize  = this->size();
+    QSizeF oriSize    = pPage->pageSizeF();
+    double oriDpi     = 72;
+    dpi   = targetSize.height() / (float)oriSize.height()*72;
+    dpi2  = targetSize.width()  / (float)oriSize.width()*72;
+    dpi   = dpi<dpi2?dpi:dpi2;
+    previewImage = pPage->renderToImage(dpi, dpi);
+  }
 }
 
 void PDFPreviewWidget::previewUpdate(Poppler::Page* pp) {
   pPage = pp;
-  qDebug() << "Set new popler page" << pp;
   regenImage();
   update();
 }
@@ -35,8 +36,7 @@ void PDFPreviewWidget::pageClicked(QMouseEvent* mouseEvent, QImage image) {
 }
 
 void PDFPreviewWidget::resizeEvent(QResizeEvent* event) {
-  if(pPage != NULL)
-    regenImage();
+  regenImage();
 }
 
 void PDFPreviewWidget::paintEvent(QPaintEvent* event) {
diff --git a/src/pdf_table_widget.cpp b/src/pdf_table_widget.cpp
index e3e48ed..b8d349b 100644
--- a/src/pdf_table_widget.cpp
+++ b/src/pdf_table_widget.cpp
@@ -39,7 +39,6 @@ void PDFTableWidget::loadFile(QString fileName) {
   PDFFileWidget* fileWidget = new PDFFileWidget();
   fileWidget->setAncestor(this);
   fileWidget->setDocument(doc, fileName);
-  pdfJam.loadFile(fileName, files.size()-1, doc->numPages());
   connect(fileWidget, SIGNAL(pageClicked(QMouseEvent*,QImage)), this,
           SIGNAL(pageClicked(QMouseEvent*,QImage)));
   connect(fileWidget, SIGNAL(previewUpdate(Poppler::Page*)), this,
diff --git a/src/pdf_table_widget.h b/src/pdf_table_widget.h
index 185e743..fd254ea 100644
--- a/src/pdf_table_widget.h
+++ b/src/pdf_table_widget.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <QFrame>
 #include <poppler-qt5.h>
-#include "pdf_jam.h"
 
 class QImage;
 class QVBoxLayout;
@@ -17,7 +16,6 @@ public:
   void loadFile(QString fileName);
 
 protected:
-  PDFJam pdfJam;
   
 private:
   QVBoxLayout*  outerLayout;