diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ # $Id$ -QMAKE = qmake +QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake # Set $(MAKE) to the name of the make command on your machine, e.g. 'make' on Linux and 'mingw32-make' on windows. MAKE = make # mingw32-make diff --git a/src/VirtualLeaf.cpp b/src/VirtualLeaf.cpp --- a/src/VirtualLeaf.cpp +++ b/src/VirtualLeaf.cpp @@ -402,6 +402,9 @@ int main(int argc,char **argv) { } else { ((Main *)main_window)->showMaximized(); } + + // show "About" window at start up + ((Main *)main_window)->about(); } else { main_window=new MainBase(canvas, mesh); } diff --git a/src/build_models/Makefile b/src/build_models/Makefile --- a/src/build_models/Makefile +++ b/src/build_models/Makefile @@ -1,6 +1,6 @@ # $Id$ -QMAKE = qmake +QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake # Set $(MAKE) to the name of the make command on your machine, e.g. 'make' on Linux and 'mingw32-make' on windows. MAKE = make # mingw32-make diff --git a/src/canvas.cpp b/src/canvas.cpp --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -554,7 +554,7 @@ Main::Main(QGraphicsScene& c, Mesh &m, Q tooltips_id = helpmenu->insertItem("Show Cell&Info", this, SLOT(Refresh())); helpmenu->setItemChecked(tooltips_id, true); helpmenu->insertSeparator(); - helpmenu->insertItem("&About", this, SLOT(help()) ); //, Key_F1); + helpmenu->insertItem("&About", this, SLOT(about()) ); //, Key_F1); helpmenu->insertSeparator(); helpmenu->insertItem("&GPL", this, SLOT(gpl()) ); menu->insertItem("&Help",helpmenu); @@ -924,19 +924,22 @@ void Main::clear() editor->clear(); } -void Main::help() +void Main::about() { static QMessageBox* about = new QMessageBox ( "About", - "
"
- "Leaf growth computer model
"
- "(c) 2005-2007, Roeland Merks
"
- "VIB Department Plant Systems Biology
"
+ "An Open Source framework for cell-based modeling of plant tissue growth and development
"
+ "(c) 2005-2008, Roeland Merks et al.
"
+ " VIB Department Plant Systems Biology, "
"Ghent, Belgium
"
- "(c) 2008-2009, Roeland Merks
"
- "CWI/NCSB, Amsterdam, Netherlands
"
- "Pilot release for WUR/Biometris, 21-10-2009
",
+ "(c) 2008-2010, Roeland Merks et al.
"
+ " Centrum Wiskunde & Informatica and Netherlands Consortium for Systems Biology, Amsterdam, Netherlands
"
+"
The Virtual Leaf 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.
"
+ "
If you use this code for your projects, please cite our paper:"
+"
Merks, Guravage, Inze, and Beemster. An Open Source framework for cell-based modeling of plant tissue growth and development. Plant Physiology, submitted.
.
"
+ "
Please share your model plugins and extensions at http://virtualleaf.googlecode.com.",
QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
about->setButtonText( 1, "Dismiss" );
about->show();
diff --git a/src/canvas.h b/src/canvas.h
--- a/src/canvas.h
+++ b/src/canvas.h
@@ -139,7 +139,7 @@ class Main : public Q3MainWindow, public
public slots:
- void help();
+ void about();
void gpl();
void TimeStepWrap();
void togglePaused();