diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7a09fa46..f9e38c56 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,6 +1,6 @@ -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- # Workflow configuration -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- name: Deploy @@ -13,12 +13,12 @@ on: paths-ignore: # File-patterns to ignore - '**.md' # Ignore changes to *.md files -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- # Define application name & version -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- env: - VERSION: "3.0.0" + VERSION: "3.0.1" QT_VERSION_LINUX: 6.8.0 QT_VERSION_MACOS: 6.8.0 QT_VERSION_WINDOWS: 6.8.0 @@ -29,10 +29,9 @@ env: PUBLISHER: "Alex Spataru" QT_MODULES: qtserialport qtconnectivity qtpositioning qtlocation qtgraphs qtquick3d qt3d qtdatavis3d qtshadertools - -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- # Workflow jobs (GNU/Linux, macOS & Windows) -#-------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- jobs: # diff --git a/CMakeLists.txt b/CMakeLists.txt index d704cb3c..799eb608 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ set(PROJECT_CONTACT "serial-studio.github.io") set(PROJECT_DESCRIPTION_SUMMARY "Multi-purpose data visualization software") set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MINOR "0") -set(PROJECT_VERSION_PATCH "0") +set(PROJECT_VERSION_PATCH "1") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(PROJECT_APPCAST "https://raw.githubusercontent.com/Serial-Studio/Serial-Studio/master/updates.json") diff --git a/app/deploy/linux/serial-studio.desktop b/app/deploy/linux/serial-studio.desktop index 446f0bcb..b2de3fb8 100644 --- a/app/deploy/linux/serial-studio.desktop +++ b/app/deploy/linux/serial-studio.desktop @@ -8,5 +8,5 @@ StartupNotify=true Categories=Electronics;Engineering;Science; Icon=serial-studio X-AppImage-Name=Serial Studio -X-AppImage-Version=3.0.0 +X-AppImage-Version=3.0.1 X-AppImage-Arch=x86_64 diff --git a/app/deploy/macOS/info.plist b/app/deploy/macOS/info.plist index 9972fe84..5af8a6fe 100644 --- a/app/deploy/macOS/info.plist +++ b/app/deploy/macOS/info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.0 + 3.0.1 LSHasLocalizedDisplayName NSPrincipalClass diff --git a/app/qml/Dialogs/About.qml b/app/qml/Dialogs/About.qml index eaaf3067..9df7df7b 100644 --- a/app/qml/Dialogs/About.qml +++ b/app/qml/Dialogs/About.qml @@ -171,7 +171,7 @@ Window { } ColumnLayout { - spacing: 8 + spacing: 0 Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -180,6 +180,10 @@ Window { font: Cpp_Misc_CommonFonts.customUiFont(28, true) } + Item { + implicitHeight: 8 + } + Label { opacity: 0.5 text: qsTr("Version %1").arg(Cpp_AppVersion) diff --git a/app/src/Misc/ModuleManager.cpp b/app/src/Misc/ModuleManager.cpp index f1d509e2..a4cfc2ce 100644 --- a/app/src/Misc/ModuleManager.cpp +++ b/app/src/Misc/ModuleManager.cpp @@ -267,6 +267,10 @@ void Misc::ModuleManager::initializeQmlInterface() connect(miscTranslator, &Misc::Translator::languageChanged, &m_engine, &QQmlApplicationEngine::retranslate); + // Obtain build date/time + const auto buildDate = QStringLiteral(__DATE__); + const auto buildTime = QStringLiteral(__TIME__); + // Register C++ modules with QML const auto c = m_engine.rootContext(); c->setContextProperty("Cpp_Updater", updater); @@ -290,6 +294,8 @@ void Misc::ModuleManager::initializeQmlInterface() c->setContextProperty("Cpp_Misc_CommonFonts", miscCommonFonts); c->setContextProperty("Cpp_UpdaterEnabled", autoUpdaterEnabled()); c->setContextProperty("Cpp_ModuleManager", this); + c->setContextProperty("Cpp_BuildDate", buildDate); + c->setContextProperty("Cpp_BuildTime", buildTime); // Register app info with QML c->setContextProperty("Cpp_AppName", qApp->applicationDisplayName());