mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-23 06:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(Settings): add an developer option to disable conference

Browse source
This commit is contained in:
Ronan Abhamon 2018-07-17 14:00:08 +02:00
parent 9bcdc70cd8
commit 7ccfee4ca7
14 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/languages/de.ts
View file

@ -1214,6 +1214,10 @@ Klicken Sie hier: <a href="%1">%1</a>
<source>chatNotificationSoundLabel</source>
<translation>Benachrichtigungston</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/en.ts
View file

@ -1216,6 +1216,10 @@ your friend&apos;s SIP address or username.</translation>
<source>chatNotificationSoundLabel</source>
<translation>Notification sound</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation>Enable conference</translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/fr_FR.ts
View file

@ -1214,6 +1214,10 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>chatNotificationSoundLabel</source>
<translation>Son des notifications</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation>Activer la conférence</translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/ja.ts
View file

@ -1211,6 +1211,10 @@
<source>chatNotificationSoundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/lt.ts
View file

@ -1216,6 +1216,10 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą.</translation>
<source>chatNotificationSoundLabel</source>
<translation>Pranešimų garsas</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/pt_BR.ts
View file

@ -1216,6 +1216,10 @@ o endereço SIP ou nome de usuário do seu amigo.</translation>
<source>chatNotificationSoundLabel</source>
<translation>Som de notificação</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/ru.ts
View file

@ -1214,6 +1214,10 @@
<source>chatNotificationSoundLabel</source>
<translation>Звук уведомлений</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/sv.ts
View file

@ -1213,6 +1213,10 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<source>chatNotificationSoundLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

4
assets/languages/tr.ts
View file

@ -1216,6 +1216,10 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin.</translation>
<source>chatNotificationSoundLabel</source>
<translation>Bildirim sesi</translation>
</message>
<message>
<source>conferenceEnabledLabel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsNetwork</name>

1
src/app/App.cpp
View file

@ -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();

11
src/components/settings/SettingsModel.cpp
View file

@ -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);
}

7
src/components/settings/SettingsModel.hpp
View file

@ -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);

1
ui/views/App/Calls/CallsWindow.qml
View file

@ -117,6 +117,7 @@ Window {
ActionButton {
icon: 'new_conference'
visible: SettingsModel.conferenceEnabled
onClicked: Logic.openConferenceManager()
}

10
ui/views/App/Settings/SettingsCallsChat.qml
View file

@ -133,6 +133,16 @@ TabContainer {
onClicked: SettingsModel.chatEnabled = !checked
}
}
FormGroup {
label: qsTr('conferenceEnabledLabel')
Switch {
checked: SettingsModel.conferenceEnabled
onClicked: SettingsModel.conferenceEnabled = !checked
}
}
}
FormLine {