diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index d138f06ab..466a042ae 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -515,6 +515,10 @@ Server url not configured. quitWarning Your account has been created but is not yet validated. If you quit this view, you should add manually your account and validate it within 24 hours. + + displayNameLabel + Display name (optional) + CreateLinphoneSipAccountWithPhoneNumber @@ -534,6 +538,10 @@ Server url not configured. usernameLabel Username + + displayNameLabel + Display name (optional) + DroppableTextArea @@ -982,10 +990,6 @@ to chat or see the conversation history. defaultIdentityTitle Default identity - - defaultDisplaynameLabel - Display name - defaultUsernameLabel Username @@ -1026,6 +1030,10 @@ to chat or see the conversation history. eraseAllPasswordsDescription Are you sure you want to erase all passwords? + + defaultDisplayNameLabel + Display name + SettingsSipAccountsEdit diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index fe8ec7d80..6bff1d55f 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -515,6 +515,10 @@ Url du serveur non configurée. quitWarning Votre compte a été crée mais il n'a pas été validé. Si vous quittez cette vue, vous devrez ajouter manuellement votre compte et le valider dans les 24 heures. + + displayNameLabel + Nom d'affichage (optionnel) + CreateLinphoneSipAccountWithPhoneNumber @@ -534,6 +538,10 @@ Url du serveur non configurée. usernameLabel Nom d'utilisateur + + displayNameLabel + Nom d'affichage (optionnel) + DroppableTextArea @@ -981,10 +989,6 @@ chatter ou voir l'historique de conversation. defaultIdentityTitle Identité par défaut - - defaultDisplaynameLabel - Nom d'affichage - defaultUsernameLabel Nom d'utilisateur @@ -1025,6 +1029,10 @@ chatter ou voir l'historique de conversation. eraseAllPasswordsDescription Êtes-vous sûr de vouloir supprimer tous vos mots de passe ? + + defaultDisplayNameLabel + Nom d'affichage + SettingsSipAccountsEdit diff --git a/linphone-desktop/src/components/assistant/AssistantModel.cpp b/linphone-desktop/src/components/assistant/AssistantModel.cpp index 3b2282bd5..90d9c986f 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.cpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.cpp @@ -207,6 +207,8 @@ void AssistantModel::setEmail (const QString &email) { emit emailChanged(email, error); } +// ----------------------------------------------------------------------------- + QString AssistantModel::getPassword () const { return ::Utils::linphoneStringToQString(mAccountCreator->getPassword()); } @@ -237,6 +239,8 @@ void AssistantModel::setPassword (const QString &password) { emit passwordChanged(password, error); } +// ----------------------------------------------------------------------------- + QString AssistantModel::getPhoneNumber () const { return ::Utils::linphoneStringToQString(mAccountCreator->getPhoneNumber()); } @@ -250,15 +254,43 @@ void AssistantModel::setPhoneNumber (const QString &phoneNumber) { emit phoneNumberChanged(phoneNumber, error); } +// ----------------------------------------------------------------------------- + QString AssistantModel::getUsername () const { return ::Utils::linphoneStringToQString(mAccountCreator->getUsername()); } void AssistantModel::setUsername (const QString &username) { + emit usernameChanged( + username, + mapAccountCreatorUsernameStatusToString( + mAccountCreator->setUsername(::Utils::qStringToLinphoneString(username)) + ) + ); +} + +// ----------------------------------------------------------------------------- + +QString AssistantModel::getDisplayName () const { + return ::Utils::linphoneStringToQString(mAccountCreator->getDisplayName()); +} + +void AssistantModel::setDisplayName (const QString &displayName) { + emit displayNameChanged( + displayName, + mapAccountCreatorUsernameStatusToString( + mAccountCreator->setDisplayName(::Utils::qStringToLinphoneString(displayName)) + ) + ); +} + +// ----------------------------------------------------------------------------- + +QString AssistantModel::mapAccountCreatorUsernameStatusToString (linphone::AccountCreatorUsernameStatus status) const { shared_ptr config = CoreManager::getInstance()->getCore()->getConfig(); QString error; - switch (mAccountCreator->setUsername(::Utils::qStringToLinphoneString(username))) { + switch (status) { case linphone::AccountCreatorUsernameStatusOk: break; case linphone::AccountCreatorUsernameStatusTooShort: @@ -276,5 +308,5 @@ void AssistantModel::setUsername (const QString &username) { break; } - emit usernameChanged(username, error); + return error; } diff --git a/linphone-desktop/src/components/assistant/AssistantModel.hpp b/linphone-desktop/src/components/assistant/AssistantModel.hpp index d71a0a31a..9cc1188ba 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.hpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.hpp @@ -37,6 +37,7 @@ class AssistantModel : public QObject { Q_PROPERTY(QString password READ getPassword WRITE setPassword NOTIFY passwordChanged); Q_PROPERTY(QString phoneNumber READ getPhoneNumber WRITE setPhoneNumber NOTIFY phoneNumberChanged); Q_PROPERTY(QString username READ getUsername WRITE setUsername NOTIFY usernameChanged); + Q_PROPERTY(QString displayName READ getDisplayName WRITE setDisplayName NOTIFY displayNameChanged); public: AssistantModel (QObject *parent = Q_NULLPTR); @@ -52,6 +53,7 @@ signals: void passwordChanged (const QString &password, const QString &error); void phoneNumberChanged (const QString &phoneNumber, const QString &error); void usernameChanged (const QString &username, const QString &error); + void displayNameChanged (const QString &displayName, const QString &error); void activateStatusChanged (const QString &error); void createStatusChanged (const QString &error); @@ -70,6 +72,11 @@ private: QString getUsername () const; void setUsername (const QString &username); + QString getDisplayName () const; + void setDisplayName (const QString &displayName); + + QString mapAccountCreatorUsernameStatusToString (linphone::AccountCreatorUsernameStatus status) const; + std::shared_ptr mAccountCreator; std::shared_ptr mHandlers; }; diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp index 993246dc0..cbfc40079 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp @@ -246,11 +246,11 @@ QString AccountSettingsModel::getPrimaryDisplayname () const { ); } -void AccountSettingsModel::setPrimaryDisplayname (const QString &displayname) { +void AccountSettingsModel::setPrimaryDisplayname (const QString &displayName) { shared_ptr core = CoreManager::getInstance()->getCore(); shared_ptr primary = core->getPrimaryContactParsed(); - primary->setDisplayName(::Utils::qStringToLinphoneString(displayname)); + primary->setDisplayName(::Utils::qStringToLinphoneString(displayName)); core->setPrimaryContact(primary->asString()); emit accountSettingsUpdated(); diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp index df5f24d5d..31f718499 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp @@ -91,7 +91,7 @@ private: void setPrimaryUsername (const QString &username); QString getPrimaryDisplayname () const; - void setPrimaryDisplayname (const QString &displayname); + void setPrimaryDisplayname (const QString &displayName); QString getPrimarySipAddress () const; diff --git a/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml index 50ae06832..defaea67f 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithEmail.qml @@ -45,6 +45,14 @@ AssistantAbstractView { onTextChanged: assistantModel.username = text } } + + FormGroup { + label: qsTr('displayNameLabel') + + TextField { + onTextChanged: assistantModel.displayName = text + } + } } FormLine { diff --git a/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml index 2fde8f524..4253f4d2a 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/CreateLinphoneSipAccountWithPhoneNumber.qml @@ -49,6 +49,16 @@ AssistantAbstractView { } } } + + FormLine { + FormGroup { + label: qsTr('displayNameLabel') + + TextField { + onTextChanged: assistantModel.displayName = text + } + } + } } // --------------------------------------------------------------------------- diff --git a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml index da03c3f95..6d957880b 100644 --- a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml +++ b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml @@ -25,12 +25,12 @@ TabContainer { FormLine { FormGroup { - label: qsTr('defaultDisplaynameLabel') + label: qsTr('defaultDisplayNameLabel') TextField { - text: AccountSettingsModel.primaryDisplayname + text: AccountSettingsModel.primarydisplayName - onEditingFinished: AccountSettingsModel.primaryDisplayname = text + onEditingFinished: AccountSettingsModel.primarydisplayName = text } } }