From 7ccfee4ca70d77b7c90dce9df99ed4d196fee6ed Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 17 Jul 2018 14:00:08 +0200 Subject: [PATCH] feat(Settings): add an developer option to disable conference --- assets/languages/de.ts | 4 ++++ assets/languages/en.ts | 4 ++++ assets/languages/fr_FR.ts | 4 ++++ assets/languages/ja.ts | 4 ++++ assets/languages/lt.ts | 4 ++++ assets/languages/pt_BR.ts | 4 ++++ assets/languages/ru.ts | 4 ++++ assets/languages/sv.ts | 4 ++++ assets/languages/tr.ts | 4 ++++ src/app/App.cpp | 1 - src/components/settings/SettingsModel.cpp | 11 +++++++++++ src/components/settings/SettingsModel.hpp | 7 +++++++ ui/views/App/Calls/CallsWindow.qml | 1 + ui/views/App/Settings/SettingsCallsChat.qml | 10 ++++++++++ 14 files changed, 65 insertions(+), 1 deletion(-) diff --git a/assets/languages/de.ts b/assets/languages/de.ts index 95dfa9647..df3a0526f 100644 --- a/assets/languages/de.ts +++ b/assets/languages/de.ts @@ -1214,6 +1214,10 @@ Klicken Sie hier: <a href="%1">%1</a> chatNotificationSoundLabel Benachrichtigungston + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/en.ts b/assets/languages/en.ts index 4f2a32568..8aae36c8a 100644 --- a/assets/languages/en.ts +++ b/assets/languages/en.ts @@ -1216,6 +1216,10 @@ your friend's SIP address or username. chatNotificationSoundLabel Notification sound + + conferenceEnabledLabel + Enable conference + SettingsNetwork diff --git a/assets/languages/fr_FR.ts b/assets/languages/fr_FR.ts index 9df3bfa31..6f8e3427f 100644 --- a/assets/languages/fr_FR.ts +++ b/assets/languages/fr_FR.ts @@ -1214,6 +1214,10 @@ Cliquez ici : <a href="%1">%1</a> chatNotificationSoundLabel Son des notifications + + conferenceEnabledLabel + Activer la conférence + SettingsNetwork diff --git a/assets/languages/ja.ts b/assets/languages/ja.ts index aa945f8fb..337c05466 100644 --- a/assets/languages/ja.ts +++ b/assets/languages/ja.ts @@ -1211,6 +1211,10 @@ chatNotificationSoundLabel + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/lt.ts b/assets/languages/lt.ts index b3424ce45..e6a685635 100644 --- a/assets/languages/lt.ts +++ b/assets/languages/lt.ts @@ -1216,6 +1216,10 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. chatNotificationSoundLabel Pranešimų garsas + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/pt_BR.ts b/assets/languages/pt_BR.ts index f16dae3f8..5e4918a5c 100644 --- a/assets/languages/pt_BR.ts +++ b/assets/languages/pt_BR.ts @@ -1216,6 +1216,10 @@ o endereço SIP ou nome de usuário do seu amigo. chatNotificationSoundLabel Som de notificação + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/ru.ts b/assets/languages/ru.ts index a7c74466f..899812494 100644 --- a/assets/languages/ru.ts +++ b/assets/languages/ru.ts @@ -1214,6 +1214,10 @@ chatNotificationSoundLabel Звук уведомлений + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/sv.ts b/assets/languages/sv.ts index 28d744c38..b847fb70f 100644 --- a/assets/languages/sv.ts +++ b/assets/languages/sv.ts @@ -1213,6 +1213,10 @@ Klicka här: <a href="%1">%1</a> chatNotificationSoundLabel + + conferenceEnabledLabel + + SettingsNetwork diff --git a/assets/languages/tr.ts b/assets/languages/tr.ts index d620b8475..05784b186 100644 --- a/assets/languages/tr.ts +++ b/assets/languages/tr.ts @@ -1216,6 +1216,10 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. chatNotificationSoundLabel Bildirim sesi + + conferenceEnabledLabel + + SettingsNetwork diff --git a/src/app/App.cpp b/src/app/App.cpp index 0f204d256..1cbb54db0 100644 --- a/src/app/App.cpp +++ b/src/app/App.cpp @@ -199,7 +199,6 @@ void App::initContentApp () { mEngine = new QQmlApplicationEngine(); // Provide `+custom` folders for custom components and `5.9` for old components. - // TODO: Remove 5.9 support in 6 months. (~ July 2018). { QStringList selectors("custom"); const QVersionNumber &version = QLibraryInfo::version(); diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index f7494b2dc..4738520f9 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -303,6 +303,17 @@ void SettingsModel::setChatEnabled (bool status) { // ----------------------------------------------------------------------------- +bool SettingsModel::getConferenceEnabled () const { + return !!mConfig->getInt(UiSection, "conference_enabled", 1); +} + +void SettingsModel::setConferenceEnabled (bool status) { + mConfig->setInt(UiSection, "conference_enabled", status); + emit conferenceEnabledChanged(status); +} + +// ----------------------------------------------------------------------------- + bool SettingsModel::getChatNotificationSoundEnabled () const { return !!mConfig->getInt(UiSection, "chat_sound_notification_enabled", 1); } diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index 99fa927ed..d946d2698 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -73,6 +73,8 @@ class SettingsModel : public QObject { Q_PROPERTY(bool chatEnabled READ getChatEnabled WRITE setChatEnabled NOTIFY chatEnabledChanged); + Q_PROPERTY(bool conferenceEnabled READ getConferenceEnabled WRITE setConferenceEnabled NOTIFY conferenceEnabledChanged); + Q_PROPERTY(bool chatNotificationSoundEnabled READ getChatNotificationSoundEnabled WRITE setChatNotificationSoundEnabled NOTIFY chatNotificationSoundEnabledChanged); Q_PROPERTY(QString chatNotificationSoundPath READ getChatNotificationSoundPath WRITE setChatNotificationSoundPath NOTIFY chatNotificationSoundPathChanged); @@ -220,6 +222,9 @@ public: bool getChatEnabled () const; void setChatEnabled (bool status); + bool getConferenceEnabled () const; + void setConferenceEnabled (bool status); + bool getChatNotificationSoundEnabled () const; void setChatNotificationSoundEnabled (bool status); @@ -380,6 +385,8 @@ signals: void chatEnabledChanged (bool status); + void conferenceEnabledChanged (bool status); + void chatNotificationSoundEnabledChanged (bool status); void chatNotificationSoundPathChanged (const QString &path); diff --git a/ui/views/App/Calls/CallsWindow.qml b/ui/views/App/Calls/CallsWindow.qml index f20fe2368..20f4c0129 100644 --- a/ui/views/App/Calls/CallsWindow.qml +++ b/ui/views/App/Calls/CallsWindow.qml @@ -117,6 +117,7 @@ Window { ActionButton { icon: 'new_conference' + visible: SettingsModel.conferenceEnabled onClicked: Logic.openConferenceManager() } diff --git a/ui/views/App/Settings/SettingsCallsChat.qml b/ui/views/App/Settings/SettingsCallsChat.qml index fbb4377f3..2e4b340dd 100644 --- a/ui/views/App/Settings/SettingsCallsChat.qml +++ b/ui/views/App/Settings/SettingsCallsChat.qml @@ -133,6 +133,16 @@ TabContainer { onClicked: SettingsModel.chatEnabled = !checked } } + + FormGroup { + label: qsTr('conferenceEnabledLabel') + + Switch { + checked: SettingsModel.conferenceEnabled + + onClicked: SettingsModel.conferenceEnabled = !checked + } + } } FormLine {