diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml index 999e4e0dc364cba02a6a94208c725a2f99eb61be..5271a9cc28bf1ea290ca432829f9fcd95a297fd5 100644 --- a/src/constant/JamiStrings.qml +++ b/src/constant/JamiStrings.qml @@ -20,8 +20,11 @@ pragma Singleton import QtQuick 2.14 +import net.jami.Helpers 1.0 Item { + readonly property string appTitle: "Jami" + (UpdateManager.isCurrentVersionBeta() ? " (BETA)" : "") + // Misc property string contactSearchConversation: qsTr("Find a user or search for a conversation") property string contactSearchInvitations: qsTr("Search your invitations") @@ -29,7 +32,7 @@ Item { property string description: qsTr("Jami is free software for universal communication which respects the freedoms and the privacy of its users.") // AboutPopUp - property string version: qsTr("Version") + property string version: qsTr("Version") + (UpdateManager.isCurrentVersionBeta() ? " (BETA)" : "") property string companyDeclarationYear: "© 2015-2020 Savoir-faire Linux Inc." property string slogan: "Together" property string declaration: qsTr("Jami is a free software for universal communication which respects the freedom and privacy of its users.") diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml index 0d4239063324e232ab30285e2f01719df59a81b3..c6b4ad7331bef671fd23831de6bc82406ec5ff26 100644 --- a/src/mainview/MainView.qml +++ b/src/mainview/MainView.qml @@ -181,7 +181,7 @@ Window { } - title: "Jami" + title: JamiStrings.appTitle visible: true width: mainViewWindowPreferredWidth height: mainViewWindowPreferredHeight diff --git a/src/qmlregister.cpp b/src/qmlregister.cpp index 5130a11f49d016989f7fd8a5b70fddeb489dfd59..80a53afab653d5da6e36aab35ca826635217222a 100644 --- a/src/qmlregister.cpp +++ b/src/qmlregister.cpp @@ -138,7 +138,8 @@ registerTypes() QML_REGISTERSINGLETONTYPE_CUSTOM("net.jami.Models", AVModel, 1, 0, &LRCInstance::avModel()) QML_REGISTERSINGLETONTYPE_CUSTOM("net.jami.Models", PluginModel, 1, 0, &LRCInstance::pluginModel()) QML_REGISTERSINGLETONTYPE_CUSTOM("net.jami.Models", RenderManager, 1, 0, LRCInstance::renderer()) - QML_REGISTERSINGLETONTYPE_CUSTOM("net.jami.Models", UpdateManager, 1, 0, LRCInstance::getUpdateManager()) + + QML_REGISTERSINGLETONTYPE_CUSTOM("net.jami.Helpers", UpdateManager, 1, 0, LRCInstance::getUpdateManager()) /* * Qml singleton components diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml index 849e8e6daeab279d03423c028131854e3c6ec505..69f4282ce23854656c4686a92c641e8ae57ee5e0 100644 --- a/src/settingsview/components/UpdateSettings.qml +++ b/src/settingsview/components/UpdateSettings.qml @@ -25,6 +25,7 @@ import QtQuick.Layouts 1.3 import net.jami.Adapters 1.0 import net.jami.Enums 1.0 import net.jami.Models 1.0 +import net.jami.Helpers 1.0 import "../../commoncomponents" ColumnLayout { @@ -81,6 +82,8 @@ ColumnLayout { MaterialButton { id: installBetaButton + visible: !UpdateManager.isCurrentVersionBeta() + Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: JamiTheme.preferredFieldWidth Layout.preferredHeight: JamiTheme.preferredFieldHeight diff --git a/src/updatemanager.cpp b/src/updatemanager.cpp index 5a72fa30d6f0492d2e9ce7e3665fca2c4708e557..9adb8480d3c8c82bdddefb6e746f858274a98dc2 100644 --- a/src/updatemanager.cpp +++ b/src/updatemanager.cpp @@ -57,6 +57,12 @@ UpdateManager::setAutoUpdateCheck(bool state) updateTimer_->start(updatePeriod); } +bool +UpdateManager::isCurrentVersionBeta() +{ + return isBeta; +} + void UpdateManager::checkForUpdates(bool quiet) { diff --git a/src/updatemanager.h b/src/updatemanager.h index ba9fa6475bfc834888c4759c8c8331402edd1ac3..792830739ccafb5a07fd8cc8949a99d0f868db46 100644 --- a/src/updatemanager.h +++ b/src/updatemanager.h @@ -34,6 +34,7 @@ public: Q_INVOKABLE void applyUpdates(bool beta = false); Q_INVOKABLE void cancelUpdate(); Q_INVOKABLE void setAutoUpdateCheck(bool state); + Q_INVOKABLE bool isCurrentVersionBeta(); signals: void updateCheckReplyReceived(bool ok, bool found = false);