# HG changeset patch # User Michael Guravage # Date 2011-01-13 10:04:42 # Node ID 825cc37371300a434e39fa4965408d26963a2cd0 # Parent 4d5a298af6e90f6c850e1a1dba1105aa4259035b Added a small virtual icon to the About message box. -- user: Michael Guravage branch 'default' added icons/leaficon.png added icons/leaficon_small.png changed src/ChangeLog changed src/VirtualLeaf-install-windows.nsi changed src/canvas.cpp removed src/leaficon.png diff --git a/src/leaficon.png b/icons/leaficon.png rename from src/leaficon.png rename to icons/leaficon.png diff --git a/icons/leaficon_small.png b/icons/leaficon_small.png new file mode 100644 index 0000000000000000000000000000000000000000..0c9be4543ef58d40ea1b368076f8a26a927ab8e6 GIT binary patch literal 6989 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⁢icLeFGN_ZzoAKXrr}eAnZ$>n~$${TQi<3004~-gOth`PSbM(vmo~^WAp3F)MAoBuQ8`IwIb1 z^)Df`&BCd9`YtFiUtPkCr}(~2rs(00S-543!&8SixOfmtSg7@es2O3+Wl+Z){8|oS zNt_{ze6|Q#&B=5U=?RRj!5D-m`0B*Hys&VD4VP?0KO@QHGK5w@EF!ejOw>-2h!kN# zdRpW3J2YooJh=aU4nBDZr3_c^x|+K`aJTUM%n#@1%*$xuuov?2zy7%SVDkB4_u}?lno*hr|+gY}icKbeL%_ke|yF9*)Uv&EV#2qPoJ$NZMDmkhY*Z z8j^oHOLi$o8f%(cs~8_l3v6v;?X|HNU6OSn^lPLg=q@K@0tesD5}k}mg#z(nyD`ad z$@U%m%_ly`+I4G%F$UYVe>8<qV7S_=D1W~hbXMIc_f<_P3QTUrYys->U&c^PC^fcHFhcrpi>rw;)6&O@iqnird z180>a)iH@stnOPw*obH}>o^@3qYRy(L)Q1X>2Sjyj;d4 zga8AnO0aE*<)!6)pZVHfT>k0L{1vATO_0yzurd}_Nl?yI2uzno+$Lw|Nt=qe7mzp! zsiPPxuVvGgjm-DvXm?w5(;mHZAz>@VM&k9mHBQ&^59k})*E9&)Jo zWj2m(VBevAbQgPgzJpuzc*n24liz#)?+MTK_));Vhr&8fh9JPU9h6oK3=CZH-nadZ z_`)Z?$XjlI3%#&MbD>4;coWacu&S^cwUm<76XH&YKw{fAZpon|UB?O(>F3V@@=&C`rHNAF^POF29i|4qciwUjSCZ=P^=#_lx9~$Jn?|d&G zeE$c9e6el*qkw&nX6vO(fA?N#MUo~MV`#RT?74rBx$=f9jl0SeI&f5bOV!7(x?O@26U)?YMkva5Y_(XP#A&;8#rX_BIpTG5BSNZ|YchV!)C50z?s zpNK^%^^(YJes12}^PPLxyMHf@YMn^Oq)9@dSYrCr6thz^?0m&eq9~?RDAEf8Qmv3e z5VZnM96rIu9UI7(OGHsfAy)(h?RJYstxjvP&F0HCW6(r#1V&;|-2L9Wx#F^2LTQB* z@}E^P{8&1a@7GJFD#fuKw9@Q-X0NH&>j=vNtx;MdFxa+381^tPPI{j95*Q>BX-UE; zLTil_5^eO#3{oNi$M)z2-4$J#Z4<{aJGbxT;)^d9N-2a8Keo{A#}L_kuMw?RG?G&O z`-*I})-TQZ;|knPO3yUX&f3e}5&)zZ>iS+??WN85r f|G$9yr#${I=@AZrkW**E00000NkvXXu0mjfhi8n> diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-01-13 + + * VirtualLeaf-install-windows.nsi: Add new icons directory + + * canvas.cpp (about): Added virtual leaf logo to About message box. + 2011-01-12 * transporterdialog.cpp (TransporterDialog): Add a proper title to 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,6 +144,10 @@ 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 @@ -1048,7 +1048,7 @@ void Main::about() Roeland M. H. Merks, Michael Guravage, Dirk Inze, and Gerrit T.S. Beemster,\ \ VirtualLeaf: an Open Source framework for cell-based modeling of plant tissue growth and development,
\ - Plant Physiology 2010: pp.110.167619v1-pp.110.167619.\ + Plant Physiology 2011: pp.110.167619v1-pp.110.167619.\

\

\ Please share your model plugins and extensions at\ @@ -1056,6 +1056,16 @@ 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->show(); }