diff --git a/src/pdf_jam.cpp b/src/pdf_jam.cpp index c272a53..6f5d0c3 100644 --- a/src/pdf_jam.cpp +++ b/src/pdf_jam.cpp @@ -10,7 +10,7 @@ PDFJam::PDFJam(void) { /* Ensure the folder exists. */ void PDFJam::makeFolder(QString path) { - QString tmp = "mksir -p %1 && rm %2*"; + QString tmp = "mkdir -p %1 && rm %2*"; int value = system(tmp.arg(path).arg(path).toStdString().c_str()); /*if(value != 0) qDebug() << "ERROR: Failed to make " << path;*/ diff --git a/src/pdf_page_widget.cpp b/src/pdf_page_widget.cpp index ad79d95..62e68c7 100644 --- a/src/pdf_page_widget.cpp +++ b/src/pdf_page_widget.cpp @@ -19,22 +19,18 @@ PDFPageWidget::PDFPageWidget(QWidget* parent) : QHBoxLayout* hbox = new QHBoxLayout(); - btn1 = new QPushButton("", this); - btn1->setObjectName("new"); - btn2 = new QPushButton("", this); - btn2->setObjectName("open"); + btnCut = new QPushButton("", this); + btnCut->setObjectName("cut"); + btnCopy = new QPushButton("", this); + btnCopy->setObjectName("copy"); - QPixmap pm, pm2; - pm.load("../img/new.png"); - pm2.load("../img/open.png"); - - btn1->setIcon(pm); - btn2->setIcon(pm2); - btn1->hide(); - btn2->hide(); + btnCut->setIcon(QPixmap::fromImage(QImage("img/cut.png"))); + btnCopy->setIcon(QPixmap::fromImage(QImage("img/copy.png"))); + btnCut->hide(); + btnCopy->hide(); - hbox->addWidget(btn1, 1, Qt::AlignRight); - hbox->addWidget(btn2, 0, Qt::AlignLeft); + hbox->addWidget(btnCut, 0, Qt::AlignLeft); + hbox->addWidget(btnCopy, 1, Qt::AlignRight); QVBoxLayout* vbox = new QVBoxLayout(); vbox->addStretch(1); @@ -59,11 +55,6 @@ void PDFPageWidget::setFather(QWidget* father) { this->father = father; } -void PDFPageWidget::setButton(QPushButton* btn) { - button = btn; - update(); -} - void PDFPageWidget::setPopplerPage(Poppler::Page* pp) { pPage = pp; } @@ -101,15 +92,15 @@ void PDFPageWidget::dropEvent(QDropEvent* event) { } void PDFPageWidget::leaveEvent(QEvent* event) { - btn1->hide(); - btn2->hide(); + btnCut->hide(); + btnCopy->hide(); this->setFrameStyle(QFrame::Plain); } void PDFPageWidget::enterEvent(QEvent* event) { - btn1->show(); - btn2->show(); + btnCut->show(); + btnCopy->show(); this->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); } diff --git a/src/pdf_page_widget.h b/src/pdf_page_widget.h index 5a84fb6..02b4195 100644 --- a/src/pdf_page_widget.h +++ b/src/pdf_page_widget.h @@ -19,8 +19,6 @@ public: void setThumbnail(QImage pageImage); void setPopplerPage(Poppler::Page*); - - void setButton(QPushButton* btn); void setAncestor(QWidget* ancestor); void setFather(QWidget* father); QWidget* getFather() { return father; } @@ -43,11 +41,10 @@ private: QWidget* ancestor; QWidget* father; - QPushButton* button; QImage image; Poppler::Page* pPage; QPixmap pixmap; - QPushButton* btn1, *btn2; + QPushButton* btnCut, *btnCopy; bool selected; diff --git a/src/pdf_preview_widget.cpp b/src/pdf_preview_widget.cpp index 47d0984..1194d21 100644 --- a/src/pdf_preview_widget.cpp +++ b/src/pdf_preview_widget.cpp @@ -53,7 +53,6 @@ void PDFPreviewWidget::resizeEvent(QResizeEvent* event) { void PDFPreviewWidget::wheelEvent(QWheelEvent* event) { if(pPage != NULL) { - qDebug() << currentPixmapSize; if(event->delta() > 0) currentPixmapSize += QSize(30, 30); else if(event->delta() < 0)