diff --git a/YACReader/images.qrc b/YACReader/images.qrc index de6516b3..543c5ad8 100644 --- a/YACReader/images.qrc +++ b/YACReader/images.qrc @@ -36,6 +36,8 @@ ../images/alwaysOnTop.png ../images/adjustToFullSize.png ../images/numPagesLabel.png + ../images/numPagesLabelMedium.png + ../images/numPagesLabelBig.png ../images/imgTopLeft.png ../images/imgTopMiddle.png ../images/imgTopRight.png diff --git a/YACReader/page_label_widget.cpp b/YACReader/page_label_widget.cpp index bbcd20c4..eaa70c7b 100644 --- a/YACReader/page_label_widget.cpp +++ b/YACReader/page_label_widget.cpp @@ -3,22 +3,37 @@ #include #include #include +#include +#include PageLabelWidget::PageLabelWidget(QWidget * parent) :QWidget(parent) { animation = new QPropertyAnimation(this,"pos"); animation->setDuration(150); - + + int verticalRes = QApplication::desktop()->screenGeometry().height(); imgLabel = new QLabel(this); - QPixmap p(":/images/numPagesLabel.png"); + QPixmap p; + if (verticalRes <= 1024) + p.load(":/images/numPagesLabel.png"); + else if (verticalRes <= 1200) + p.load(":/images/numPagesLabelMedium.png"); + else + p.load(":/images/numPagesLabelBig.png"); imgLabel->resize(p.size()); imgLabel->setPixmap(p); textLabel = new QLabel(this); textLabel->setAlignment(Qt::AlignVCenter|Qt::AlignHCenter); - textLabel->setStyleSheet("QLabel { color : white; }"); + if(verticalRes <= 1024) + textLabel->setStyleSheet("QLabel { color : white; padding-left:8px; }"); + else if (verticalRes <= 1200) + textLabel->setStyleSheet("QLabel { color : white; font-size:16px; padding-left:8px;}"); + else + textLabel->setStyleSheet("QLabel { color : white; font-size:20px; padding-left:8px; }"); + //informationLabel->setAutoFillBackground(true); //textLabel->setFont(QFont("courier new bold", 12)); //textLabel->resize(100,25); @@ -50,8 +65,8 @@ void PageLabelWidget::show() //connect(animation,SIGNAL(finished()),this,SLOT(QWidget::hide())); animation->disconnect(); - animation->setStartValue(QPoint((parent->geometry().size().width()-this->width())/2,-this->height())); - animation->setEndValue(QPoint((parent->geometry().size().width()-this->width())/2,0)); + animation->setStartValue(QPoint((parent->geometry().size().width()-this->width()),-this->height())); + animation->setEndValue(QPoint((parent->geometry().size().width()-this->width()),0)); animation->start(); } } @@ -67,8 +82,8 @@ void PageLabelWidget::hide() return; } //connect(animation,SIGNAL(finished()),this,SLOT(setHidden())); - animation->setStartValue(QPoint((parent->geometry().size().width()-this->width())/2,0)); - animation->setEndValue(QPoint((parent->geometry().size().width()-this->width())/2,-this->height())); + animation->setStartValue(QPoint((parent->geometry().size().width()-this->width()),0)); + animation->setEndValue(QPoint((parent->geometry().size().width()-this->width()),-this->height())); animation->start(); } } @@ -78,7 +93,7 @@ void PageLabelWidget::setText(const QString & text) textLabel->setText(text); QRect geom = imgLabel->geometry(); QSize size = geom.size(); - size.setHeight(size.height() - 10); //TODO remove this amazing magic number + size.setHeight(size.height() - 10);//TODO remove this amazing magic number geom.setSize(size); textLabel->setGeometry(geom); } @@ -95,5 +110,5 @@ void PageLabelWidget::updatePosition() { return; } - move(QPoint((parent->geometry().size().width()-this->width())/2,this->pos().y())); + move(QPoint((parent->geometry().size().width()-this->width()),this->pos().y())); } \ No newline at end of file diff --git a/images/numPagesLabel.png b/images/numPagesLabel.png index d18a10c4..e2956ebe 100644 Binary files a/images/numPagesLabel.png and b/images/numPagesLabel.png differ diff --git a/images/numPagesLabelBig.png b/images/numPagesLabelBig.png new file mode 100644 index 00000000..e2235e03 Binary files /dev/null and b/images/numPagesLabelBig.png differ diff --git a/images/numPagesLabelMedium.png b/images/numPagesLabelMedium.png new file mode 100644 index 00000000..82ece58f Binary files /dev/null and b/images/numPagesLabelMedium.png differ