From 5e1d6307d9d46d9220832edd8f262156a1fba7e3 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 15 Nov 2023 12:40:52 +0100 Subject: [PATCH] CI: Fix find names for Mac. Fix default account selction after login. Add a RC config (message_counter_redirect_enabled) for message counter shortcut to calls. Update SDK --- .gitlab-ci-files/job-linux-desktop-ubuntu-1804.yml | 2 +- .gitlab-ci-files/job-macosx-desktop.yml | 2 +- .gitlab-ci-files/job-windows-desktop.yml | 2 +- linphone-app/src/components/assistant/AssistantModel.cpp | 2 +- linphone-app/src/components/settings/SettingsModel.cpp | 4 ++++ linphone-app/src/components/settings/SettingsModel.hpp | 2 ++ linphone-app/ui/modules/Linphone/Account/AccountStatus.qml | 6 ++++++ linphone-app/ui/views/App/Main/MainWindow.qml | 1 + linphone-sdk | 2 +- 9 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-ubuntu-1804.yml b/.gitlab-ci-files/job-linux-desktop-ubuntu-1804.yml index b05ab2a67..e40259ddb 100644 --- a/.gitlab-ci-files/job-linux-desktop-ubuntu-1804.yml +++ b/.gitlab-ci-files/job-linux-desktop-ubuntu-1804.yml @@ -164,7 +164,7 @@ job-ubuntu1804-makefile-gcc-deploy: # Going to folder in order to avoid having path in checksum - |- cd build/OUTPUT/Packages - for file in $(find . -type f -name '*.AppImage' -printf '%f\n') + for file in $(find . -type f -name '*.AppImage' -exec basename {} \;) do rsync -rlv --ignore-existing $file $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER sha512sum $file > $file.sha512 diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 5ddddcaf8..ee456c0ef 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -150,7 +150,7 @@ job-macosx-makefile-deploy: # Going to folder in order to avoid having path in checksum - |- cd build/OUTPUT/linphone-app/macos/Packages/ - for file in $(find . -type f -name 'Linphone*.dmg' -printf '%f\n') + for file in $(find . -type f -name '*.dmg' -exec basename {} \;) do rsync -rlv --ignore-existing $file $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$MACOSX_PLATFORM/$APP_FOLDER sha512sum $file > $file.sha512 diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index 0f2a0a747..cc29fdb9d 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -177,7 +177,7 @@ vs2019-win64-upload: # Going to folder in order to avoid having path in checksum - |- cd build-desktop/OUTPUT/Packages/ - for file in $(find . -type f -name '*.exe' -printf '%f\n') + for file in $(find . -type f -name '*.exe' -exec basename {} \;) do rsync -rlv --ignore-existing $file $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$WINDOWS_PLATFORM/$APP_FOLDER sha512sum $file > $file.sha512 diff --git a/linphone-app/src/components/assistant/AssistantModel.cpp b/linphone-app/src/components/assistant/AssistantModel.cpp index 6b627eefe..5f0d5f4e3 100644 --- a/linphone-app/src/components/assistant/AssistantModel.cpp +++ b/linphone-app/src/components/assistant/AssistantModel.cpp @@ -410,7 +410,7 @@ void AssistantModel::login () { return; } - mAccountCreator->setAsDefault(false); + mAccountCreator->setAsDefault(true); auto account = mAccountCreator->createAccountInCore(); if(account){ auto listener = std::make_shared(this); diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 5c92b0287..2b82f638a 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -1774,6 +1774,10 @@ QString SettingsModel::getDefaultOtherSipAccountDomain() const { return Utils::coreStringToAppString(mConfig->getString(UiSection, "default_other_sip_account_domain", "")); } +bool SettingsModel::getMessageCounterRedirectEnabled() const { + return !!mConfig->getInt(UiSection, "message_counter_redirect_enabled", false); +} + bool SettingsModel::isMipmapEnabled() const{ return !!mConfig->getInt(UiSection, "mipmap_enabled", 0); } diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index d8db2e500..0b7e55689 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -225,6 +225,7 @@ class SettingsModel : public QObject { Q_PROPERTY(bool showStartVideoCallButton READ getShowStartVideoCallButton CONSTANT) Q_PROPERTY(bool showHomeInviteButton READ getShowHomeInviteButton CONSTANT) Q_PROPERTY(QString defaultOtherSipAccountDomain READ getDefaultOtherSipAccountDomain CONSTANT) + Q_PROPERTY(bool messageCounterRedirectEnabled READ getMessageCounterRedirectEnabled CONSTANT) Q_PROPERTY(bool mipmapEnabled READ isMipmapEnabled WRITE setMipmapEnabled NOTIFY mipmapEnabledChanged) Q_PROPERTY(bool useMinimalTimelineFilter READ useMinimalTimelineFilter WRITE setUseMinimalTimelineFilter NOTIFY useMinimalTimelineFilterChanged) @@ -640,6 +641,7 @@ public: Q_INVOKABLE bool getShowHomePage() const; Q_INVOKABLE bool getShowHomeInviteButton() const; Q_INVOKABLE QString getDefaultOtherSipAccountDomain() const; + Q_INVOKABLE bool getMessageCounterRedirectEnabled() const; bool isMipmapEnabled() const; diff --git a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml index 9201fe1c6..f5e034edf 100644 --- a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml +++ b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml @@ -16,6 +16,7 @@ Item { // --------------------------------------------------------------------------- signal clicked + signal messageCounterClicked property alias cursorShape:mouseArea.cursorShape property alias betterIcon : presenceLevel.betterIcon property bool noAccountConfigured: AccountSettingsModel.accounts.length <= ((SettingsModel.showLocalSipAccount ? 1 : 0)) @@ -96,6 +97,11 @@ Item { count: CoreManager.eventCount iconSize: AccountStatusStyle.messageCounter.iconSize pointSize: AccountStatusStyle.messageCounter.pointSize + MouseArea{ + anchors.fill: parent + visible: SettingsModel.messageCounterRedirectEnabled + onClicked: accountStatus.messageCounterClicked() + } } } }//RowLayout diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml index b2b39acbf..fa957ea23 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.qml +++ b/linphone-app/ui/views/App/Main/MainWindow.qml @@ -161,6 +161,7 @@ ApplicationWindow { CoreManager.forceRefreshRegisters() Logic.manageAccounts() } + onMessageCounterClicked: window.setView('Calls') } ColumnLayout { diff --git a/linphone-sdk b/linphone-sdk index d6fc9fb33..a20e90bab 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit d6fc9fb3338622a74fe8fe2121fe2d80df6ab560 +Subproject commit a20e90babe7e6dc4def83720e7dce96ba3f917af