From 8cb5e4978bffe68588ba0da5387ab05d895f4d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 7 Feb 2013 22:07:31 +0100 Subject: [PATCH] width slider terminado... --- YACReader/YACReader.pro | 2 + YACReader/images.qrc | 2 +- YACReader/main_window_viewer.cpp | 8 +++- YACReader/main_window_viewer.h | 3 +- common/custom_widgets.cpp | 63 ------------------------------- common/custom_widgets.h | 4 -- images/sliderAddPage.png | Bin 186 -> 186 bytes images/sliderBackground.png | Bin 304 -> 564 bytes images/sliderGround.png | Bin 955 -> 951 bytes images/sliderHandle.png | Bin 868 -> 1089 bytes images/sliderSubPage.png | Bin 182 -> 185 bytes 11 files changed, 11 insertions(+), 71 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 25fe7d8d..93c7091b 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -48,6 +48,7 @@ HEADERS += comic.h \ page_label_widget.h \ goto_flow_toolbar.h \ goto_flow_decorationbar.h \ + width_slider.h \ ../common/pictureflow.h \ ../common/custom_widgets.h \ ../common/check_new_version.h \ @@ -75,6 +76,7 @@ SOURCES += comic.cpp \ page_label_widget.cpp \ goto_flow_toolbar.cpp \ goto_flow_decorationbar.cpp \ + width_slider.cpp \ ../common/pictureflow.cpp \ ../common/custom_widgets.cpp \ ../common/check_new_version.cpp \ diff --git a/YACReader/images.qrc b/YACReader/images.qrc index 31273fcb..c88922a6 100644 --- a/YACReader/images.qrc +++ b/YACReader/images.qrc @@ -51,7 +51,7 @@ ../images/sliderGround.png ../images/sliderSubPage.png ../images/sliderAddPage.png - ../images/sliderHandle.png + ../images/sliderHandle.png ../images/helpImages/open.png ../images/helpImages/openFolder.png diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 1aead5b6..b27f1198 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -8,7 +8,7 @@ #include "comic.h" #include "bookmarks_dialog.h" #include "shortcuts_dialog.h" - +#include "width_slider.h" MainWindowViewer::MainWindowViewer() :QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest(".") @@ -322,13 +322,17 @@ void MainWindowViewer::createToolBars() //comicToolBar->addAction(adjustWidth); QMenu * menu = new QMenu(); + sliderAction = new YACReaderSliderAction(this); menu->setAutoFillBackground(false); menu->setStyleSheet(" QMenu {background:transparent; border: 0px;padding: 0px; }" ); - menu->addAction(new YACReaderSliderAction(this)); + menu->addAction(sliderAction); QToolButton * tb2 = new QToolButton(); tb2->addAction(adjustWidth); tb2->setMenu(menu); + + connect(sliderAction,SIGNAL(fitToWidthRatioChanged(float)),viewer,SLOT(updateFitToWidthRatio(float))); + //tb2->addAction(); tb2->setPopupMode(QToolButton::MenuButtonPopup); tb2->setDefaultAction(adjustWidth); diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h index c8da2d86..1d16a227 100644 --- a/YACReader/main_window_viewer.h +++ b/YACReader/main_window_viewer.h @@ -15,7 +15,7 @@ class OptionsDialog; class HelpAboutDialog; class HttpVersionChecker; class ShortcutsDialog; - +class YACReaderSliderAction; class MainWindowViewer : public QMainWindow { @@ -91,6 +91,7 @@ class ShortcutsDialog; QAction *showDictionaryAction; QAction *alwaysOnTopAction; QAction *adjustToFullSizeAction; + YACReaderSliderAction * sliderAction; HttpVersionChecker * versionChecker; QString previousComicPath; diff --git a/common/custom_widgets.cpp b/common/custom_widgets.cpp index 7f551649..bbcc909c 100644 --- a/common/custom_widgets.cpp +++ b/common/custom_widgets.cpp @@ -1205,67 +1205,4 @@ YACReaderFlowConfigWidget::YACReaderFlowConfigWidget(QWidget * parent ) layout->setContentsMargins(0,0,0,0); setLayout(layout); -} - - -YACReaderSliderAction::YACReaderSliderAction (QWidget * parent) - :QWidgetAction (0) { - - //QWidget* pWidget = new QWidget (0); - - //QLabel* imgLabel = new QLabel(pWidget); - //QPixmap p(":/images/numPagesLabel.png"); - //imgLabel->resize(p.size()); - //imgLabel->setPixmap(p); - - //QLabel * textLabel = new QLabel(pWidget); - //textLabel->setAlignment(Qt::AlignVCenter|Qt::AlignHCenter); - //textLabel->setStyleSheet("QLabel { color : white; }"); - //textLabel->setText("hola"); - ////informationLabel->setAutoFillBackground(true); - ////textLabel->setFont(QFont("courier new bold", 12)); - ////textLabel->resize(100,25); - - //textLabel->setGeometry(imgLabel->geometry()); - - //setDefaultWidget(pWidget); - - QWidget* pWidget = new QWidget (NULL); - QHBoxLayout* pLayout = new QHBoxLayout(); - QLabel * pLabel = new QLabel ("100%"); - pLabel->setStyleSheet("QLabel { color : white; }"); - pLayout->addWidget (pLabel); - QSlider * slider = new QSlider(NULL); - slider->setOrientation(Qt::Horizontal); - pLayout->addWidget (slider); - //"background-image: url(:/images/sliderGround.png); width: 100%; height:100%; background-repeat: none; border: none; padding: 0px; color: white;" - //"QSlider::sub-page:horizontal {background-image: url(:/images/sliderSubPage.png); background-repeat:repeat-x;}" - QString sliderCSS = //"QSlider {background-image: url(:/images/sliderGround.png); width: 100%; height:100%; background-repeat: none; border: none; padding: 0px;} " - - "QSlider::sub-page:horizontal {background-image: url(:/images/sliderSubPage.png); border: 0px; margin-left: 18px;}" - "QSlider::add-page:horizontal {background-image: url(:/images/sliderAddPage.png); border: 0px; margin-right: 18px;}" - "QSlider::handle:horizontal {image: url(:/images/sliderHandle.png); width: 100px;height:45px;padding:-20px; margin-left:-10px; margin-right:-10px; }" - "QSlider::groove:horizontal {border-image:url(:/images/sliderGround.png); border-left:-10px; border-right:-10px;}" - ; - - //"QSlider::handle {background-image: url(:/images/sliderHandle.png); border: 0px; width: 31px; height:45px; margin:0px; padding:0px;}" - slider->setStyleSheet(sliderCSS); - slider->setFixedSize(214,45); - - QLabel* imgLabel = new QLabel(pWidget); - QPixmap p(":/images/sliderBackground.png"); - imgLabel->resize(p.size()); - imgLabel->setPixmap(p); - - pLayout->setMargin(0); - pLayout->setSpacing(0); - - pWidget->setLayout (pLayout); - pWidget->setAutoFillBackground(false); - - //pWidget->setMinimumSize(250,45); - - setDefaultWidget(pWidget); - - } \ No newline at end of file diff --git a/common/custom_widgets.h b/common/custom_widgets.h index d78c7b8d..a95cf225 100644 --- a/common/custom_widgets.h +++ b/common/custom_widgets.h @@ -371,10 +371,6 @@ signals: ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -class YACReaderSliderAction : public QWidgetAction { -public: - YACReaderSliderAction (QWidget * parent = 0); -}; #endif diff --git a/images/sliderAddPage.png b/images/sliderAddPage.png index 1c2851964d1c1f8292de0f96feb809e8303f9937..dac9b0a03df6e428953d89659ea82049df9eec67 100644 GIT binary patch delta 112 zcmV-$0FVE=0lEQ@QE81!3cw%?M0FBB=+;|!CGUR$%}OvOrMpt-z=L7nF@B5zRsF;{ z_u4EeB`&2H)_rRYb57J+5kk1Vy*Jic=)FTkaLxe{A;yTDGtB+_`9REk2`~Uq*;8fg SWV7A?0000Z#ZM^?2#25)_lj6ZI1_omcuC+b^ zcw0p1oMQ;#FvcL~4DUTsN+_iqckdl~@0@d@wT4 zL_t(|+U(suj@vL0hG9|GNs^q$2X*Q5Y*H^=Zwmj2+>w0(u?U9o^A?250jL+>%)pk* z>2x}u&r@#xeEk0L>*oZd;dneQ>$PabU>EDSo^wz`rB76yItNFHe0v~3^{c|e{awr%gVsxGB?e>%sICwZ02 zveZ`Ne4mSvv17;lPCWy@!AKH2iZpPEqN}NOY%bhetosiPZx$% bd3v delta 275 zcmdnOvVlplGr-TCmrII^fq{Y7)59eQNdE$2T@EH7$+7j}--(Lq^$eFhT^vIyZoRqX z$k(hO;BYZ$=REe(vnzKnXBZaVPv!m`_lWfbzohz-#};0i`Vn{cz2Eu0E_V9ngi7VF zccLa+3-(;O`_5(8-KTwb9N#?%7yYxUDUq#i%J1qLKBn!~CuEv9pXG6^Fm6s{1FC6XS>&&2$vv%n-t)aP zPg+`YPy3#ewk@|2y3$KESZ)P{qA#b_Ov( Pe=>Nw`njxgN@xNAk*j%J diff --git a/images/sliderGround.png b/images/sliderGround.png index 1f427f3c729a029164d47bfe410d16cc7ead306b..294d610870c411c1b3d5d1e99e20dabdb16a3391 100644 GIT binary patch delta 926 zcmV;P17ZBT2e$_yiBL{Q4GJ0x0000DNk~Le0002m0000j2m$~A07vNJEs-H8e_2UH zK~#9!?3_(%DnS&5)hH$q6j4DOIdqa`ICTZiU4kIu$UV3uhgm@4$bnD65b-xrpYPb0 z6qo8sYe)vZ)cFQYb*n8{U(T)DZHzY>jTj+UK)qg19*;+U5ab#-91hfxTnqdCo;nhy zBO%n0P)9xKCNCfzxbpU<15v|eQwYwSxvK0iOV z+wDrF0-dwjY$}zyun>pCfBfz34M97ZOnSXutJUJnc_O8Z#VGiPn{Z*SA-^lrBskH^rObLNSWVjGI;Apl;%0b~=l zvKn-zV?wVw&5{$<`NyLhXD*dWoG_n3FqzIKEXhectISI}V!b$H-r_ROb zjIgI917UZHA-FBiItwP`_exm>^BZ#J8#uvRM*3vSy) z_c78XVT)wO0IdwFf4AGk>VXsHo1G#U)@PsRz0fa<*6G z*C?gOX2$hFeKT2*R#?iW)b5B@#=a|~Ggg=H@MZUy>mCtB^h(OGqn3+ep2VTn#u#}< zM=iDWrw|tLGac!opGI1@jnLrC9MR`uD3WhVbZLx~p4h31`|G!OfhD4I zrFhAO9^#3M7kU}tVl3h}dYpYYAwP2I=d*|SzcS>CppJw(5<(pbbtL2qI`Su@2-A@e z>PV;~A=HsjM?$D0`3;=DLNT3A`9Y8?;hz8l08_i|M(w@T@&Et;07*qoM6N<$fOc^Nfe-~KAmWnFEd>P~FA#~67l@)f81NQ62q=m|hbT{lxJVEn!1<3y z8ZGO^As5Lf`2UL4`j#N?ml@BlN%HaWF+oT~v|6q7;c(!MAW^Z~?WiD$lK1y_Do7Xw z2^HjxAXJc0K|)xL5Jo{lB2X~Jf4e{!1ql@-7)JNQQkh{BxscEIryAa5vNiq z7$&W#X0|kvggd93W=GiX_tJ(%!K)CFUnXeZ_gVxC*U zlutUHHbpco6e&%UtN{6;XY}v4TNsjOt(a$-2X;Pkj&$4#s%n;b$zz3|4B0oiRUax1f+1=e8F6nl=9Icp$sCia` z8loL69FNEOeBP{A>_n`62-|2h;9t314$jV;|7p->GMSs3o9%XszW}Jraf*qBVi=OA zlpwGW4j>-EMf3cV3L^9Vcv!}VfP(lO9H-cVc%+kp63!g+g0hL{f4_dekC=%Nh!#eg z@$XZ$k|g5EWb*p@x?C?QBXEfx%7HHbWp`u<%rDPgx4Yo zf8hl!Vjen3>x03d)9J7riJ_4i)I86-y}cDZ`F#Gz=jG*ve}h594QrYi#fDuG>%0sOBX4T)oH$-)KD8|P{W6|J%NG_GoUnUy?nEr}dFrCM*m6q5kQGC6*^UN_grI`@z5%Qd^W>;wQpOZfSNALt6RtJE z^Zlcm7Z46ZUI_>WKY8XeUoFs`?uu9?RsWpkh4@GFVwjpkcw(V+G!SZ0ds0EUOzL0f zlp%d0UobLp{1UV(6!s-f^8!MCcBV%A{O$;e7%E7pAfbX(kVMFSzo&vEO89S$2oo`h zy@LF=Mubt2P(j`ZLInvGBqR#{y}0jr9&ZGRkiP;909Ez0ifJqnUH||907*qoM6N<$ Ef=QUTF8}}l diff --git a/images/sliderHandle.png b/images/sliderHandle.png index 4c8730bfac76b50a41f35b32975fc7b0fcf0eeb3..033c86589ead7a64dc4b73497ff0c48ea908b712 100644 GIT binary patch delta 1030 zcmV+h1o`{q2EhoBNq^%>L_t(|+U!`}P7_fO-oI|?j}ThH#ClrKO@sYE3~Q(9a4$9CJ@?K-p0DbvI5QmTkiPV%K^x1ICN%$YMY zr>gJ!%2f?bxx#Txeog-WkQ>tqsxZXdpE6mflgM!*e2n?2e}55$j0s8kry8Mv&!7m= zI3=N}qn55=I2E$^sIh6Eu?HN^mll<{n{42s|MxU_=nBj1+&9AQ%iX zxy#@XT&Bbs1&jz{oslE~CSV5VD=RB^i^byOOeRwhvL`1eUrVLZ`<fRl?oM&cA81DL%7V|{&nqkmSbErMm|<^=EzDpB3s+K?=oy{@>fdoJ*Is3^*zJgsBWy1L-Pp-FjO zkfY1f_hBRwi6^+A<2VzeTCFN5hw?-|!^kx`+T}eD01g#dvfO~@cs=5ri!5it0;+A>HOSo$ zfIKPoQzk_>W3d6^4kVd3Fvs)VWaJj*_)&h>V;YB1?FMUXD4S)N=YZrU65$CD84XVa zo_}j_^#@3;Z{ZnB>oFte#pSfVOID9kE7l0WJRpyxgjq zi*}b90F@O1j~3_=L6W>AhC?zIQ=mh0i+^=AW6^Gi&XTMb$4n@oND5gjSL@7jp`6V+ z7)v7dcq0+jItwzMbhu@5ZI-tys)rlK-dHZVd-b{1q1UC$>f2@F$h+F_ys?M?3%jwz zUKD@jt`HkNq+`OL_t(|+U%FTj?+L8$9H2pAx?5aCL5UPmgOr{I zrAbT8Bfv96qTmq%6i8PgQBa%|DkQEUMHJEG>tZK9e=M`nEKC+Vb`Fk{AS?Z~8)v+~ znf1sBzoM*g8?BbA_5lVZ$C2|o16@TY}>!2LzbL6_3JVFWV zQynlI9)E6$AiJ(Rj=3k05&TWM+aDv13Uq)zd6h%KI zf4i>BEX%svXf$s3`~CN16AIFAG$SQyTY{U-=7Var`gAgxY(RCbRx4)P_MJ+l@);h( z5TgwUJkv8*&ss)q*J`!Lf;YVC@4}Tp9wA9>y>#1dt=nv(xW@*yF zd_I4O_qjNahjT{Mfw)x5=^GBfr7Tga2D`t6tCq)k3{seWS@yUxnp4Z~IF1W&J1ZQr z!Hua0`urlT$gBk$?F5#xu><@hZk{X^PUspAhexo98irw{g2OOmqtWOnZk}CJO;)xd zEV~1d-+zKUzp+l?%(fh=)fWTGd z;@W>_@n0000*0k#24o49qzn?wlR>-g&KsblQ8LT`A@F=SyDmCBOjY WJz5+eg9zRL0000