- Enable G729 in CI.

- Update translations.
- Option to enable chat notifications.
This commit is contained in:
Julien Wadel 2022-01-06 13:22:30 +01:00
parent ffd4c60acb
commit 922d155146
29 changed files with 129 additions and 19 deletions

View file

@ -96,7 +96,7 @@ job-archlinux-latest-ninja-clang-novideo:
# - $NIGHTLY_MASTER
# - $DEPLOY_LINUX
# variables:
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
# extends: job-archlinux-latest-makefile-clang
# artifacts:
# paths:

View file

@ -73,7 +73,7 @@ job-centos7-ninja-gcc-package:
variables:
- $DEPLOY_LINUX_CENTOS7
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS -DENABLE_G729=ON
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++

View file

@ -105,7 +105,7 @@ job-debian10-makefile-clang-package:
- $NIGHTLY_MASTER
- $DEPLOY_LINUX
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
extends: job-debian10-makefile-clang
artifacts:
paths:

View file

@ -43,7 +43,7 @@ job-debian8-makefile-clang:
# - $NIGHTLY_MASTER
# - $DEPLOY_LINUX
# variables:
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
# extends: job-debian8-makefile-clang
# artifacts:
# paths:

View file

@ -55,7 +55,7 @@ job-debian9-ninja-clang:
- $NIGHTLY_MASTER
image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION
variables:
CMAKE_OPTIONS: -DENABLE_DOC=ON
CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON
CMAKE_GENERATOR: Ninja
CC: clang
CXX: clang++
@ -77,7 +77,7 @@ job-debian9-makefile-clang:
- $NIGHTLY_MASTER
- $DEPLOY_PLUGINS
variables:
CMAKE_OPTIONS: -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS
CMAKE_OPTIONS: -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS -DENABLE_G729=ON
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++
@ -117,7 +117,7 @@ job-debian9-makefile-clang-package:
- $PACKAGE_LINUX
- $DEPLOY_LINUX
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DLINPHONE_BUILDER_SIGNING_PASSPHRASE=$GPG_SIGNING_PASS -DENABLE_G729=ON
CMAKE_GENERATOR: Unix Makefiles
CC: clang
CXX: clang++

View file

@ -88,7 +88,7 @@ job-ubuntu-rolling-ninja-clang-novideo:
# - $NIGHTLY_MASTER
# - $DEPLOY_LINUX
# variables:
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
# CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
# extends: job-ubuntu-rolling-makefile-clang
# artifacts:
# paths:

View file

@ -96,7 +96,7 @@ job-macosx-makefile-package:
- $PACKAGE_MACOSX
- $DEPLOY_MACOSX
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
extends: job-macosx-makefile
script:
- *build_all_script

View file

@ -24,7 +24,7 @@
stage: build
tags: [ "windows" ]
variables:
CMAKE_OPTIONS: -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=ON -DLINPHONE_WINDOWS_SIGNING_DIR=$WINDOWS_SIGNING_DIRECTORY
CMAKE_OPTIONS: -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=ON -DLINPHONE_WINDOWS_SIGNING_DIR=$WINDOWS_SIGNING_DIRECTORY -DENABLE_G729=ON
MINGW_TYPE: mingw32
script:
- *build_all_windows_script
@ -82,7 +82,7 @@ job-windows-vs2017-package:
- $PACKAGE_WINDOWS
- $DEPLOY_WINDOWS
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_WINDOWS_SIGNING_DIR=$WINDOWS_SIGNING_DIRECTORY
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_WINDOWS_SIGNING_DIR=$WINDOWS_SIGNING_DIRECTORY -DENABLE_G729=ON
MINGW_TYPE: mingw32
script:
- *build_all_windows_script

View file

@ -11,11 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* messages features : Reply, forward (to contact, to a SIP address or to a timeline), Vocal record and play, multi contents.
- Add a feedback on fetching remote provisioning when it failed.
- Option to enable message notifications.
- Based on Linphone SDK 5.1
### Fixed
- Simplify filtering timelines on 3 kind of search : security level, simple/group chats, ephemerals.
- Fix systemTrayIcon that could be cloned on each restart.
- Fix errors on Action-Buttons on restart.
- Enable G729 on public builds.
- Take account of return key on Numpad
## 4.3.2
@ -25,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove constraints on actions (call/chat) that were based on friends capabilities.
- Unblock secure group chat activation.
- Unselect current contact if history call view is displayed.
- Show chat actions in history view
- Show chat actions in history view.
- Group chat creation : If no groupchat capabilities has been found in recent contacts, ignore test on capability and display them.
## 4.3.1 - 2021-11-04

View file

