From 405cfc864d3ffb6ac8484dbf5f6e598c567f6557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 11 Dec 2015 20:59:18 +0100 Subject: [PATCH] updated go to flow visual style --- YACReader/goto_flow.cpp | 27 +++++++------- YACReader/goto_flow.h | 25 ++++++------- YACReader/goto_flow_gl.cpp | 14 ++++++-- YACReader/goto_flow_gl.h | 1 + YACReader/goto_flow_toolbar.cpp | 59 ++++++++----------------------- YACReader/goto_flow_toolbar.h | 1 - YACReader/goto_flow_widget.cpp | 2 -- YACReader/yacreader_images.qrc | 7 ---- images/imgBottomLeft.png | Bin 221 -> 0 bytes images/imgBottomMiddle.png | Bin 142 -> 0 bytes images/imgBottomRight.png | Bin 210 -> 0 bytes images/imgCenterSlide.png | Bin 803 -> 298 bytes images/imgCenterSlidePressed.png | Bin 814 -> 339 bytes images/imgEdit.png | Bin 851 -> 0 bytes images/imgGoToSlide.png | Bin 947 -> 204 bytes images/imgGoToSlidePressed.png | Bin 940 -> 241 bytes images/imgTopLeft.png | Bin 188 -> 0 bytes images/imgTopMiddle.png | Bin 137 -> 0 bytes images/imgTopRight.png | Bin 195 -> 0 bytes 19 files changed, 53 insertions(+), 83 deletions(-) delete mode 100644 images/imgBottomLeft.png delete mode 100644 images/imgBottomMiddle.png delete mode 100644 images/imgBottomRight.png delete mode 100644 images/imgEdit.png delete mode 100644 images/imgTopLeft.png delete mode 100644 images/imgTopMiddle.png delete mode 100644 images/imgTopRight.png diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index dd72adf0..fdb17057 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -34,7 +34,6 @@ GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) worker = new PageLoader(&mutexGoToFlow); - flow = new YACReaderFlow(this,flowType); flow->setReflectionEffect(PictureFlow::PlainReflection); imageSize = Configuration::getConfiguration().getGotoSlideSize(); @@ -46,23 +45,14 @@ GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(showSlide(unsigned int))); - mainLayout->insertWidget(0,flow); - mainLayout->setStretchFactor(flow,1); + mainLayout->addWidget(flow); + toolBar->raise(); - resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7)); - - //install eventFilter - //flow->installEventFilter(this); - /*edit->installEventFilter(this); - centerButton->installEventFilter(this); - goToButton->installEventFilter(this); - - connect(edit,SIGNAL(returnPressed()),goToButton,SIGNAL(clicked()));*/ + resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); this->setCursor(QCursor(Qt::ArrowCursor)); - - } + GoToFlow::~GoToFlow() { delete flow; @@ -84,6 +74,15 @@ void GoToFlow::keyPressEvent(QKeyEvent *event) GoToFlowWidget::keyPressEvent(event); } +void GoToFlow::resizeEvent(QResizeEvent *event) +{ + QWidget::resizeEvent(event); + + toolBar->move(0, event->size().height() - toolBar->height()); + toolBar->setFixedWidth(width()); +} + + void GoToFlow::centerSlide(int slide) { if(flow->centerIndex()!=slide) diff --git a/YACReader/goto_flow.h b/YACReader/goto_flow.h index eb2c2112..6609b854 100644 --- a/YACReader/goto_flow.h +++ b/YACReader/goto_flow.h @@ -48,20 +48,21 @@ private: virtual void wheelEvent(QWheelEvent * event); QMutex mutexGoToFlow; - private slots: - void preload(); - void updateImageData(); +private slots: + void preload(); + void updateImageData(); + void resizeEvent(QResizeEvent *event); - public slots: - void centerSlide(int slide); - void reset(); - void setNumSlides(unsigned int slides); - void setImageReady(int index,const QByteArray & image); - void setFlowType(FlowType flowType); - void updateSize(); - void updateConfig(QSettings * settings); + public slots: + void centerSlide(int slide); + void reset(); + void setNumSlides(unsigned int slides); + void setImageReady(int index,const QByteArray & image); + void setFlowType(FlowType flowType); + void updateSize(); + void updateConfig(QSettings * settings); signals: - void goToPage(unsigned int page); + void goToPage(unsigned int page); }; //----------------------------------------------------------------------------- diff --git a/YACReader/goto_flow_gl.cpp b/YACReader/goto_flow_gl.cpp index 8404d3d6..0612540a 100644 --- a/YACReader/goto_flow_gl.cpp +++ b/YACReader/goto_flow_gl.cpp @@ -28,10 +28,10 @@ GoToFlowGL::GoToFlowGL(QWidget* parent, FlowType flowType) connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(setCenterIndex(unsigned int))); - mainLayout->insertWidget(0,flow); - mainLayout->setStretchFactor(flow,1); + mainLayout->addWidget(flow); + toolBar->raise(); - resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7)); + resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); this->setCursor(QCursor(Qt::ArrowCursor)); } @@ -156,3 +156,11 @@ void GoToFlowGL::keyPressEvent(QKeyEvent* event) GoToFlowWidget::keyPressEvent(event); } + +void GoToFlowGL::resizeEvent(QResizeEvent *event) +{ + QWidget::resizeEvent(event); + + toolBar->move(0, event->size().height() - toolBar->height()); + toolBar->setFixedWidth(width()); +} diff --git a/YACReader/goto_flow_gl.h b/YACReader/goto_flow_gl.h index 5b6ed1b5..31bd65e0 100644 --- a/YACReader/goto_flow_gl.h +++ b/YACReader/goto_flow_gl.h @@ -32,6 +32,7 @@ signals: private: YACReaderPageFlowGL * flow; void keyPressEvent(QKeyEvent* event); + void resizeEvent(QResizeEvent *event); //Comic * comic; QSize imageSize; }; diff --git a/YACReader/goto_flow_toolbar.cpp b/YACReader/goto_flow_toolbar.cpp index 9b891446..49195624 100644 --- a/YACReader/goto_flow_toolbar.cpp +++ b/YACReader/goto_flow_toolbar.cpp @@ -5,50 +5,25 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent) :QWidget(parent) { - //fondo - QBoxLayout * background = new QHBoxLayout(this); - - QLabel * imgBottomLeft = new QLabel(this); - QLabel * imgBottomRight = new QLabel(this); - QLabel * imgBottomMiddle = new QLabel(this); - QPixmap pBL(":/images/imgBottomLeft.png"); - QPixmap pBM(":/images/imgBottomMiddle.png"); - QPixmap pBR(":/images/imgBottomRight.png"); - imgBottomLeft->setPixmap(pBL); - imgBottomRight->setPixmap(pBR); - imgBottomMiddle->setPixmap(pBM); - imgBottomMiddle->setScaledContents(true); - //imgTop->setStyleSheet("background-image: url(:/images/numPagesLabel.png); width: 100%; height:100%; background-repeat: none; border: none"); - - background->addWidget(imgBottomLeft); - background->addWidget(imgBottomMiddle); - background->addWidget(imgBottomRight); - background->setStretchFactor(imgBottomLeft,0); - background->setStretchFactor(imgBottomMiddle,1); - background->setStretchFactor(imgBottomRight,0); - - background->setMargin(0); - background->setSpacing(0); - //elementos interactivos - //QVBoxLayout * mainLayout = new QVBoxLayout; + QVBoxLayout * mainLayout = new QVBoxLayout; bar = new QWidget(this); QHBoxLayout * bottom = new QHBoxLayout(bar); bottom->addStretch(); - bottom->addWidget(new QLabel(tr("Page : "),bar)); + bottom->addWidget(new QLabel("" + tr("Page : ") + "",bar)); bottom->addWidget(edit = new QLineEdit(bar)); v = new QIntValidator(bar); v->setBottom(1); edit->setValidator(v); edit->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit->setStyleSheet("background-image: url(:/images/imgEdit.png); width: 100%; height:100%; background-repeat: none; border: none; padding: 3px; color: white;"); + edit->setStyleSheet("QLineEdit {border: 1px solid #77000000; background: #55000000; color: white; padding: 3px 5px 5px 5px; margin: 13px 5px 12px 5px; font-color: white; font-weight:bold}"); QPixmap p(":/images/imgEdit.png"); edit->setFixedSize(54,50); edit->setAttribute(Qt::WA_MacShowFocusRect,false); - edit->setAttribute(Qt::WA_LayoutUsesWidgetRect,true); + //edit->setAttribute(Qt::WA_LayoutUsesWidgetRect,true); //edit->resize(QSize(54,50)); edit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed)); - edit->setAutoFillBackground(false); + //edit->setAutoFillBackground(false); connect(edit,SIGNAL(returnPressed()),this,SLOT(goTo())); QString centerButtonCSS = "QPushButton {background-image: url(:/images/imgCenterSlide.png); width: 100%; height:100%; background-repeat: none; border: none;} " @@ -58,7 +33,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent) //centerButton->setIcon(QIcon(":/images/center.png")); centerButton->setStyleSheet(centerButtonCSS); centerButton->setFixedSize(26,50); - centerButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true); + centerButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true); connect(centerButton,SIGNAL(clicked()),this,SLOT(centerSlide())); bottom->addWidget(centerButton); @@ -79,17 +54,21 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent) bottom->setSpacing(0); bar->setLayout(bottom); - //mainLayout->addWidget(bar); - setLayout(background); - bar->setGeometry(QRect(0,0,400,50)); - + + mainLayout->setMargin(0); + mainLayout->setSpacing(0); + mainLayout->addWidget(bar); + + setLayout(mainLayout); + + setFixedHeight(50); } void GoToFlowToolBar::paintEvent(QPaintEvent *) { QPainter painter(this); - painter.fillRect(0,0,width(),height(),QColor("#BB000000")); + painter.fillRect(0,0,width(),height(),QColor("#99000000")); } void GoToFlowToolBar::setPage(int pageNumber) @@ -102,14 +81,6 @@ void GoToFlowToolBar::setTop(int numPages) v->setTop(numPages); } -void GoToFlowToolBar::resizeEvent(QResizeEvent * event) -{ - - bar->setGeometry(QRect(0,(event->size().height()-50)+((50-bar->height())/2),event->size().width(),50)); - - QWidget::resizeEvent(event); -} - void GoToFlowToolBar::goTo() { if(edit->text().toInt()!=0) diff --git a/YACReader/goto_flow_toolbar.h b/YACReader/goto_flow_toolbar.h index aafbe857..cdd5bad7 100644 --- a/YACReader/goto_flow_toolbar.h +++ b/YACReader/goto_flow_toolbar.h @@ -16,7 +16,6 @@ class GoToFlowToolBar : public QWidget QPushButton * centerButton; QPushButton * goToButton; QWidget * bar; - void resizeEvent(QResizeEvent * event); void paintEvent(QPaintEvent *); public: diff --git a/YACReader/goto_flow_widget.cpp b/YACReader/goto_flow_widget.cpp index 5441b662..83487b62 100644 --- a/YACReader/goto_flow_widget.cpp +++ b/YACReader/goto_flow_widget.cpp @@ -17,8 +17,6 @@ GoToFlowWidget::GoToFlowWidget(QWidget * parent) toolBar = new GoToFlowToolBar(this); - mainLayout->addWidget(toolBar); - mainLayout->setMargin(0); mainLayout->setSpacing(0); diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc index f576763d..6eaed151 100644 --- a/YACReader/yacreader_images.qrc +++ b/YACReader/yacreader_images.qrc @@ -13,13 +13,6 @@ ../images/close.png ../images/up.png ../images/down.png - ../images/imgTopLeft.png - ../images/imgTopMiddle.png - ../images/imgTopRight.png - ../images/imgBottomLeft.png - ../images/imgBottomMiddle.png - ../images/imgBottomRight.png - ../images/imgEdit.png ../images/imgCenterSlide.png ../images/imgGoToSlide.png ../images/imgCenterSlidePressed.png diff --git a/images/imgBottomLeft.png b/images/imgBottomLeft.png deleted file mode 100644 index 27fa17093d33cd9042919a5ce0f768eb32a17601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tu!2~4V_3(-VDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MfIL8jv*Ddj!ZBVYEa-|@qFN!w9tOT#qFQPS2Uc6@Cs@< zXsBvE{VCJ&%D1b{@9sFOuh=r>lC(fz&qU7)#Sf5)y zX<8JsH*3Ly7c(^S9V%nLu1{&-_h5oEOUDUjh6jyXzb$XFe7;_Gon^`Oy{r-pmR>)j UbVO`^0G-0%>FVdQ&MBb@04Y9Hq5uE@ diff --git a/images/imgBottomMiddle.png b/images/imgBottomMiddle.png deleted file mode 100644 index 142bf3ac8a18443e130e07bbc1a677d05997a846..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tu!2~4V_3(-VDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MFyTOjv*Ddl5%o$QxC93_|36sjD7U~|NkYP28It9mPngg o=*oY6u!7y4xo|?2fWiTWS(?Qfo)QoAfO;7`UHx3vIVCg!0H5?LqW}N^ diff --git a/images/imgBottomRight.png b/images/imgBottomRight.png deleted file mode 100644 index e9417476454ec16ac6f760e42eb171d6e8946185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^96)Tu!2~4V_3(-VDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MJ1jtjv*DduJjx7H5hQXN?%_2{NmByUo+Ht=e6@j&D5UZ z(9zlRpIuJ>der6QzR#!DZq?LX`sVhm;}XG)3^H7-{O#V8mVIBBccOLI$FLJ09M}XU zSz~z?FL)g?Wx=Tp)jRxd?(b@mdK II;Vst0M%MhI{*Lx diff --git a/images/imgCenterSlide.png b/images/imgCenterSlide.png index 4e531b983a5f5cd0c4ca20b1ca364aa99bafce0f..0c50ca860aaba6c6204e9b4852331406fe02f3d6 100644 GIT binary patch delta 246 zcmVIfrvCH*dkyk zfWlG|DDWE?3OX7ru&}f-lvH#U6n+FuAcWS=gix3Wkw%FW1QHU25Q6xJu)MQevv1!% zeBm)ua2j@Immg>Dy>oXEQmNDiKk3WmGEbZ!2y2WJMRASY8I4AsxUH=%&bZlZ#(xf? zpmD zf$$sm_4UQ>4xDe?$H&Lt&)MzvXn!<{GBTUZjYgwbEY@nZf4jp_cX)U>9*<{#YJYz} zolbi^9x{%La5&uQbY5OwG*3!%!5vDi*=#P3T|6F#sq5?OLZN`6-|tT*lc%SrrBdnb z?QNkua4-}pvuf?`?&AB8kB_-rj%F&AN*5BPk(=?|jCid1)MA!@h*gnxRnTCGw* zr5{A^9FbP8*7Nf-ZUh1W_2kjf5hfoV9u`^ygqny*1GR?3A-uR;u8WHcG*`@=%!Q|= zpGA8?h{a;415GNnx3{mZuH0_7W*&JsKR>V6>*`5jAr5zUcRH`vI~WW!=|>a1y}j-C z`{>nJ;LXiVHk%EFLim~E<9}nELwdcQrdCWQ6B?8diA3p9c6gow&}o%^u-cJFeIZyZ7G7sX5P6=n<>SBxSMmNMfIhXxIK~>* l;^_UzOPn*y8TU(o0RXM}8>&Mw*~EWy>&`;y6!oz1@C?T_OSLI@#*m~l-L>bee* z3PglZh!#<1S$4E01QES>BLbZahmtoCJIodG4E3FeY_aG{2fh?YIkaMJ5rggSXosv`c z$s*lMf~Hy<_ehJaM|SCbtK>k;5_6Z{^wAwNig`_;1^~_JN>OG2UkykA0000-E}+^Z9%><8HUx--9Ryw&94Vsj7Mt>;(kphJVot zhr=S}DWa5Q5Aav7MVvG@x{9W0Znqm(Bp?0Ay(!qPDauE0)c7F{{Aaudd zg)W zI#fC|;Bf#13e`?2CX!)t=z=;BQ6hW29`7AigT{Wp|G-IA)6_u3!hL@K@3%KPFkJNj zML||D4~SHXU;ADG=yEsgvL@!FmD*`q1$ez0Cmr>zELl3OB!$+liEAA`$ySKco9uz3 zEaP2x4M%6zCu{Klrc5uD^hPf_oQW0BDQPjqR-VBme*a07*qoM6N<$f~s$3vj6}9 diff --git a/images/imgEdit.png b/images/imgEdit.png deleted file mode 100644 index c18d8ec9a508c85dc29e2d32d2620e229109b062..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmV-Z1FZasP)6OltFRkPQXKt+PP-|r;S^?E%V4!7HlZYRrPRX(5^ z@%*SL-yqP_=|p^_Wpwk64l3bfJQ;?J95pHu6ML=en&s?DkxYn+4^(7rpy>vAAkT1s z+AJ9eD*04OVA1YH=EG+!=*LR)Z^SPB;I7SRX19Fl8uJg<#Qsxq21hp|s(?z?$q*Gr zaOj|uP`#M~9Uf?WkX&<#;wv*qA%Yss?7SmYV`haMH>pub$%Tz%uotaDHn?LYiu@YxK&dslcvi)(ViuoW?6=r0GA^acq{v?U(3iqo?(CYf zXB+jAT+#CuXIQ3Y%$Do`QO<$3d&|ma%S>EFyeE?@S}}7pW41uctCv#(_M*}pN7uk% z)P9LVw0!!334tPARB4xK)YE-W6{DSE(CJ7OfnxbkJtydN5K=u}fks7HzMd%4qXgPY zs9RdAA{wM9-;kt9Of3j^q@^XJ317k4-eP!>jK*5+NPy~5zbs36n?t{zTH-Ki_aYlV z-=W^tHt3o9F-0i_qV>;{Foj=L)n>CfpU*T+r)Pk%Ccp%7^E5&Qn#kz7-EK+C*&paI zlDCr7bxm4QtdT>=Cs}V)Va!*)eYDF^RT24xN@%NgzP8OtRig8N{V`#lUkv2=heE=2 zk8f3(Pn3#W50VLpPefXvC?|TPtdZ^Py5&4ixILAdfHm^d5c5qO&Ay2CtX|xBwM=tg di??q91^`TMPw~ngN1*@!002ovPDHLkV1l?Kk8A({ diff --git a/images/imgGoToSlide.png b/images/imgGoToSlide.png index 9a31acbac8035bbc5a9b950720aa97684ed21cb4..3187cfc5ff42a006f6d266d05401c452ee11e508 100644 GIT binary patch delta 175 zcmdnYeuh!8Gr-TCmrII^fq{Y7)59eQNJ{~+5eFNPblQ4)>O@8LdWJkt7srr_TW_v7 zay2LjI0Sa`8Mx1rzSgTI&N=yvQ&vyM{{u_wShtEWFf^p3sg>qDpKx=cn!T9Ir{vfr z_JMvn9Ua`BQEU9J)h!I;G+X5FzqD?<-IFA%$KPU|7EjxL@4mo;tM$p a7|MmNu)cC5QxY_OB-N1^gMUczo!pFxS7k0f~ zDHLORnvaiCp^>VokXy~|HE{DTG_~1b#TrW?=e+LEGXf!0p z@pu#=s#dF|QYn7V*=#oJ^?I>b6pKX}A3;#5RKST$#6d?uOw(L0mmeP=7^^wJyyzCp z(vJ-Yz+qNEz#6p(5Iec+;uvt4Aw(a1vg(9_n9H|feOCZuaBKv>qCkd-z34m1u=DvG zpCFx1s|2#31p!j;^Cp^Af3MfWpwsDa@A!v^1X6^7qtOUm1fZ|4uY3~&++q@s;Gn%CL!_NW2Ai#B&1Mro*!t~ue|x*#k^lqTViJ$w zpuNIccM_QLnQCuuZ+JGHPWSu0oP^tMw|jYcX|-CD$wYgFyVd!PVxo1p?&R@!>$?Gu6k+c;z|@^=Fck4&B5bUOWt0^l$QGDOUWAP7`2o6Q0h zkbpU0$yy5D-`@ije{{RuKz+cG3b+(2$>?;yavrc_@^Hiz=vIix9N(k@wh9ge0X{Cm zeE$X-av&PR*I{WZQ{*K4UxHVG0S93L6gQUb(C1+kUjZV)B&&yh*e|<42cSPaJt5UR z8(>_wS*z8wZ~sUp+YWHi8TpNE`>H_u4O}&kDkmt-__E~PakPIjGyKn`+9O%%D!1g* z)@MWtg_k(Vr%qZ2j#q&?|2|a(313rxicEZoL{i{ILlN9kY9@jSyrj62k;eAv7O@8LdWOlKE{-7;x86*7 z%h{kH&}J&NATa8nXUsvtA`$gMR`<+itA}+mfhRg$j{I);QTn{OONtq&o#DcTWcY3^vcs8T%V(*d8%;giemWeEJkrUj$RHvjn zV`J~CA0_-wVwPnxB`)r|TDSJRT+9C3{^Fg9!5@l2CdWS%Nnp6{XYRog^NtB*lc%en J%Q~loCIGB>PfP#+ delta 916 zcmV;F18e;80jvihiBL{Q4GJ0x0000DNk~Le0000W0000o2m$~A0I~*7Gm#-De*;cQ zL_t(|+O$|pj^Z#7odomk4GeGz)I#C}th>dvI0+{}EVu#!RxG&!utI8}yBX%e%M^v3 z1Sg}e1*$l9y{htaxk4};4uAcmnAvRhvj9O5Je_p8TyoFx0?>0@Lma^zD%J!q0Lzdy z$PsN<>!wgB_$M^hia1WO0jkw%f2Pc86PHK%^H1>Vd_H>tJarc4wCVFrv=ip#T{awB%Pbkq0V@>EzogX5Wbqw%g_}gn z8;wTRGZlM2km^pS({8sJ&DYo0$H&KYj!W(IlacO0zu#}QTEsXU4%ZYxf6C=Dei0Ot zC;&-F?uNtS@p%0F{9Lcs^?IEYh-eC_)oPVWrC2ONw=h!bgs_MS!88CMEzo%mBAUV? z?817fR1yH62!xK@UaaL-lRQF!$YQ9(e{Y3>SjCb9oqW9m1WK~9NMIlYfWqWF0OY2r z771OdkX^3jlx7wBL;#*jf7p@h!7yJ^Tio^7{I|C^DAVZ_Jc$LMMFNN(0b8`Q1nh$K z-#3AR$Jl8)0#+w^6-rR9h;@1(7}hi{*OgAEB-D4Q<@@{ld$ZZx?REr!f=3LxaR_B~ zWsEjo*LUsvU@)Nd$z;N*P>6w7ZX7~c3pYNcs|k<;k}jBdBPTrOo?Gf)FW=RilG&%t~?x9G^Xh{JlN*J=Rn ziqThVdLc@=x&=V0&_e{VS6~hRdQC^~0Qyj*mx`pfVqG6JIeJE0PfF2dvw0eUoM!^u zYmufX&C_Q!Be`|}AMjsZR+a@-3yxMe%Vj|#0VO_{i3$?7pMJ6oL`)s5&)4jO= zSBV9{hE9s$6+quXx~%&HNPY+aBn=R{opaWUlW_xs>D5iqH3Dga)0?}ekX(X7q9eNk z^m;ujh^#GzkY~T&qc~dC!l2pn?@ct#sIZk{+rsY1DyYV@YUkB3qF5bR@F-qinQoIB zYsU2$) diff --git a/images/imgTopLeft.png b/images/imgTopLeft.png deleted file mode 100644 index 57c0ee49cdfee1f20a9a8340a12e5518d44ea586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^93VCa8<3oGNZ$fTNtU=qlmzFem6RtIr7}3C>xG=6Oeqh`tc(mC0XJcQ4*Y=R#Ki=l*-_klAn~S z;F+74o*I;zm{M7IGSvpCNZZrJF{I*FQcgxj!T|=I@^^O*D*bwXUS4NW{r`WeQM#Io iN=&DBGDq*Vg8d)nssNL+icY{0Cosm>H10we{L8 r-6=s|_&R=Yt*A9NmU+(F&%n$e{?bcB#J=DS&_V`JS3j3^P6Kfb