[Change] Cleaned up the PDFPage buttons slightly.
This commit is contained in:
parent
af5b34aba6
commit
3744e8424d
@ -10,7 +10,7 @@ PDFJam::PDFJam(void) {
|
|||||||
|
|
||||||
/* Ensure the folder exists. */
|
/* Ensure the folder exists. */
|
||||||
void PDFJam::makeFolder(QString path) {
|
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());
|
int value = system(tmp.arg(path).arg(path).toStdString().c_str());
|
||||||
/*if(value != 0)
|
/*if(value != 0)
|
||||||
qDebug() << "ERROR: Failed to make " << path;*/
|
qDebug() << "ERROR: Failed to make " << path;*/
|
||||||
|
@ -19,22 +19,18 @@ PDFPageWidget::PDFPageWidget(QWidget* parent) :
|
|||||||
|
|
||||||
QHBoxLayout* hbox = new QHBoxLayout();
|
QHBoxLayout* hbox = new QHBoxLayout();
|
||||||
|
|
||||||
btn1 = new QPushButton("", this);
|
btnCut = new QPushButton("", this);
|
||||||
btn1->setObjectName("new");
|
btnCut->setObjectName("cut");
|
||||||
btn2 = new QPushButton("", this);
|
btnCopy = new QPushButton("", this);
|
||||||
btn2->setObjectName("open");
|
btnCopy->setObjectName("copy");
|
||||||
|
|
||||||
QPixmap pm, pm2;
|
btnCut->setIcon(QPixmap::fromImage(QImage("img/cut.png")));
|
||||||
pm.load("../img/new.png");
|
btnCopy->setIcon(QPixmap::fromImage(QImage("img/copy.png")));
|
||||||
pm2.load("../img/open.png");
|
btnCut->hide();
|
||||||
|
btnCopy->hide();
|
||||||
|
|
||||||
btn1->setIcon(pm);
|
hbox->addWidget(btnCut, 0, Qt::AlignLeft);
|
||||||
btn2->setIcon(pm2);
|
hbox->addWidget(btnCopy, 1, Qt::AlignRight);
|
||||||
btn1->hide();
|
|
||||||
btn2->hide();
|
|
||||||
|
|
||||||
hbox->addWidget(btn1, 1, Qt::AlignRight);
|
|
||||||
hbox->addWidget(btn2, 0, Qt::AlignLeft);
|
|
||||||
|
|
||||||
QVBoxLayout* vbox = new QVBoxLayout();
|
QVBoxLayout* vbox = new QVBoxLayout();
|
||||||
vbox->addStretch(1);
|
vbox->addStretch(1);
|
||||||
@ -59,11 +55,6 @@ void PDFPageWidget::setFather(QWidget* father) {
|
|||||||
this->father = father;
|
this->father = father;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PDFPageWidget::setButton(QPushButton* btn) {
|
|
||||||
button = btn;
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PDFPageWidget::setPopplerPage(Poppler::Page* pp) {
|
void PDFPageWidget::setPopplerPage(Poppler::Page* pp) {
|
||||||
pPage = pp;
|
pPage = pp;
|
||||||
}
|
}
|
||||||
@ -101,15 +92,15 @@ void PDFPageWidget::dropEvent(QDropEvent* event) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void PDFPageWidget::leaveEvent(QEvent* event) {
|
void PDFPageWidget::leaveEvent(QEvent* event) {
|
||||||
btn1->hide();
|
btnCut->hide();
|
||||||
btn2->hide();
|
btnCopy->hide();
|
||||||
|
|
||||||
this->setFrameStyle(QFrame::Plain);
|
this->setFrameStyle(QFrame::Plain);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PDFPageWidget::enterEvent(QEvent* event) {
|
void PDFPageWidget::enterEvent(QEvent* event) {
|
||||||
btn1->show();
|
btnCut->show();
|
||||||
btn2->show();
|
btnCopy->show();
|
||||||
|
|
||||||
this->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
|
this->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
|
||||||
}
|
}
|
||||||
|
@ -19,8 +19,6 @@ public:
|
|||||||
|
|
||||||
void setThumbnail(QImage pageImage);
|
void setThumbnail(QImage pageImage);
|
||||||
void setPopplerPage(Poppler::Page*);
|
void setPopplerPage(Poppler::Page*);
|
||||||
|
|
||||||
void setButton(QPushButton* btn);
|
|
||||||
void setAncestor(QWidget* ancestor);
|
void setAncestor(QWidget* ancestor);
|
||||||
void setFather(QWidget* father);
|
void setFather(QWidget* father);
|
||||||
QWidget* getFather() { return father; }
|
QWidget* getFather() { return father; }
|
||||||
@ -43,11 +41,10 @@ private:
|
|||||||
QWidget* ancestor;
|
QWidget* ancestor;
|
||||||
QWidget* father;
|
QWidget* father;
|
||||||
|
|
||||||
QPushButton* button;
|
|
||||||
QImage image;
|
QImage image;
|
||||||
Poppler::Page* pPage;
|
Poppler::Page* pPage;
|
||||||
QPixmap pixmap;
|
QPixmap pixmap;
|
||||||
QPushButton* btn1, *btn2;
|
QPushButton* btnCut, *btnCopy;
|
||||||
|
|
||||||
bool selected;
|
bool selected;
|
||||||
|
|
||||||
|
@ -53,7 +53,6 @@ void PDFPreviewWidget::resizeEvent(QResizeEvent* event) {
|
|||||||
|
|
||||||
void PDFPreviewWidget::wheelEvent(QWheelEvent* event) {
|
void PDFPreviewWidget::wheelEvent(QWheelEvent* event) {
|
||||||
if(pPage != NULL) {
|
if(pPage != NULL) {
|
||||||
qDebug() << currentPixmapSize;
|
|
||||||
if(event->delta() > 0)
|
if(event->delta() > 0)
|
||||||
currentPixmapSize += QSize(30, 30);
|
currentPixmapSize += QSize(30, 30);
|
||||||
else if(event->delta() < 0)
|
else if(event->delta() < 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user