diff --git a/icons/leaficon.png b/icons/leaficon.png deleted file mode 100644 index 2888ad4b61a96a5360bc03aec6d22bd92a3fb7d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ + * VirtualLeaf-install-windows.nsi: Remove previous change that added icon directory. + + * canvas.cpp: Instead of using a separate icon directory, compile + leaficon_small.xpm directly into canvas.cpp. + * VirtualLeaf-install-windows.nsi: Add new icons directory * canvas.cpp (about): Added virtual leaf logo to About message box. diff --git a/src/VirtualLeaf-install-windows.nsi b/src/VirtualLeaf-install-windows.nsi --- a/src/VirtualLeaf-install-windows.nsi +++ b/src/VirtualLeaf-install-windows.nsi @@ -144,10 +144,6 @@ section "Virtual Leaf executable" # create a shortcut named "VirtualLeaf" in the start menu programs directory # point the new shortcut at the program VirtualLeaf createShortCut "$SMPROGRAMS\VirtualLeaf.lnk" "$INSTDIR\bin\VirtualLeaf.exe" - - # Icons - setOutPath $INSTDIR\icons - file ..\icons\* sectionEnd section "Image Formats" diff --git a/src/canvas.cpp b/src/canvas.cpp --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -79,9 +79,10 @@ #include -// Include VIB and PSB logos +// Include PSB, CWI and vleaf logos #include "psb.xpm" #include "cwi.xpm" +#include "leaficon_small.xpm" static const std::string _module_id("$Id$"); @@ -1056,16 +1057,7 @@ void Main::about()

