mirror of
https://github.com/spalencsar/bearwave.git
synced 2026-07-06 22:24:17 +02:00
fix: About dialog version display (1.0.7)
Pass app version and build id explicitly from Main.qml to AboutDialog instead of relying on context properties inside the QML module scope. Remove the confusing "Public beta" label.
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user