Revise global program information

Author: dg0yt

CMakeLists.txt

@@ -20,6 +20,10 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 project(CupCalculator VERSION 1.1.1 LANGUAGES CXX)
+set(PROJECT_COPYRIGHT "(C) 2019 The OpenOrienteering developers")
+set(PROJECT_VERSION_DISPLAY "${PROJECT_VERSION} ${CMAKE_BUILD_TYPE}" CACHE STRING
+  "Project version string to be displayed"
+)
 
 option(MAKE_BUNDLE "Install all runtime libraries and plugins" OFF)
 

ci/build.yml

@@ -54,6 +54,7 @@ steps:
       -Ddefault_INSTALL_PREFIX=$(SUPERBUILD_INSTALL_DIR)
       -Ddefault_TOOLCHAIN_DIR=$(SUPERBUILD_INSTALL_DIR)/toolchain
       -DCupCalculator_CI_SOURCE_DIR=$(SOURCE_DIR)
+      "-DCupCalculator_CI_VERSION_DISPLAY=$(VERSION_DISPLAY)"
       ${{ parameters.cmakeArgs }}
   displayName: 'Configure'
 

ci/openorienteering-cupcalculator-ci.cmake

@@ -30,7 +30,9 @@
 set(CupCalculator_CI_SOURCE_DIR "NOTFOUND" CACHE STRING
   "CupCalculator (CI): Source code directory"
 )
-
+set(CupCalculator_CI_VERSION_DISPLAY "ci" STRING BOOL
+  "CupCalculator (CI): Version display string"
+)
 set(CupCalculator_CI_ENABLE_COVERAGE "OFF" CACHE BOOL
   "CupCalculator (CI): Enable test coverage analysis"
 )
