From 0b0164572953231df4edae453d7702bb727f44aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 11 Feb 2013 11:40:28 +0100 Subject: [PATCH] modificada informationLabel (3 tama?os y aliniamiento a esquina superior derecha) --- YACReader/images.qrc | 2 ++ YACReader/page_label_widget.cpp | 33 +++++++++++++++++++++++--------- images/numPagesLabel.png | Bin 710 -> 569 bytes images/numPagesLabelBig.png | Bin 0 -> 609 bytes images/numPagesLabelMedium.png | Bin 0 -> 612 bytes 5 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 images/numPagesLabelBig.png create mode 100644 images/numPagesLabelMedium.png 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 d18a10c4d0314aa2698125f42a5c4622f5e183c2..e2956ebe40f38f5348f8cd9d4031d4bd65a5bc81 100644 GIT binary patch delta 507 zcmVIIEv-b;&jtA4U#0m3V~n3Xk5;&ZAciA=Q&mg9BmjajDO^Jp6j|I%QCDGsBDVzpv<7#2hFrZGD197(7ErbD$8m4&0mIRtMOaU4OoGc6)2B2ZU-w31s5`Zw^ zBw?^60c=SC4FfR4fd3}Udc8)&fLdX4PVtO}0ZkhwH^QJ{K$C{iwURBD%Y=mSAq}V! z#+D`3nayTjVSgCDEEWr_64)Wd{*;|Qo_R(IDZTl8{yiKH-)Q)im}P)LA7}75JxZT) zOL?F?4F-eP@p$|}(sWj<6=oVx2vd2@gmSONiK6IvG#b6far`KyR9G?yqd0myinwL2 zDK{Mbe8CMAuwbq@Ja7eCB#fD3d=|n;bIIv*^Movw5_J1(DWHYI*mshQG`daBIa;7D zzxP-!G)#+yDc?!*t*@n!MKQ9dk}#m9!Z_CUq^vI|pMN`?vMi9Mg~EsmX{6OAsx-Ga x5C+0jwT)|SRSxDBP}LC55qZ!kpx{S<0RS`Gs7x|{#drV!002ovPDHLkV1kTp=Dz>{ delta 650 zcmV;50(Jel1jYrBNPhxoNklWyj423!RaonVB5abkIf{cOA}Hh4O)^_cM+i0yaznk5~Pjh^CLB$2}G2sOZJlenSHxnub(%Y4MFK?wOSF6 z{{w&h!QQefcFk@Jy(Xx0wwzm3RYfsIJiP=ZV=oLS3%TQi`hUP=2Fz}^qqc4F^b(Ye zy#pp21Evp6Ue`4eCQ-@QYqA`{atfHPH0}3$But``vG0|lQD8hc)HDr%NmMfSo&~RB z1eVTn6G~FjzzovmRKj$UbV0(Tsi|=O;$n-E0CQa#I14tMMB?&^)3tbX0(TwE{$@ehPc`{+*-zbBU zNtig5FrKJJZo+hYn$lLJ8B3WlU|J7MmSuQ?3CXn~jj}KbjE6-E*xPoyeJYCLQPy{g z?X5|SW_TX5KoIA7PGwnk<{sur7*H0Dps_{YgMCTtJAd}Qe%|W&rCv8!91LAn)o}qK zE52o4iR?d;eMsNg-}G~^FDbaem$bQJe`0@Oe^pQnmTMYrJ%BD7nnOil|8mfXf3jcL zzu7yzF8Xzwg?g#b+$bnFdTi-p+YboPTr@0X{i;hDf#X%ddDY`eVHp6EDGUqs(t%>< zay4L?4}Ua``b}LqQ0&~H0q(C1Hy}#qg-ajby8xJZ^fA6PS$V3R4XEy(Aa6Y3&xA|p zHNm#eI;ZhnZ~$f=33D`^qTahyIlLu_g1sU;XvjemMp6Z!%r|MG1H@n%PXlmzlD%gT^W$g7Zk$Ysbd z>QgP-%5qRD2n$+p|As|0^oq`g8lB~m1K{vz$3TO>Gbk#;N+{DmS} zBv2$!Bv2%HVTxl#0xS|J5-1WV(w+5stw>;zz#@S~0!6Y&V3FWoD~>G^;AjVqc3_b} zkrW9O2^0ww2^2|@;CZ|u3l<3!30_8#R;!gFfklG1Oo?ztktX^XTgl%pM-wn)uK ztZo;J#XQgR$|tVE)0*#(En=Edon?35CEE+>4+euzRaIRrmrGX)jua_Riqs7`54mW{ zG@H$Sj7Fo|aKtMe@! z$cHAqUhnhG&CS=kuCL3o?6_?3ut<3-f5EvS_(Wi6Y&v zQWaO}O;V;dgZTSid|fyBXGNw=DAIkI+IysnxJ-2{R2|cgf2%AK>=)_qUa6ZbQ!l0; zAKPPH6_0|2MS}ezrDf{Gvb2S2bN-8Cokc>C9=Tsi-&ZG*w9x>Ci#aZY(4_$j~uC^PhMz(|B=00000NkvXXu0mjfJ5dkl literal 0 HcmV?d00001 diff --git a/images/numPagesLabelMedium.png b/images/numPagesLabelMedium.png new file mode 100644 index 0000000000000000000000000000000000000000..82ece58f22acb464a8b929aff8db03876bd349a7 GIT binary patch literal 612 zcmV-q0-ODbP)Me3ZkG; zige>jaOD&Dro~t2yZ8=vRa5OH={Qqo;BUxM+8H?qKAK(^_g^J=x?pMv19M?1+=a&p_W zCWXnMs;bY)Wb(4zZhN#Zgeq_1t}`dFJ!r4LUa$3Xx%?Q9$4~Y>ZWlvHNO60vaZB}k z%;~Mkz0GJedYn$DuVq<2WLcK;w?Rnq`qLrp$Z%;g5(4|&xYvj7bGiFYDt-&#Gh}#|+5ExFrVC!1I$wi#siI9(}XkCT85Q4m_ y)ugF9zKM~xMg@e0pych6IOz};apA1|2rvMJE&4$32xYYZ0000