diff --git a/aboutwindow.cpp b/aboutwindow.cpp index a019642..7e0fbf0 100644 --- a/aboutwindow.cpp +++ b/aboutwindow.cpp @@ -6,6 +6,11 @@ AboutWindow::AboutWindow(QWidget *parent) : ui(new Ui::AboutWindow) { ui->setupUi(this); + QString info; + info += "RepRaptor v" + qApp->applicationVersion() + ", "; + info += "built with Qt " + QString(QT_VERSION_STR) + " on "; + info += QString(__DATE__) + ", " + QString(__TIME__); + ui->versionLabel->setText(info); } AboutWindow::~AboutWindow() diff --git a/aboutwindow.h b/aboutwindow.h index 2d3515a..3acfa76 100644 --- a/aboutwindow.h +++ b/aboutwindow.h @@ -3,6 +3,8 @@ #include +#include "repraptor.h" + namespace Ui { class AboutWindow; } diff --git a/aboutwindow.ui b/aboutwindow.ui index 9374b9a..4bf37ec 100644 --- a/aboutwindow.ui +++ b/aboutwindow.ui @@ -6,10 +6,16 @@ 0 0 - 424 - 308 + 359 + 363 + + + 0 + 0 + + About RepRaptor @@ -18,7 +24,7 @@ :/icons/about.png:/icons/about.png - + Qt::Horizontal @@ -28,7 +34,7 @@ - + false @@ -37,16 +43,16 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/icons/logo.png" /></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt; font-weight:600;"> RepRaptor</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> is free and open source software for controlling RepRap and similar machines. This software is distributed by terms of </span><a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a><span style=" font-family:'Sans Serif'; font-size:9pt;"> Some graphical images (Fugue Icons) are distributed by terms of </span><a href="https://creativecommons.org/licenses/by/3.0/deed.ru"><span style=" font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;">Creative Commons 3 licence</span></a><span style=" font-family:'Sans Serif'; font-size:9pt;">.</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;"> RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for </span><span style=" font-family:'Sans Serif'; font-size:9pt; font-weight:600;">MGTU MIREA</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> university's 3D printing laboratory by</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;">Nickolay (aka &quot;NeoTheFox&quot;) Mardanov.</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;">GitHub</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;">RepRap wiki</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;"><br /></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; text-decoration: underline; color:#0000ff;"><br /></p></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;"> RepRaptor</span> is free and open source software for controlling RepRap and similar machines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a> Some graphical images (Fugue Icons) are distributed by terms of <a href="https://creativecommons.org/licenses/by/3.0/deed.ru"><span style=" text-decoration: underline; color:#0000ff;">Creative Commons 3 licence</span></a>.</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing laboratory by</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka &quot;NeoTheFox&quot;) Mardanov.</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" text-decoration: underline; color:#0000ff;">GitHub</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap wiki</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p></body></html> true @@ -56,6 +62,13 @@ p, li { white-space: pre-wrap; } + + + + Build info + + + diff --git a/main.cpp b/main.cpp index e91ad25..2209392 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,5 @@ #include "mainwindow.h" +#include "repraptor.h" #include int main(int argc, char *argv[]) @@ -9,6 +10,7 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName("NeoTheFox"); QCoreApplication::setOrganizationDomain("https://github.com/NeoTheFox"); QCoreApplication::setApplicationName("RepRaptor"); + QCoreApplication::setApplicationVersion(REPRAPTOR_VERSION); //Set the priority, so the OS would not mess up serial communication QThread::currentThread()->setPriority(QThread::HighestPriority); diff --git a/repraptor.h b/repraptor.h index 807f401..e48f11b 100644 --- a/repraptor.h +++ b/repraptor.h @@ -1,7 +1,9 @@ #ifndef REPRAPTOR_H #define REPRAPTOR_H -#include +#ifndef REPRAPTOR_VERSION +#define REPRAPTOR_VERSION "0.3.6" +#endif namespace RepRaptor {