EI/VirtualLeaf Changeset - 825cc3737130 · Centrum Wiskunde & Informatica (CWI)

Changeset - 825cc3737130

Parent rev.

Child rev.

[Not reviewed]

default

1 3 2

Michael Guravage - 14 years ago 2011-01-13 10:04:42
michael.guravage@cwi.nl

Added a small virtual icon to the About message box.

--
user: Michael Guravage <michael.guravage@cwi.nl>
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

5 files changed with 21 insertions and 1 deletions:

icons/leaficon.png

rename

icons/leaficon_small.png

bin+new file

src/ChangeLog

src/VirtualLeaf-install-windows.nsi

src/canvas.cpp

0 comments (0 inline, 0 general)

icons/leaficon.png

➞

Show inline comments

file renamed from src/leaficon.png to icons/leaficon.png

Show images

icons/leaficon_small.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

src/ChangeLog

➞

Show inline comments

 -01-13    <guravage@petitdru.sen.cwi.nl>
 	* VirtualLeaf-install-windows.nsi: Add new icons directory
 	* canvas.cpp (about): Added virtual leaf logo to About message box.
 -01-12    <guravage@petitdru.sen.cwi.nl>
 	* transporterdialog.cpp (TransporterDialog): Add a proper title to
 	the dialog, and place the cell and wall pairs in a seperate labe.
 -01-10    <guravage@petitdru.sen.cwi.nl>
 	* transporterdialog.cpp (TransporterDialog): Start numbering Transporter fields at zero.
 	Resolves issue #1: http://code.google.com/p/virtualleaf/issues/detail?id=1.
 	* wallitem.cpp (OnClick): Change dialog modality to Qt::WindowModal.
 	Resolves issue #2: http://code.google.com/p/virtualleaf/issues/detail?id=2.

src/VirtualLeaf-install-windows.nsi

➞

Show inline comments

@@ @@ -135,24 +135,28 @@ section "Virtual Leaf executable" @@
   file C:\Qt\2010.02.1\qt\bin\QtCore4.dll
   file C:\Qt\2010.02.1\qt\bin\QtGui4.dll
   file C:\Qt\2010.02.1\qt\bin\QtNetwork4.dll
   file C:\Qt\2010.02.1\qt\bin\QtSql4.dll
   file C:\Qt\2010.02.1\qt\bin\QtXml4.dll
   # Prepend the Virtual Leaf bin directory to the installers PATH
   ${EnvVarUpdate} $0 "PATH" "P" "HKCU" "$INSTDIR\bin"
   # 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"
   # define the output path for the Qt Image Formats
   setOutPath $INSTDIR\bin\imageformats
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qgif4.dll
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qico4.dll
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qjpeg4.dll
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qmng4.dll
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qsvg4.dll
   file C:\Qt\2010.02.1\qt\plugins\imageformats\qtiff4.dll
 sectionEnd

src/canvas.cpp

➞

Show inline comments

@@ @@ -1039,32 +1039,42 @@ void Main::about() @@
        <p>\
          VirtualLeaf is free software: you can redistribute it and/or\
          modify it under the terms of the GNU General Public License as\
          published by the Free Software Foundation, either version 3 of the\
          License, or (at your option) any later version.\
        </p>\
        <p>\
          If you use this code for your projects, please cite our paper in\
          <a href=\"http://www.plantphysiol.org\">Plant Physiology</a>, &lsquo;\
          Roeland M. H. Merks, Michael Guravage, Dirk Inze, and Gerrit T.S. Beemster,\
          <a href=\"http://www.plantphysiol.org/cgi/content/short/pp.110.167619?keytype=ref&ijkey=YTmfxrHG5QCsa8k\">\
          VirtualLeaf: an Open Source framework for cell-based modeling of plant tissue growth and development</a>,<br>\
-         Plant Physiology 2010: pp.110.167619v1-pp.110.167619.\
+         Plant Physiology 2011: pp.110.167619v1-pp.110.167619.\
        </p>\
        <p>\
          Please share your model plugins and extensions at\
          <a href=\"http://virtualleaf.googlecode.com\">http://virtualleaf.googlecode.com</a>.\
        </p>",
       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();
+}
 void Main::gpl()
+{
   static QMessageBox* gpl = new QMessageBox ( "GPL License", "",
       QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
   QDir docDir(QApplication::applicationDirPath());
   docDir.cd("../doc"); // Where Linux expects gpl3.txt
   QString path = docDir.filePath("gpl3.txt");

0 comments (0 inline, 0 general)