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
This commit is contained in:
Julien Wadel 2023-11-15 12:40:52 +01:00
parent 5ac59c946a
commit e1340a4570
9 changed files with 18 additions and 5 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -161,6 +161,7 @@ ApplicationWindow {
CoreManager.forceRefreshRegisters()
Logic.manageAccounts()
}
onMessageCounterClicked: window.setView('Calls')
}
ColumnLayout {

@ -1 +1 @@
Subproject commit d6fc9fb3338622a74fe8fe2121fe2d80df6ab560
Subproject commit a20e90babe7e6dc4def83720e7dce96ba3f917af