@@ -57,7 +59,9 @@ superbuild_package(
       "-UCMAKE_STAGING_PREFIX"
       "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
       "-ULICENSING_OPTIONAL_ITEMS"  # unset here, updated via CMAKE_CACHE_ARGS
+      "-UPROJECT_VERSION_DISPLAY"   # unset here, updated via CMAKE_CACHE_ARGS
     CMAKE_CACHE_ARGS
+      "-DPROJECT_VERSION_DISPLAY:STRING=@CupCalculator_CI_VERSION_DISPLAY@"
       "-DLICENSING_OPTIONAL_ITEMS:STRING=@CupCalculator_CI_LICENSING_OPTIONAL_ITEMS@"
     $<$<BOOL:@WIN32@>:
       "-DCMAKE_INSTALL_BINDIR:STRING=."

src/CMakeLists.txt

@@ -25,6 +25,12 @@ include("licensing_helper")
 
 set(CMAKE_AUTOMOC ON)
 
+
+set(APP_NAME "CupCalculator")
+configure_file("config.h.in" "config.h" @ONLY)
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+
 add_library(CupCalculator_Common STATIC
 	mainWindow.cpp
 
@@ -56,6 +62,7 @@ target_link_libraries(CupCalculator_Common
   PUBLIC Qt5::Widgets
 )
 
+
 add_executable(CupCalculator WIN32 main.cpp)
 target_link_libraries(CupCalculator
   PUBLIC
@@ -70,6 +77,7 @@ if(MAKE_BUNDLE)
 	licensing_helper_postprocess(CupCalculator COPYING.txt)
 endif()
 
+
 add_executable(CupCalculatorTest test.cpp)
 target_link_libraries(CupCalculatorTest
   PUBLIC

src/club.cpp

@@ -30,7 +30,7 @@
 
 #include "location.h"
 #include "util.h"
-#include "global.h"
+#include "config.h"
 #include "runner.h"
 #include "scoring.h"
 #include "seriesScoring.h"

src/clubDialog.cpp

@@ -25,7 +25,7 @@
 
 #include "location.h"
 #include "club.h"
-#include "global.h"
+#include "config.h"
 #include "util.h"
 
 ClubDialog::ClubDialog(Club* _club, QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint), club(_club)

src/global.h renamed to src/config.h.in

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -18,12 +19,14 @@
 */
 
 
-#ifndef GLOBAL_H
-#define GLOBAL_H
+#ifndef CUPCALCULATOR_CONFIG_H
+#define CUPCALCULATOR_CONFIG_H
 
-#define APP_NAME qApp->translate("Global", QT_TRANSLATE_NOOP("Global", "CupCalculator"))
-#define APP_VERSION "v1.1.1"
+#define APP_NAME                qApp->translate("Global", "@APP_NAME@")
+#define PROJECT_NAME            qApp->translate("Global", "@PROJECT_NAME@")
+#define PROJECT_COPYRIGHT       "@PROJECT_COPYRIGHT@"
+#define PROJECT_VERSION_DISPLAY "@PROJECT_VERSION_DISPLAY@"
 
 extern char installationKey[33];	// 32 letters and terminating 0
 
-#endif
+#endif  // CUPCALCULATOR_CONFIG_H

src/location.cpp

@@ -27,7 +27,7 @@
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
 
-#include "global.h"
+#include "config.h"
 
 QSortFilterProxyModel* LocationDB::sortModel;
 

src/main.cpp

@@ -34,7 +34,7 @@
 #include "runner.h"
 #include "scoring.h"
 #include "seriesScoring.h"
-#include "global.h"
+#include "config.h"
 
 void loadProgramSettings();
 void saveProgramSettings();

src/mainWindow.cpp

@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <set>
 
-#include "global.h"
+#include "config.h"
 #include "csvFile.h"
 #include "resultCsvImport.h"
 #include "event.h"
@@ -60,7 +60,8 @@ MainWindow::MainWindow(QWidget* parent)
 	mainLayout->addWidget(tabWidget);
 	setLayout(mainLayout);
 
-	setWindowTitle(QString("%1 %2").arg(APP_NAME).arg(APP_VERSION));
+	void(QT_TRANSLATE_NOOP("Global", "CupCalculator"));
+	setWindowTitle(QString("%1 %2").arg(PROJECT_NAME, PROJECT_VERSION_DISPLAY));
 	setWindowIcon(QIcon("images/control.png"));
 
 	setSizeGripEnabled(true);
@@ -1207,16 +1208,18 @@ void SeriesScoringTab::seriesDoubleClicked(QListWidgetItem* item)
 
 AboutTab::AboutTab(MainWindow* mainWindow, QWidget* parent): QWidget(parent), mainWindow(mainWindow)
 {
-	QLabel* programLabel = new QLabel(QString("<b>%1 %2</b>").arg(APP_NAME).arg(APP_VERSION));
+	void(QT_TRANSLATE_NOOP("Global", "CupCalculator"));
+	QLabel* programLabel = new QLabel(QString("<b>%1 %2</b>").arg(PROJECT_NAME, PROJECT_VERSION_DISPLAY));
 	programLabel->setAlignment(Qt::AlignHCenter);
 	QFont hugeFont = programLabel->font();
 	hugeFont.setPointSize(20);
 	programLabel->setFont(hugeFont);
 
-	QLabel* aboutLabel = new QLabel(tr("Copyright (C) 2011, 2012, 2015  Thomas Sch&ouml;ps<br>"
-									   "This program comes with ABSOLUTELY NO WARRANTY;<br>"
-									   "This is free software, and you are welcome to redistribute it<br>"
-									   "under certain conditions; see the file COPYING for details."));
+	QLabel* aboutLabel = new QLabel(tr("%1<br>"
+	                                   "This program comes with ABSOLUTELY NO WARRANTY;<br>"
+	                                   "This is free software, and you are welcome to redistribute it<br>"
+	                                   "under certain conditions; see the file COPYING for details.")
+	                                .arg(PROJECT_COPYRIGHT));
 	aboutLabel->setAlignment(Qt::AlignHCenter);
 	QFont bigFont = aboutLabel->font();
 	bigFont.setPointSize(12);
@@ -1228,7 +1231,7 @@ AboutTab::AboutTab(MainWindow* mainWindow, QWidget* parent): QWidget(parent), ma
 	mediumFont.setPointSize(12);
 	imageLabel->setFont(mediumFont);
 
-	QLabel* aboutImage = new QLabel("<a href=\"http://www.openorienteering.org\"><img src=\"images/open_orienteering.png\"/></a>");
+	QLabel* aboutImage = new QLabel("<a href=\"https://www.openorienteering.org\"><img src=\"images/open_orienteering.png\"/></a>");
 
 	QVBoxLayout* layout = new QVBoxLayout();
 	layout->addStretch(1);