", QMessageBox::Information, 1, 0, 0, this, 0, FALSE ); about->setButtonText( 1, "Dismiss" ); - - // Locate and set the message box's icon - QDir iconDir(QApplication::applicationDirPath()); - if (iconDir.cd("../icons")) { - QString iconFile = iconDir.filePath("leaficon_small.png"); - QFile icon(iconFile); - if (icon.exists()){ - about->setIconPixmap(QPixmap(iconFile)); - } - } + about->setIconPixmap(QPixmap( leaficon_small )); about->show(); } diff --git a/src/leaficon_small.xpm b/src/leaficon_small.xpm new file mode 100644 --- /dev/null +++ b/src/leaficon_small.xpm @@ -0,0 +1,317 @@ +/* XPM */ +static char *leaficon_small[] = { +/* columns rows colors chars-per-pixel */ +"55 55 256 2 ", +" c #020C02", +". c #070602", +"X c #140301", +"o c #1B0301", +"O c #130C02", +"+ c #1C0C03", +"@ c #160C0A", +"# c #041304", +"$ c #0B1305", +"% c #041C03", +"& c #0B150A", +"* c #0C1B0B", +"= c #081A06", +"- c #151505", +"; c #1C1404", +": c #1B1A02", +"> c #151509", +", c #1A140A", +"< c #141B0B", +"1 c #1B1C0A", +"2 c #141C06", +"3 c #121D11", +"4 c #1C1F15", +"5 c #180F14", +"6 c #230401", +"7 c #2B0300", +"8 c #240B02", +"9 c #2B0B02", +"0 c #26080A", +"q c #330400", +"w c #3A0501", +"e c #340B02", +"r c #3C0B02", +"t c #340B09", +"y c #231305", +"u c #2C1302", +"i c #241C00", +"p c #251C0B", +"a c #281708", +"s c #331305", +"d c #381609", +"f c #2B0316", +"g c #37031C", +"h c #331811", +"j c #042302", +"k c #0C240B", +"l c #0C2B0A", +"z c #082805", +"x c #14230D", +"c c #1B220D", +"v c #132B0D", +"b c #19280C", +"n c #053202", +"m c #0B3305", +"M c #023C02", +"N c #0D330B", +"B c #093B07", +"V c #14340D", +"C c #13390B", +"Z c #133B05", +"A c #142313", +"S c #1B2412", +"D c #142B13", +"F c #1B2C12", +"G c #1B261A", +"H c #153314", +"J c #1A3214", +"K c #1A3C12", +"L c #1B341A", +"P c #1C3C1B", +"I c #133C13", +"U c #0F3913", +"Y c #242302", +"T c #2C2401", +"R c #26250A", +"E c #352807", +"W c #3A3209", +"Q c #232913", +"! c #282714", +"~ c #253516", +"^ c #39361A", +"/ c #352813", +"( c #380421", +") c #371526", +"_ c #3A1D3A", +"` c #263625", +"' c #35302F", +"] c #430A03", +"[ c #490701", +"{ c #580801", +"} c #441609", +"| c #571608", +" . c #471913", +".. c #620B01", +"X. c #791A04", +"o. c #64170F", +"O. c #493A06", +"+. c #573A03", +"@. c #472416", +"#. c #433414", +"$. c #4D250A", +"%. c #762600", +"&. c #6F2D09", +"*. c #48032B", +"=. c #480932", +"-. c #520835", +";. c #481631", +":. c #60123E", +">. c #492822", +",. c #523231", +"<. c #692F2B", +"1. c #054903", +"2. c #154809", +"3. c #035300", +"4. c #0D5606", +"5. c #195609", +"6. c #154314", +"7. c #1A4816", +"8. c #145412", +"9. c #1C5517", +"0. c #0F4110", +"q. c #22560E", +"w. c #274A18", +"e. c #255718", +"r. c #314511", +"t. c #0A6705", +"y. c #186506", +"u. c #077502", +"i. c #197706", +"p. c #1B6915", +"a. c #187710", +"s. c #256A09", +"d. c #257706", +"f. c #267616", +"g. c #2E6B17", +"h. c #254523", +"j. c #3B4639", +"k. c #31522A", +"l. c #356F2C", +"z. c #5C4200", +"x. c #4B4C19", +"c. c #654A07", +"v. c #6C5519", +"b. c #5A6914", +"n. c #4C4D34", +"m. c #64443D", +"M. c #714124", +"N. c #497133", +"B. c #716530", +"V. c #626617", +"C. c #5B1443", +"Z. c #563349", +"A. c #692A53", +"S. c #4C5D4C", +"D. c #475846", +"F. c #4C4E49", +"G. c #6F504C", +"H. c #4A7B45", +"J. c #566456", +"K. c #5C7454", +"L. c #6C6C53", +"P. c #785668", +"I. c #744C64", +"U. c #72766F", +"Y. c #852E04", +"T. c #8A4B26", +"R. c #88743F", +"E. c #8D544F", +"W. c #A57052", +"Q. c #855275", +"!. c #866A65", +"~. c #917876", +"^. c #8B625F", +"/. c #098604", +"(. c #168905", +"). c #0A9702", +"_. c #189506", +"`. c #1B8F15", +"'. c #278507", +"]. c #32860C", +"[. c #269705", +"{. c #2E8E16", +"}. c #18A805", +"|. c #17B302", +" X c #0EAA08", +".X c #2BA706", +"XX c #23B808", +"oX c #2EAE16", +"OX c #37922D", +"+X c #31BA2A", +"@X c #478E1C", +"#X c #74890F", +"$X c #4DA216", +"%X c #4B8F33", +"&X c #49B832", +"*X c #4DA037", +"=X c #6AAF3B", +"-X c #27C30F", +";X c #30C128", +":X c #5CCD14", +">X c #65D816", +",X c #5DF900", +".7 t A 7 [ ] t ,.6 ( *.P.PXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXGX-.-. .,.t r ] 9 A @ > , 0 7 t r w 0 < 6 [ w cX^.q 7 0 f Z.BXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXGXA.g 0 o ,.cX .7 Q 1 7 6 6 o 8 y 6 6 R > p u q G.] ] ] 6 c . _ DXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXnX_ o 6 e ] } Z.w a A 6 ] ,.q 9 6 , , 1 p w 0 / / 8 w ] 7 R c o X C.nXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXIXlXf # c 7 d t a a + 2 , w r G.@.] t 7 + < { ..{ w + ^ R 6 4 A 6 r 9 o C.ZXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXHXQ.f 6 8 x $ x < S G S & + ] w .cX<.r ] p p ....{ X.<.w y > - o w q 7 h ) A.HXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXVXA.( 8 r w O < . O X X X 1 1 7 ] .G. .7 e h 0 ....<.E.<...[ > p q w ~.G.,.a f lXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXLXC.( + 7 w w a x o u O 8 8 + S a w 7 6 ] @.T + d { o.cXE.{ ..{ a p 7 t !.<.d q + =.KXUXUXUXUXUXUX", +"UXUXUXUXUXUXQ.g a G.G.G.w y k X 8 G.' a o b y 9 @.@.d d $.$./ | ..o.o.....{ , S X 6 6 0 q w 7 . P.IXUXUXUXUXUX", +"UXUXUXUXUXnXg o r t G.!.w t 3 X y y P.dXo o , R s | M.T.%.Y.d E } r { { { s Q X G ! 1 + 0 7 ; < @ lXUXUXUXUXUX", +"UXUXUXUXnX( o t r w q w e y $ - o X ,.,.o 8 < } &.%.T.T.%.&.| p d ^ ^ E 8 1 y 9 9 O 1 ! 4 $ F ; . -.DXUXUXUXUX", +"UXUXUXFX_ # 0 8 7 w r 9 y c O x F + o 8 o s 4 &.Y.%.W.W.%.%.$.#.+.O.E T - Q 9 e 9 e s 6 O * 6 r t 0 C.ZXUXUXUX", +"UXUXUXnXX + + o + 0 + 1 - ; y + 1 F c o 8 d a X.Y.X.W.W.%.$.@.+.c.c.c.c.#.~ o h >.9 6 q p x q r w X ( Q.PXUXUX", +"UXUXUXI.X s q 9 8 X & < + u u u o : b @ 1 r.O.r { X.X.Y...#.$.c.B.B.R.c.O.Q X G.dXG.m.7 1 Q 7 >.,.<.) *.mXUXUX", +"UXUXFX;.o r e e e 6 A ; u T ,.,.G.a + ; ~ qXtXeX#XO.} | $.} +.v.bXR.v.c.+.S p d >.@.h 9 & ! 7 cX!.@.y f Q.IXUX", +"UXUXnXX h G.G.~.} 7 b > 8 E n.G.~.#.u 0 b.tXpXpXsXtXuXwXW } c.c.v.c.+.+.+.1 Q 7 9 9 7 8 # + t d .r q + A.IXUX", +"UXUXI.o d q >.!. .o A # , y y d u u s 8 N.pXpXrXjXpXpXpX#X^ &.+.+.O.O.~ x > c o e 9 + x 3 > o 6 0 w ] + f CXUX", +"UXHX_ . e r ] w 6 b $ : ~ x p ; u u ; + J qXaXpXsXkXaXpXtXx.e W Q m V r.w.Z l F o , D F + : - , + y 8 , 4 F.UX", +"UXVX. 4 , 6 r q c J T W : Q D A , 2 v x b q.#XpXaXkXpXrXpXx.1 F w.w.q.s.d.].s.D & S 2 : E T T ; p < F 4 F.UX", +"UXxX. 3 c F o , J : T E E T i Q $ = e.'.d.q.w.b.iXsXiXiXeXx.b s.t.5XgXd.'.'.s.z x # i T u u i i i - c E W 5 JX", +"KX~ - : Y x < * : Y n.L.B.n.W ; A 7.[..X[.].q.c x.V.V.V.#.Q ~ ].'.*X3X3X@Xd.2.6.# K : Y n.L.L.^ i 1 w.x.W ' dX", +"ZX$ 2 : Y : 2 * : W W W !.dX; Q b '.}.&X0X.X{.A & 5.5.y.2.b Z d.d.d.i.].'.q.K K q.m v : E R dXL.i $ j.bXn.R N.", +"N.- c Q x.W Y x Q Y T T E T i x e..XoX5X5X.X'.e.r.2X2X1X2X].w.b 5.q.q.q.q.V 6.2.y.2.V x i i / T i $ < L.#.T n.", +"k.@ ! n.dXL.Y c x - R R R Y c J d..X&X$X_.XX5.e.@X,XyXfX,X1Xk A 7.7.6.I # k B f.l.s.Z C ; T T T k x % b Y T F.", +"H.. , : n.x.Y b * k l % z * # C .X.XoX[..X[.2.L :XX1XXq.3 B a._.|.|.|.`.& l Z Z Z % D 4.4XAXq.w.Z 2.K.PXUX", +"UXJX` 5.].7X%XA 5.[.OX'._.d.V k k `. X).AX9Xu.7.# 9.6.1.b K m 7.7.6.f.(.|.p.< A K P P & P s.@X*X].4.F & mXUXUX", +"UXUXdXB N.5XN.3 C i.'.(.d.m N * N 2. X9X&X-Xp.p.9.).u.6.b m (.u.4.9.U 8.8.V I n M 1.M N D B s.N.d.s.A 6XIXUXUX", +"UXUXJXk.e.d.Z * D 2.d.a.m l n 1.N z f.+X).|.4.8.a. X+Xt.U 8./.).`.u.8.7.& k B l.p.3.4.B # % l P 7.k D.HXUXUXUX", +"UXUXUXxXj 9.C j j P C z V n l.8X1.l m ). X|.4.P `.9X0Xu.9.4.`.AX`.). Xn P n 8.7X3X1.3.l k ' D.# & # xXUXUXUXUX", +"UXUXUXPXN.$ P n 8XJ.= & N 4.OX6Xa.n U 8.|.).p.l X4X-Xa.8.8./.4X4X/./.7.D 4.3.H.l.3.4.D k 6XK.# = U.UXUXUXUXUX", +"UXUXUXUXxX& % 8.H.3Xk * 4.t.t.OXp.3.z I (.(.p.6. X9X Xa.8.8./.).OX+X1.9.n 3.1.p.l.1.l P h.` j.UXUXUXUXUXUX", +"UXUXUXUXUXxXL m l.4.m L l 1.3.l.f.t.0.* 7.9.0.7././. Xt.9.8.u.u.u.u.B k B 3.4.1.B 0.* = % k * j.KXUXUXUXUXUXUX", +"UXUXUXUXUXUXGXD.= n H * * U 6.6.n 1.n * k # l 8.9.p.6.I H 8.8.8.U k * U N M h.L k * & * J.KXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXIXxXh. & * D L L l U A & % j L D.k.7.U k # # l H D.` * * j # k G j.* . 3 U.UXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXGXJ. . ` ' # 3 # * * n A K.U j z * A = # # j.` # 3 & & & j.3 . 3 xXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXVXj.j 3 G # = # ` % % j # # & # A A * & G * ` VXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXPXMXK.J.S.S.J.j.G S.D.J.S.D.S.D.3 F.S.D.J.J.D.j.` S.S.D.D.D.JXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXUXGXVXVXVXBXVXVXBXBXmXBXNXNXBXBXmXmXmXmXmXmXCXBXmXmXmXMXJXUXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", +"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX" +};