Skip to content

Commit

Permalink
Make use of Cleaver version info in GUI app text.
Browse files Browse the repository at this point in the history
  • Loading branch information
jonbronson committed Jun 28, 2017
1 parent 59725cb commit 328728c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions src/gui/Application/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -663,10 +663,13 @@ void MainWindow::exportMesh(cleaver::TetMesh *mesh) {

void MainWindow::about() {
QMessageBox::about(this, tr("About Cleaver 2"),
tr("<b>Cleaver 2.2</b><BR>"
tr("<b>Cleaver ") +
tr(cleaver::VersionNumber.c_str()) +
tr(" built ") +
tr(cleaver::VersionDate.c_str()) +
tr("</b><BR>"
"<a href=\"http://www.sci.utah.edu/\">Scientific Computing & Imaging Institute</a><BR>"
"<a href=\"http://www.cs.utah.edu/\">University of Utah, School of Computing</a><BR>"
"<P><b>Author:</b> Jonathan Bronson, <b>Developer:</b> Brig Bagley"
"<P>This program is provided AS IS with NO "
"WARRANTY OF ANY KIND, INCLUDING THE WARRANTY"
"OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
Expand Down
4 changes: 2 additions & 2 deletions src/gui/Main/main.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include <QApplication>
#include <QtGui>
#include "MainWindow.h"
#include <Cleaver/Cleaver.h>

int main(int argc, char *argv[])
{
QApplication a(argc, argv);
MainWindow w(QString("Cleaver ") + QString(CLEAVER_VERSION_MAJOR)
+ QString(".") + QString(CLEAVER_VERSION_MINOR));
MainWindow w(QString("Cleaver ") + QString(cleaver::VersionNumber.c_str()));
w.resize(900,400);
#ifdef WIN32
w.setWindowIcon(QIcon(WINDOW_ICON));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/cleaver/Cleaver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ using namespace std;

namespace cleaver
{
const std::string VersionNumber = "2.0";
const std::string VersionNumber = "2.3";
const std::string VersionDate = __DATE__;
const std::string Version = std::string("Cleaver") + " " + VersionNumber + " " + VersionDate;

Expand Down

0 comments on commit 328728c

Please sign in to comment.