From d5b518888590cb17a8be1cb48a8847416991baf9 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 29 May 2018 12:57:35 +0200 Subject: Update about dialog --- lib/about/CMakeLists.txt | 4 +++- lib/about/aboutdialog.cpp | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'lib') 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 #include +#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("

Copyright 2017 - 2018 aqua

" - "

This program is free software, and you are welcome to use it under the conditions set by the GNU GPLv3:" - "

    " + "

    This program is free software, and you are welcome to use it under the conditions set by the GNU GPLv3.
    " + "This is a short summary:

      " "
    • the freedom to use the software for any purpose,
    • " "
    • the freedom to change the software to suit your needs,
    • " "
    • the freedom to share the software with anyone,
    • " "
    • the freedom to share the changes you make, and
    • " "
    • the responsibility to grant the same freedoms when sharing the software.
    • " "
    " - "

    This is a short summary; you can find the full license text in LICENSE.md.

    ")); + "

    This program is distributed in the hope that it will be useful, but without any warranty.

    ")); ui->toolBox->addItem(licenseLabel, tr("License")); auto *detailsLabel = new QLabel(this); detailsLabel->setWordWrap(true); - detailsLabel->setText(tr("

    Compiled with " compiler "

    " - "

      " + detailsLabel->setText(tr("

      Build " SMOLBOTE_BRANCH ":" SMOLBOTE_COMMIT "

      " + "

      Compiled with " compiler "

      " + "

      Libraries:

        " "
      • Qt " QT_VERSION_STR "
      • " "
      • QtWebEngine " QTWEBENGINE_VERSION_STR "
      • " "
      • Boost " BOOST_LIB_VERSION "
      • " -- cgit v1.2.1