From 636f3deb91fdefce5ad3737f61eddc49b302835d Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Wed, 25 May 2016 23:23:37 -0400 Subject: [PATCH] Converted title to image. This will provide a consistent look to the "gLabels Label Designer" title across platforms where different fonts are available. Will need to look into how to accomodate translations of this title at a later date. --- glabels/AboutDialog.cpp | 5 +- glabels/StartupView.cpp | 8 +-- glabels/images.qrc | 1 + glabels/images/glabels-label-designer.png | Bin 0 -> 5871 bytes glabels/images/glabels-label-designer.svg | 81 ++++++++++++++++++++++ glabels/ui/StartupView.ui | 12 +++- 6 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 glabels/images/glabels-label-designer.png create mode 100644 glabels/images/glabels-label-designer.svg diff --git a/glabels/AboutDialog.cpp b/glabels/AboutDialog.cpp index d09ab7f..24234fb 100644 --- a/glabels/AboutDialog.cpp +++ b/glabels/AboutDialog.cpp @@ -33,12 +33,11 @@ AboutDialog::AboutDialog( QWidget *parent ) { setupUi( this ); - QString subtitle = tr("Label Designer"); + QString titleImage = ":images/glabels-label-designer.png"; QString version = "x.x.x"; QString description = tr("A program to create labels and business cards."); - QString markup = "

gLabels " - + subtitle + "

" + QString markup = QString("

").arg( titleImage ) + "

" + version + "

" + "

" + description + "

" + "

Copyright © 2016 Jim Evins

"; diff --git a/glabels/StartupView.cpp b/glabels/StartupView.cpp index 5dcf5ed..b5c476f 100644 --- a/glabels/StartupView.cpp +++ b/glabels/StartupView.cpp @@ -33,12 +33,8 @@ StartupView::StartupView( MainWindow* window ) { setupUi( this ); - QString subtitle = tr("Label Designer"); - - QString markup = "gLabels " - + subtitle + ""; - - titleLabel->setText( markup ); + QString titleImage = ":images/glabels-label-designer.png"; + titleLabel->setPixmap( QPixmap( titleImage ) ); } diff --git a/glabels/images.qrc b/glabels/images.qrc index 0a470c1..ccf1c19 100644 --- a/glabels/images.qrc +++ b/glabels/images.qrc @@ -2,6 +2,7 @@ + images/glabels-label-designer.png images/glabels-logo.png diff --git a/glabels/images/glabels-label-designer.png b/glabels/images/glabels-label-designer.png new file mode 100644 index 0000000000000000000000000000000000000000..ed042506f3e40b7e652d0c8405afd48a56cc2bf5 GIT binary patch literal 5871 zcmY*dcT^Kk7Y)55y@MD9k=}a|4AMa%5v2Df2m%sXs7jBDNRuWi0-;NnVvs6<(2Vq= zlu!bQp-14`-=E)}vpYL`W@g{Meed2oFXf)O0TVqRJqQG1GBSi%f2!2JzcYT(L3 z{vaG^D1-HkptQgdMeCjn^yvZ(9|nU!%)S4eWLXl-{J=xr5Ph2vs{qdsxJ!@+2o8r! z`#gRW?B){aAsrCpmA|XW2Lf^V89{WRVFf#d;kov(EOZS1!P5!B&mlH^Y)5s5lzn8B z1_Gf^Z?jBo3^K+u@Ww$qec6(eZG?qgHjhzy0`cVJ;o18YtMe~k+9SLwmX2{#u;b45j-8I+(I9@`ALaK~loCx3L7#HjV^zpWWF$}v z#pW%+@nr&a2YVP|1`k@Exg}tQ8tsq=uUxp;yVSH4f*XLbns zZy~qOdEVVE0%3|rGr{qss{0@ABCi>l2a@b47+gIjMO#Ptlze~iyq<-&+(q)$s` zLo-kDkMV@QE}R1)Kp({s#!z>Cj6sv8ip)07>BajIt=N|o1LTopc4YjqF`yRm%Dmj* zR>45=Khlzhk=x}_3hORkubwakVki%FJRz&?Cj<&owWl~@Zq&*?@n5mAAzLFwK);By_$q;>RnX?f#uInt}fhWrtFd%Z1zDj zPq)4p5PGAJ7QF6#>4yGIzcxn^0Me%Wr+h{VPzk}?=@W*jDPH~HLK?7M8X1(=sauc=Hkxd)F%mULwtF@G&u-!EZ zx08~qsCIV=gn#E4qXhf*&>b*qo8s9_a_5N??hQj%IQnJ1VtEEzO!>{!q`P%{%(PRFR4gSt|DHgSKFeEGRDR${GS zO=;rK*B+&(>92a@;`VASA0iM4YZl7tKG*%<4OsQGrNmEiHW!jb1wuXuB=@{flRlWO_c?2cor}HsKB({0zEXb<5*$>Ba{Pdra#qM{ zuOp#^RMj#J=W{S?=J^x%$%*SDB<5FK88RI7&l}1jG&6OLR_sz|8iyWUDPW4qx@i9F zAImKo?ag`LkMBY_@ap-JdHl@f<6b{I5#}DhxRTrf23naRxUxh~J8Ur+^u>K;`QA_yH%2ZoL*U!V!i zfT_(P>gW4mze;l))yulNE*MSiib_z{G`jDK@Ccv3N#2sSjpekfWvI&v;gp$3`TD<( z!z@ld^gqc?7X;gG*$-QY9g#NkSuM`hVb|=(-0SNrw*``Owq1X{nkww|01*4r$ zL5g2wPGe)^{OVkJRIA0dR;A`(z>>0dv|wHAI7i$(e3PD z(?Zg*qZKYW@M;v_BEdm#_TBw+WqW(%%4ZKuQROE`<@`crFKmH7TT1Wz;^HDw!3!JZ zdBg4Df5s*zCQ`)$b6%>bsMJ<|T13GrJ&z6!6xHyale9u?J;naSpG} zKqF4g!y^)Tr@h5(GVA4=tepg@E3n7gb2{QOcuVRjR83z2-`do2;9Z#$aV^FqXTHC0 zevvNf!JpZtKe$^2VObM@c`hA)g^6)sh1SW`WohH>zR7A1spWvmD=W9ZuLXStVa>`W zV+7yt-DOp)t*+jIvd(<@5yL`x3B{!;}RSWn+bD zwJ8f2I_|?v@H-;F8y;9&!*}z%iqw`DeSLgpCe`rp&`=>0_oI6-bq$Tkc;VI_Vu#z% z(ZZ}69Nst@o@ctg9u`^op!)61++04nIbBa+tvBNj9FCPzmqt0Wt&iBjSzqr25_ql# z;V1hhdn3beY-XnI8g2YuqDz=#a4>PU8w-=pnUi7cNrS9T%QBXcsp9pPjsdjuD8erY z)~=8)Sg~!H(8EFCCs2XG9#fqQE>_*DQ&*IetwBTRvGo2YzNBr=p+!Ct!t^;JS{0H{ zMXhecEb#rED>P`8@^d@8FAkM=M{!?hdFPYDI=?&TpBvGUw?Ne z$5c28gV)vzEF;?wkB%-_6?&kSV7|BykX1JTVbY%$!y>4?D9V7ztHjenale~67{M|W zJY_IteA)^9hV~{niK2zn6$9-k3f^T$ozW4B(rPunWKo2saE6j4bZI$>b_ll8r(KH@ zVi%He*?+FnqxoYEy1gLqB2xTKUsL;3U$lhsPrIa(-Z>tOdZY!pPHL9fz^5e(x5@2< z{;`X4L($AfkX0U7;dZ!VCq8@*KrBJoNO81wXJ@Au<9II+V@|MR!?H=N+SCp3tzk0Q zm8j0rQjdYZ^eAy`TY&4-M;e=n@o~8+Vn-p6KSJoj@fu8mu&TTLl~(%CGk$|y4Z~G! z!FVD2u7%@si{wEz5bJ3QYL^hcXdb*ioF@Us8?;M>U>z(SEg;!$%_nB4h$!{K#h=6u z2X%GzE!g29%C<@6;%vLNmOJArh=B}-6R5MebEl`Vrl#gD>kNN;QW69b&5`)a(S-+_ zs}mDF0gzL2BP1VA-}C2hnBdYe+zOX3r+ZEr*b01Mcu|YgA7)d~&$K}%0CgfdqI<2d zZ4_HuTb@dail)KX9YR5*!Rxpuj)J-8n`?vQ!~Ms#oXsQX^s^^D7h!(|LLU$9MC}u~ zRrqPMn$RUYm5FCh{7@ZERUKrJ6vd4HnDgT=-O~{;eetXap%Ym6%tWb)lefSBITRpq zxm=1ZS!eyyGqlHM$Qd}+RFvZAn_b>0{wiQBH%k3xhM}U{TS1U6OMw_zWHe%k*nunc zH_4U^uL8WD5xna{=#cF1sL4!4Ey{pP_Ym=<|2*ULHTwMd_^8s(&d%NoN|Can2w(0$ z;Y-I?I5OB_hpVv42Ze}!UavP`p+%1Ka|hAPQ=^bBZubMsj@1uk5E9@4fyW#hv}kQ4QPn=zXmnXIftn zaWHXXFTbYscj`%67$kYnXnd;q=;%nIf8wX`PK?Z%dS_W#S-??S#Nn3u`!Q+Owp*f# zWZnS*mwd{T39OD^Z+P6)e$U!K)#(SuTqi$Es)+Tlh@w!K59qb*4(;K(z2HLLFPjvn zi`^e9ItkzQSXG|XW$L{CjvYfwS7(}OaqqMsiidsUYDJy@{5~RvtnMCUodT(G8=xO7Yd{UMdn&H!YQeEta6UA4sViJWU| z1>2LM&?Zgl#_r>DvIc6{j>0BKT3=^f6&QMG%c{mVeJ#&)5l^}hNrC)+Q~~w9(}66x z2LqU+bo1DOJ>+qbI0C?K14$@yBwyugiF*JPhs=7R<0|O6Cy+s*@cp)1tFvS79@9Kx zC|CcILru1pm;pU{smxyceqQ@QknF&p&&8{=H@ zH0Eu&E=0L83!RU_^vHfx#PL(CO*uy{Z*G+Mrw%QOgL`I5K2}utaAign76fbLxYwex zX?`8ggzK+rz!Y)#H-ql-Dm1!vG=bW6naNRdj6Im3ws|u^E|k7Lf~I6iSYur=>7Il4 z^5w?h!$8VQA>df0ERRfg$PJ+&Zm(D?PqEjKfE1qM?oYaIsmHtqp)StZz1$U&2coa_ zIfov0xcm8w`IT({zy78S=>rl%J(P6XK-QqS?vxMseS8Exti`rD z!u-E|gTGDmc2%XGr{T5_j8jxr&i1RfNEuA%QL+@{5Y=)pfn8P~C^7Z~*+DmF6T$L+ z-kHgou!}ijN7~=hfAAjJ16lv*PpIf2HMp;I4#`iwP$+cv%j1PFHU0hC!Ng~hF4kfk z5o~lsE#nz}*;I0|eJ@sCc^@!i4{9gd`R1|Xu!imKeRUS%i=r3R!j`To)YKXl)LE82 zqI1$sGTGtxvBcY&i5tqp82jj7Sej@w*Br*XTybQ&D8nKxZTdai8HgNs2oz)CBP=97xxYuX8Zv0G3p{y z+WNsy?+Lb(B@y8{@@R7N0Jbt4eQ-R+nS{|`ivvnQ#priDyfjbUEM$XJh-CV{S<@b(mQLF2*9HGc5iri6Ku`yko0+s8B`FAm~|?- zmpqXAA{oGur$u;&)dG!YVnkzzw!O#U>*jEG7RoydUssIb@Z)p8@aF!Ie_3L5T}}$J zBdFfRTnEt$i-fzFtFj61O2reeEk{8yFPn(klF=I+%S*CShq8Wx-L32&ZC_Aa&@dcn z(O^c;pDL~kx{L7j8q-^FFg2$V?(;N3!Xo79#Sr4rv z>W;gy7zG>pqNMPF7v0$?^`xOk^yayUmxJzL@LW2)r_Fx%x*y%iZqAc;sM0@))fyTa z28~4VXV0)VKoQ&Coqrol+joH!U57<`2e%QD6ohg?Y+{A=7ja$RHsWMcIV z)zNvsnJG8+B2>G0=|fce9*F_=^fFFqpdV1ij%*pl`Z`O+n6-Y`ie${T(=#6lYx(Fr z=9TaCk|)gtZam@X^Y;kpW@JfjTA~nYyUw+e^1|9Nov>LK+l9GA@5pOe&*zKfURrBT zpN^HA-&(I+)tsg_i9_X5bFR1yH_EZivlJd)&5*BE0x(1sfwT#%;+1n&Lk+7Q#S?2~xY8Uz*tRy*m$GDm8q{Tq8Ub{{ zm-s7XKQPNwbdr^_+XGF7jzc1mE$cyT7Nhwpdo>fPwzjs-Tp1q#Ti-&(ab7D##3co` zt@$qk1_KgY1NL;uyT$is=8Z!0r98}$= z>cK*30;tk1r&Mb{A0Ho<3_zs=%01xjL}=8PV8QhfEh@~5FfHXZLcd~x6ZulN(6=B_ zw_ox6axF}D6vwMXr1I;aKN!il})cy3?UbE?n5-Sf)ucr?L zGY>TW(kyl1aioos&NFqimE>A_Ig?ZK$j^^4UN}sCD_9xVw^xY!`7`t`3uS&>5#VD% zJ4f-+=PoCUr6xH?3bDYh2Y%Ldsmk`sOrcGU_oDm#_bE6gfRM z7HHw+g%7@+iBfK9YC^~tkM6Njxn4<2CIF6I8j8;(ol~WPgPvMgjH)F_HI9vsKQVH1 zThWtT-H?TyBkb(#yjUpt>mpIwzQjAzTgxI?E8O|q?5y%yP@D2QjU3DlIy-Od69k-5 zxvmPbtoShzrG43misou}M93w8KRd$ac=Z|A1Ks8GA`^s9Zv62WE<#uZ1O&*@#&g%Z z$@u(U>MihsSs7WjxW&~DxX>ujwCgUWnpKF0Tcd16Tm%LoD`!$YGP&h`MlNZQjwVrL zL`Um};h!JwUy|fH#w7MBhP&V*%7+4}X1RiYu-A^-*xNU|jAAT2!)x|-asvsxpT2U} zSDal;zkbNx4`8HF2v#sLk4cY^xWKKE-C5@oag!5UiMn_-=n}U;uyZRhrgH|^O^vaK z;%$EZrA@`2sVMPwK)_xc8VCNY?HkN|BuqC}iHZSai^N%{DImH!fWhpL)o2haT_s0E zOuwFvxKE=DSxe;>RiEpV;}CVk`n^hwd&7*Lfx&g-9gLcja|!bz>Ht0D%p~OVv~ayc#g~*rjgqBo1#a`pHqrlRwna1 zR8T%+#IsCENy#5KH>V+yVQ9#cxO1IJ_(djWEff$(Uhl4D7#^e!_9TQy0$abv{{DUh zwCTHA8K7?S+~rSKZ3gb82-EKNdAjKwYVJ9#EJUYlEIzcM_v6aAsiCeeBxvS*Xh`KG z`04%|8Qa+ex{?aVvi~ZSndy6^q|`w{8=ghA&5#KBi(_o=t(lWgZhUj2^*Hc_UQE6P z8^h*_CWW={g|i2iPIY@W1P~4Zs<#p{YrB zN+QTTsRO4lX#MiM*|;{bTtIdn$vf$^i?P80#Z(Rm!&_!NS@eB~cCL9@K>izDBn2>I z*{01ow7g^@S literal 0 HcmV?d00001 diff --git a/glabels/images/glabels-label-designer.svg b/glabels/images/glabels-label-designer.svg new file mode 100644 index 0000000..2fe31b2 --- /dev/null +++ b/glabels/images/glabels-label-designer.svg @@ -0,0 +1,81 @@ + + + + + + + + + + image/svg+xml + + + + + + + gLabels Label Designer + + diff --git a/glabels/ui/StartupView.ui b/glabels/ui/StartupView.ui index 56e9f8a..af83512 100644 --- a/glabels/ui/StartupView.ui +++ b/glabels/ui/StartupView.ui @@ -88,7 +88,16 @@ padding:8px; - <html><head/><body><p><span style=" font-size:24pt; font-weight:600;">gLabels </span><span style=" font-size:16pt; color:#909090;">Label Designer</span></p></body></html> + + + + :/images/glabels-label-designer.png + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -182,6 +191,7 @@ +