diff --git a/CMakeLists.txt b/CMakeLists.txt index d4ee400..75da36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -project(bearwave VERSION 1.0.6 LANGUAGES CXX) +project(bearwave VERSION 1.0.7 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/de.nerdbear.bearwave.json b/de.nerdbear.bearwave.json index 6d1c674..d3079c2 100644 --- a/de.nerdbear.bearwave.json +++ b/de.nerdbear.bearwave.json @@ -1,6 +1,6 @@ { "app-id": "de.nerdbear.bearwave", - "version": "1.0.6", + "version": "1.0.7", "runtime": "org.kde.Platform", "runtime-version": "6.10", "sdk": "org.kde.Sdk", diff --git a/de.nerdbear.bearwave.metainfo.xml b/de.nerdbear.bearwave.metainfo.xml index a771f39..25361ae 100644 --- a/de.nerdbear.bearwave.metainfo.xml +++ b/de.nerdbear.bearwave.metainfo.xml @@ -59,6 +59,14 @@ + + +
    +
  • About dialog shows the correct app version via explicit QML bindings
  • +
  • Removed confusing “Public beta” label from About
  • +
+
+
    diff --git a/src/qml/Main.qml b/src/qml/Main.qml index a592ed5..ecef207 100644 --- a/src/qml/Main.qml +++ b/src/qml/Main.qml @@ -24,6 +24,8 @@ ApplicationWindow { property var currentPage: "top" property var backend: (typeof radioBackend !== "undefined" ? radioBackend : null) + readonly property string appVersion: (typeof bearwaveVersion !== "undefined" ? bearwaveVersion : Qt.application.version) + readonly property string appBuildId: (typeof bearwaveBuildId !== "undefined" ? bearwaveBuildId : "?") property bool compactMode: width < 780 property real contentOpacity: 1.0 property string activeQuickFilter: "" @@ -240,6 +242,8 @@ ApplicationWindow { AboutDialog { id: aboutDialog compactMode: root.compactMode + appVersion: root.appVersion + buildId: root.appBuildId } ToastPopup { diff --git a/src/qml/components/AboutDialog.qml b/src/qml/components/AboutDialog.qml index 58f35da..5a77440 100644 --- a/src/qml/components/AboutDialog.qml +++ b/src/qml/components/AboutDialog.qml @@ -11,6 +11,8 @@ Dialog { id: root required property bool compactMode + required property string appVersion + required property string buildId modal: true anchors.centerIn: Overlay.overlay @@ -53,20 +55,10 @@ Dialog { Label { Layout.alignment: Qt.AlignHCenter - text: qsTr("Version: %1 (%2)").arg( - (typeof bearwaveVersion !== "undefined" ? bearwaveVersion : Qt.application.version), - (typeof bearwaveBuildId !== "undefined" ? bearwaveBuildId : "?")) + text: qsTr("Version %1 · build %2").arg(root.appVersion, root.buildId) color: BearTheme.textMuted font.pixelSize: 12 } - - Label { - Layout.alignment: Qt.AlignHCenter - text: qsTr("Public beta") - color: BearTheme.accent - font.pixelSize: 12 - font.bold: true - } } ColumnLayout {