mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-24 23:28:09 +00:00
Fixes:
- Couldn't select the default account without selecting another one before. - Display a message about not having a configured account instead of displaying the local one. Local address can still be accessible from settings if activated. - Display Assistant at home if no account has been set.
This commit is contained in:
parent
d65295525e
commit
3fc5767c0f
21 changed files with 146 additions and 5 deletions
|
|
@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
### Fixed
|
||||
- Section date timezone and conferences timezone.
|
||||
- Couldn't select the default account without selecting another one before.
|
||||
- Display a message about not having a configured account instead of displaying the local one. Local address can still be accessible from settings if activated.
|
||||
- Display Assistant at home if no account has been set.
|
||||
- Update SDK to 5.2.67 (Mac crash on resources)
|
||||
|
||||
## 5.0.16 - 2023-05-12
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Pomozte nám přeložit %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Hjælp os at oversætte %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Helfen Sie uns zu %1 übersetzen</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Help us translate %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation>No account configured</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Ayúdanos a traducir %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Contribuer aux traductions de %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation>Aucun compte de configuré</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Aiutaci a tradurre %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>%1 の翻訳に協力する</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Nos ajude a traduzir %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>Помогите нам перевести %1</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation>%s'u çevirmemize yardım et</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>AccountStatus</name>
|
||||
<message>
|
||||
<source>noAccount</source>
|
||||
<extracomment>'No account configured' : Status text when there is no configured account.</extracomment>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ActivateAppSipAccountWithEmail</name>
|
||||
<message>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ AccountSettingsModel::AccountSettingsModel (QObject *parent) : QObject(parent) {
|
|||
QObject::connect(this, &AccountSettingsModel::accountSettingsUpdated, this, &AccountSettingsModel::primaryUsernameChanged);
|
||||
QObject::connect(this, &AccountSettingsModel::accountSettingsUpdated, this, &AccountSettingsModel::primarySipAddressChanged);
|
||||
QObject::connect(this, &AccountSettingsModel::accountSettingsUpdated, this, &AccountSettingsModel::accountsChanged);
|
||||
mSelectedAccount = coreManager->getCore()->getDefaultAccount();
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ Item {
|
|||
signal clicked
|
||||
property alias cursorShape:mouseArea.cursorShape
|
||||
property alias betterIcon : presenceLevel.betterIcon
|
||||
property bool noAccountConfigured: AccountSettingsModel.accounts.length <= ((SettingsModel.showLocalSipAccount ? 1 : 0))
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
MouseArea {
|
||||
|
|
@ -42,7 +43,7 @@ Item {
|
|||
Layout.bottomMargin: AccountStatusStyle.presenceLevel.bottomMargin
|
||||
Layout.preferredHeight: AccountStatusStyle.presenceLevel.size
|
||||
Layout.preferredWidth: AccountStatusStyle.presenceLevel.size
|
||||
|
||||
visible: !accountStatus.noAccountConfigured
|
||||
PresenceLevel {
|
||||
id:presenceLevel
|
||||
anchors.fill:parent
|
||||
|
|
@ -68,20 +69,24 @@ Item {
|
|||
|
||||
Text {
|
||||
id:username
|
||||
Layout.alignment: Qt.AlignBottom | Qt.AlignLeft
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: accountStatus.noAccountConfigured ? Qt.AlignVCenter | Qt.AlignLeft: Qt.AlignBottom | Qt.AlignLeft
|
||||
color: AccountStatusStyle.username.colorModel.color
|
||||
elide: Text.ElideRight
|
||||
font.bold: true
|
||||
font.pointSize: AccountStatusStyle.username.pointSize
|
||||
text: UtilsCpp.encodeTextToQmlRichFormat(AccountSettingsModel.username)
|
||||
textFormat: Text.RichText
|
||||
//: 'No account configured' : Status text when there is no configured account.
|
||||
text: accountStatus.noAccountConfigured ? qsTr('noAccount'): AccountSettingsModel.username
|
||||
verticalAlignment: Text.AlignBottom
|
||||
wrapMode: Text.WordWrap
|
||||
maximumLineCount: 3
|
||||
}
|
||||
Item {
|
||||
Layout.alignment: Qt.AlignBottom | Qt.AlignLeft
|
||||
Layout.bottomMargin: 5
|
||||
Layout.preferredHeight: AccountStatusStyle.presenceLevel.size
|
||||
Layout.preferredWidth: AccountStatusStyle.presenceLevel.size
|
||||
visible: !accountStatus.noAccountConfigured
|
||||
MessageCounter {
|
||||
id: messageCounter
|
||||
anchors.fill: parent
|
||||
|
|
@ -101,6 +106,7 @@ Item {
|
|||
Text {
|
||||
Layout.preferredHeight:parent.height / 2
|
||||
Layout.preferredWidth:parent.width
|
||||
visible: !accountStatus.noAccountConfigured
|
||||
color: AccountStatusStyle.sipAddress.colorModel.color
|
||||
elide: Text.ElideRight
|
||||
font.pointSize: AccountStatusStyle.sipAddress.pointSize
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@ ApplicationWindow {
|
|||
anchors.fill: parent
|
||||
|
||||
source: 'Home.qml'
|
||||
Component.onCompleted: if (AccountSettingsModel.accounts.length < 2) source= 'Assistant.qml' // default proxy = 1. Do not use this set diretly in source because of bindings that will override next setSource
|
||||
Component.onCompleted: if(accountStatus.noAccountConfigured) source= 'Assistant.qml' // default proxy = 1. Do not use this set diretly in source because of bindings that will override next setSource
|
||||
}
|
||||
TelKeypad {
|
||||
anchors.right: parent.right
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ TabContainer {
|
|||
width: parent.width
|
||||
|
||||
FormLine {
|
||||
visible: SettingsModel.showLocalSipAccount
|
||||
FormGroup {
|
||||
label: qsTr('defaultDisplayNameLabel')
|
||||
|
||||
|
|
@ -36,6 +37,7 @@ TabContainer {
|
|||
}
|
||||
|
||||
FormLine {
|
||||
visible: SettingsModel.showLocalSipAccount
|
||||
FormGroup {
|
||||
label: qsTr('defaultUsernameLabel')
|
||||
|
||||
|
|
@ -48,6 +50,7 @@ TabContainer {
|
|||
}
|
||||
|
||||
FormLine {
|
||||
visible: SettingsModel.showLocalSipAccount
|
||||
FormGroup {
|
||||
label: qsTr('defaultSipAddressLabel')
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue