diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-05-29 12:57:35 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-05-29 12:57:35 +0200 |
| commit | d5b518888590cb17a8be1cb48a8847416991baf9 (patch) | |
| tree | b44e8aaad0ad0a2484b96d3715dffc3cfd544989 | |
| parent | Profile properties (diff) | |
| download | smolbote-d5b518888590cb17a8be1cb48a8847416991baf9.tar.xz | |
Update about dialog
| -rw-r--r-- | lib/about/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/about/aboutdialog.cpp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lib/about/CMakeLists.txt b/lib/about/CMakeLists.txt index eec2545..be506fe 100644 --- a/lib/about/CMakeLists.txt +++ b/lib/about/CMakeLists.txt @@ -13,6 +13,8 @@ add_library(about ) target_include_directories(about - PRIVATE ${Boost_INCLUDE_DIRS}) + PRIVATE ${Boost_INCLUDE_DIRS} + PRIVATE ${CMAKE_BINARY_DIR}/src +) target_link_libraries(about Qt5::Widgets) diff --git a/lib/about/aboutdialog.cpp b/lib/about/aboutdialog.cpp index df87ad2..6b4ebb8 100644 --- a/lib/about/aboutdialog.cpp +++ b/lib/about/aboutdialog.cpp @@ -10,6 +10,7 @@ #include "ui_aboutdialog.h" #include <QtWebEngine/QtWebEngineVersion> #include <boost/version.hpp> +#include "version.h" // compiler // clang also defines __GNUC__, so we need to check for clang first @@ -42,21 +43,22 @@ AboutDialog::AboutDialog(QWidget *parent) auto *licenseLabel = new QLabel(this); licenseLabel->setWordWrap(true); licenseLabel->setText(tr("<p>Copyright 2017 - 2018 aqua</p>" - "<p>This program is free software, and you are welcome to use it under the conditions set by the GNU GPLv3:" - "<ul>" + "<p>This program is free software, and you are welcome to use it under the conditions set by the GNU GPLv3.<br>" + "This is a short summary: <ul>" "<li> the freedom to use the software for any purpose,</li>" "<li> the freedom to change the software to suit your needs,</li>" "<li> the freedom to share the software with anyone,</li>" "<li> the freedom to share the changes you make, and</li>" "<li> the responsibility to grant the same freedoms when sharing the software.</li>" "</ul>" - "<p>This is a short summary; you can find the full license text in LICENSE.md.</p>")); + "<p>This program is distributed in the hope that it will be useful, but without any warranty.</p>")); ui->toolBox->addItem(licenseLabel, tr("License")); auto *detailsLabel = new QLabel(this); detailsLabel->setWordWrap(true); - detailsLabel->setText(tr("<p>Compiled with " compiler "</p>" - "<p><ul>" + detailsLabel->setText(tr("<p>Build " SMOLBOTE_BRANCH ":" SMOLBOTE_COMMIT "</p>" + "<p>Compiled with " compiler "</p>" + "<p>Libraries: <ul>" "<li>Qt " QT_VERSION_STR "</li>" "<li>QtWebEngine " QTWEBENGINE_VERSION_STR "</li>" "<li>Boost " BOOST_LIB_VERSION " </li>" |