@ -1915,6 +1915,11 @@ Klik her: <a href="%1">%1</a>
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1915,6 +1915,11 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Anrufen wenn registriert</translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1920,6 +1920,11 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Call when registered</translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation>Enable notifications</translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1915,6 +1915,11 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -163,7 +163,7 @@
</message>
<message>
<source>usernameStatusInvalidCharacters</source>
<translation>Caractères invalides détectés (regex: `%1`).</translation>
<translation>Caractères invalides détectés (regex&#x202f;: `%1`).</translation>
</message>
<message>
<source>usernameStatusInvalid</source>
@ -179,7 +179,7 @@
</message>
<message>
<source>passwordStatusInvalidCharacters</source>
<translation>Caractères invalides détectés (regex: `%1`).</translation>
<translation>Caractères invalides détectés (regex&#x202f;: `%1`).</translation>
</message>
<message>
<source>passwordStatusMissingCharacters</source>
@ -994,7 +994,7 @@ URL du serveur non configurée.</translation>
<message>
<source>ephemeralNotInConference!</source>
<extracomment>&apos;Ephemeral message is only supported in conference based chat room!&apos;</extracomment>
<translation>Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence!</translation>
<translation>Les messages éphémères ne sont disponibles que pour une conversation définie en mode conférence&#x202f;!</translation>
<extra-Context>Warning about not being in conference based chat room.</extra-Context>
</message>
<message>
@ -1915,6 +1915,11 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Appeler seulement si enregistré</translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>
@ -1951,7 +1956,7 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
</message>
<message>
<source>serverTooltip</source>
<translation>Serveur LDAP. ie: ldap:// pour un serveur local ou ldap://ldap.example.org/</translation>
<translation>Serveur LDAP. ie&#x202f;: ldap:// pour un serveur local ou ldap://ldap.example.org/</translation>
</message>
<message>
<source>bindDNLabel</source>

View file

@ -1905,6 +1905,11 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Ha regisztrált, használja híváskor</translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1915,6 +1915,11 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1905,6 +1905,11 @@
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1925,6 +1925,11 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1915,6 +1915,11 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation>Ligar quando registrado</translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1925,6 +1925,11 @@
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1915,6 +1915,11 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1905,6 +1905,11 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1925,6 +1925,11 @@
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -1905,6 +1905,11 @@
<extracomment>&apos;Call when registered&apos; : Label on switch to choose if calls are make when the current proxy is registered</extracomment>
<translation></translation>
</message>
<message>
<source>chatNotificationsEnabledLabel</source>
<extracomment>&apos;Enable notifications&apos;: settings label for enabling notifications.</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsLdap</name>

View file

@ -207,11 +207,11 @@ void CoreHandlers::onMessageReceived (
// 2. Notify with Notification popup.
const App *app = App::getInstance();
if (!app->hasFocus() || !chatRoom->getLocalAddress()->weakEqual(coreManager->getAccountSettingsModel()->getUsedSipAddress()))
if (coreManager->getSettingsModel()->getChatNotificationsEnabled() && (!app->hasFocus() || !chatRoom->getLocalAddress()->weakEqual(coreManager->getAccountSettingsModel()->getUsedSipAddress())))
app->getNotifier()->notifyReceivedMessage(message);
// 3. Notify with sound.
if (!settingsModel->getChatNotificationSoundEnabled())
if (!coreManager->getSettingsModel()->getChatNotificationsEnabled() || !settingsModel->getChatNotificationSoundEnabled())
return;
if (

View file

@ -689,6 +689,17 @@ void SettingsModel::setConferenceEnabled (bool status) {
// -----------------------------------------------------------------------------
bool SettingsModel::getChatNotificationsEnabled () const {
return !!mConfig->getInt(UiSection, "chat_notifications_enabled", 1);
}
void SettingsModel::setChatNotificationsEnabled (bool status) {
mConfig->setInt(UiSection, "chat_notifications_enabled", status);
emit chatNotificationsEnabledChanged(status);
}
// -----------------------------------------------------------------------------
bool SettingsModel::getChatNotificationSoundEnabled () const {
return !!mConfig->getInt(UiSection, "chat_sound_notification_enabled", 1);
}

View file

@ -115,6 +115,8 @@ class SettingsModel : public QObject {
Q_PROPERTY(bool conferenceEnabled READ getConferenceEnabled WRITE setConferenceEnabled NOTIFY conferenceEnabledChanged)
Q_PROPERTY(bool chatNotificationsEnabled READ getChatNotificationsEnabled WRITE setChatNotificationsEnabled NOTIFY chatNotificationsEnabledChanged)
Q_PROPERTY(bool chatNotificationSoundEnabled READ getChatNotificationSoundEnabled WRITE setChatNotificationSoundEnabled NOTIFY chatNotificationSoundEnabledChanged)
Q_PROPERTY(QString chatNotificationSoundPath READ getChatNotificationSoundPath WRITE setChatNotificationSoundPath NOTIFY chatNotificationSoundPathChanged)
@ -358,6 +360,9 @@ public:
bool getConferenceEnabled () const;
void setConferenceEnabled (bool status);
bool getChatNotificationsEnabled () const;
void setChatNotificationsEnabled (bool status);
bool getChatNotificationSoundEnabled () const;
void setChatNotificationSoundEnabled (bool status);
@ -604,6 +609,7 @@ signals:
void conferenceEnabledChanged (bool status);
void chatNotificationsEnabledChanged (bool status);
void chatNotificationSoundEnabledChanged (bool status);
void chatNotificationSoundPathChanged (const QString &path);

View file

@ -252,6 +252,20 @@ TabContainer {
}
}
FormLine {
FormGroup {
//: 'Enable notifications': settings label for enabling notifications.
label: qsTr('chatNotificationsEnabledLabel')
Switch {
id: enableChatNotifications
checked: SettingsModel.chatNotificationsEnabled
onClicked: SettingsModel.chatNotificationsEnabled = !checked
}
}
}
FormLine {
FormGroup {
label: qsTr('chatNotificationSoundEnabledLabel')

@ -1 +1 @@
Subproject commit 29966e6f7573e84983981f37c816b62ddea296cd
Subproject commit 3d422c64a3a10289fe6dda31ccb0af17b41cfffa