[Add] Gave the collapse/expand options some sexy icons.

bin/hpdf.qrc

@@ -7,7 +7,9 @@
         <file>../img/new.png</file>
         <file>../img/export.png</file>
         <file>../img/exportall.png</file>
-        <file>../img/pdffactory.png</file>
+        <file>../img/hpdf.png</file>
         <file>../img/about.png</file>
+        <file>../img/collapse.png</file>
+        <file>../img/expand.png</file>
     </qresource>
 </RCC>

src/pdf_file_widget.cpp

@@ -4,8 +4,8 @@
 #include "pdf_file_widget.h"
 #include "pdf_page_widget.h"
 
-#define COLLAPSE_BUTTON_WIDTH   60
+#define COLLAPSE_BUTTON_WIDTH   32
-#define COLLAPSE_BUTTON_HEIGHT  40
+#define COLLAPSE_BUTTON_HEIGHT  32
 
 #define CHILD_AREA_WIDTH        150
 #define CHILD_AREA_HEIGHT       150
@@ -81,17 +81,16 @@ int FilesContainerWidget::findPageWidgetInLayout(PDFPageWidget* pageWidget) {
 PDFFileWidget::PDFFileWidget(QWidget* parent) {
   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
-  topLayout     = new QGridLayout();
+  topLayout       = new QGridLayout();
 
-  collapseButton = new QPushButton(tr("X"));
+  collapseButton  = new QPushButton();
-  collapseButton->setMinimumSize(QSize(COLLAPSE_BUTTON_WIDTH, COLLAPSE_BUTTON_HEIGHT));
+  collapseButton->resize(QSize(COLLAPSE_BUTTON_WIDTH, COLLAPSE_BUTTON_HEIGHT));
-  collapseButton->setMaximumSize(QSize(COLLAPSE_BUTTON_WIDTH, COLLAPSE_BUTTON_HEIGHT));
+  collapseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+  collapseButton->setIcon(QIcon(":/img/collapse.png"));
   connect(collapseButton, SIGNAL(released()), this, SLOT(collapsedButtonClick()));
   topLayout->addWidget(collapseButton, 0, 0);
 
   fileNameLabel = new QLabel();
-  fileNameLabel->setText(tr("File 1"));
-
   topLayout->addWidget(fileNameLabel, 0, 1);
   
   filesContainerWidget = new FilesContainerWidget();
@@ -108,8 +107,10 @@ void PDFFileWidget::setCollapsed(bool state) {
   collapsed = state;
   if(state == true) {
     scrollArea->hide();
+    collapseButton->setIcon(QIcon(":/img/expand.png"));
   } else {
     scrollArea->show();
+    collapseButton->setIcon(QIcon(":img/collapse.png"));
   }
 }
 
@@ -122,13 +123,13 @@ void PDFFileWidget::setDocument(Poppler::Document* document, QString fileName) {
   for(int i = 0; i < numPages; i++) {
     Poppler::Page* pdfPage = document->page(i);
 
-    QImage* pageImage = new QImage();
+    QImage pageImage = pdfPage->renderToImage(144, 144);
-    *pageImage = pdfPage->renderToImage(144, 144);
 
     PDFPageWidget* pageWidget = new PDFPageWidget();
     pageWidget->setThumbnail(pageImage);
 
     filesContainerWidget->addPageWidget(pageWidget);
   }
+  fileNameLabel->setText(fileName);
 }
 

src/pdf_page_widget.cpp

@@ -35,11 +35,8 @@ PDFPageWidget::PDFPageWidget(QWidget* parent) :
   QVBoxLayout* vbox = new QVBoxLayout();
   vbox->addStretch(1);
   vbox->addLayout(hbox);
-
   this->setLayout(vbox);
-
   vbox->setContentsMargins(0, 0, 0, 0);
-  this->setThumbnail(new QImage("../img/img.jpg"));
 }
 
 void PDFPageWidget::setButton(QPushButton* btn) {
@@ -47,9 +44,9 @@ void PDFPageWidget::setButton(QPushButton* btn) {
   update();
 }
 
-void PDFPageWidget::setThumbnail(QImage* pageImage) {
+void PDFPageWidget::setThumbnail(QImage pageImage) {
   image = pageImage;
-  pixmap = QPixmap::fromImage(*image);
+  pixmap = QPixmap::fromImage(image);
   pixmap = pixmap.scaled(size(), Qt::KeepAspectRatio);
 
   update();

src/pdf_page_widget.h

@@ -13,7 +13,7 @@ class PDFPageWidget : public QFrame {
   Q_OBJECT
 public:
   PDFPageWidget(QWidget* parent = 0);
-  void setThumbnail(QImage* pageImage);
+  void setThumbnail(QImage pageImage);
   void setButton(QPushButton* btn);
   QSize sizeHint() const;
   /*void setButtonImage(QImage* pageImage);*/
@@ -25,9 +25,9 @@ protected:
 
 private:
   /*QVector<QPushButton> buttons;*/
-  QPushButton* button;
+  QPushButton*  button;
-  QImage* image;
+  QImage        image;
-  QPixmap pixmap;
+  QPixmap       pixmap;
-  QPushButton* btn1, *btn2;
+  QPushButton*  btn1, *btn2;
 };
 

src/pdf_table_widget.cpp

@@ -33,8 +33,6 @@ PDFTableWidget::PDFTableWidget(QWidget* parent) : QFrame(parent) {
 }
 
 void PDFTableWidget::loadFile(QString fileName) {
-  fileNames.append(fileName);
-  
   Poppler::Document* doc = Poppler::Document::load(fileName);
   files.append(doc);
   
@@ -44,6 +42,8 @@ void PDFTableWidget::loadFile(QString fileName) {
 
   fileWidgets.append(fileWidget);
 
+  fileNames.append(fileName);
+
   containerLayout->insertWidget(containerLayout->count()-1, fileWidget);
 }