diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index ebd592f5e..e80456ebd 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -1054,6 +1054,11 @@ Adresa URL není nakonfigurována. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact UŽIVATEL(Ů) + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index f77b25099..c99422cbf 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -1047,6 +1047,11 @@ Server url ikke konfigureret. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 42d8e9790..c41d5cf1b 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -1047,6 +1047,11 @@ Server URL ist nicht konfiguriert. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact BENUTZERNAME(N) + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index dbc9e3e7e..d22741f6a 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -1047,6 +1047,11 @@ Server URL not configured. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact USERNAME(S) + + displayName + 'Display Name' : placeholder for setting display name on a contact + Display Name + Contacts diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 2db10bc90..1d9aba342 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -1047,6 +1047,11 @@ URL del servidor no configurada. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 673bf6a13..59f18e52d 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -1047,6 +1047,11 @@ URL du serveur non configurée. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact Nom(s) d'utilisateur + + displayName + 'Display Name' : placeholder for setting display name on a contact + Nom d'affichage + Contacts diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index cdd9892f7..50608ea6a 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -1040,6 +1040,11 @@ A kiszolgáló URL-je nincs konfigurálva. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 5564589f1..849bb5427 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -1047,6 +1047,11 @@ URL del server non configurato. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index d8995af6d..f467207a0 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -1040,6 +1040,11 @@ 'USERNAME(S)' : label for sip accounts when only username is displayed n contact ユーザー名 + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 131e58d51..c4ed15ab0 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -1054,6 +1054,11 @@ Nesukonfigūruotas serverio url. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 165202935..1c85f7049 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -1047,6 +1047,11 @@ URL do servidor não configurado. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 4f0c1c501..6c4b75e2b 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -1054,6 +1054,11 @@ 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 41b977d2d..6fb4f39e1 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -1047,6 +1047,11 @@ Serverwebbadressen är inte konfigurerad. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index f92295c69..30e846e64 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1040,6 +1040,11 @@ Sunucu url'si yapılandırılmadı. 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 6220e0bc9..b17c9a147 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -1054,6 +1054,11 @@ 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index a9496eb2c..6eb096e8a 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -1040,6 +1040,11 @@ 'USERNAME(S)' : label for sip accounts when only username is displayed n contact + + displayName + 'Display Name' : placeholder for setting display name on a contact + + Contacts diff --git a/linphone-app/src/components/calls/CallsListModel.cpp b/linphone-app/src/components/calls/CallsListModel.cpp index 05bb92250..73cde0908 100644 --- a/linphone-app/src/components/calls/CallsListModel.cpp +++ b/linphone-app/src/components/calls/CallsListModel.cpp @@ -268,7 +268,6 @@ bool CallsListModel::createSecureChat (const QString& subject, const QString &pa qInfo() << "Create secure ChatRoom: " << subject << ", from " << QString::fromStdString(localAddress->asString()) << " and with " < chatRoom = core->createChatRoom(params, localAddress, participants); - if(chatRoom) { int ephemeralTime = CoreManager::getInstance()->getSettingsModel()->getCreateEphemeralChatRooms(); if( ephemeralTime>0){ diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index c5d619683..9e9bc02a7 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -1144,6 +1144,17 @@ void SettingsModel::setContactsEnabled (bool status) { int SettingsModel::getIncomingCallTimeout() const { return CoreManager::getInstance()->getCore()->getIncTimeout(); } + +int SettingsModel::getCreateEphemeralChatRooms() const{ + return mConfig->getInt(UiSection, "create_ephemeral_chat_rooms", 0); +} + +void SettingsModel::setCreateEphemeralChatRooms(int seconds) { + if(!isReadOnly(UiSection, "create_ephemeral_chat_rooms")) + mConfig->setInt(UiSection, "create_ephemeral_chat_rooms", seconds); + emit createEphemeralsChatRoomsChanged(); +} + // ============================================================================= // Network. // ============================================================================= diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index 2b13f3039..e26bb5f47 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -501,6 +501,9 @@ public: int getIncomingCallTimeout() const; + int getCreateEphemeralChatRooms() const; + void setCreateEphemeralChatRooms(int seconds);// <=0 deactivate + // Network. ------------------------------------------------------------------ bool getShowNetworkSettings () const; @@ -594,7 +597,7 @@ public: void setDownloadFolder (const QString &folder); QString getRemoteProvisioningRootUrl() const; - QString getRemoteProvisioning () const; + Q_INVOKABLE QString getRemoteProvisioning () const; void setRemoteProvisioning (const QString &remoteProvisioning); Q_INVOKABLE bool isQRCodeAvailable() const; @@ -804,6 +807,8 @@ signals: void contactsEnabledChanged (bool status); + void createEphemeralsChatRoomsChanged(); + // Network. ------------------------------------------------------------------ void showNetworkSettingsChanged (bool status); diff --git a/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml b/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml index f9f9903c8..8af7f8bf5 100644 --- a/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml +++ b/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml @@ -40,7 +40,7 @@ Item { 'transparent' height: parent.height width: { - var width = textInput.contentWidth + parent.padding * 2 + var width = Math.max(textInput.contentWidth, placeholder.contentWidth) + parent.padding * 2 return width < parent.width ? width : parent.width } diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml index cd2fa8fb4..a372d8bc3 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.qml +++ b/linphone-app/ui/views/App/Main/ContactEdit.qml @@ -133,6 +133,8 @@ ColumnLayout { forceFocus: true readOnly: !_edition text: avatar.username + //: 'Display Name' : placeholder for setting display name on a contact + placeholder: qsTr('displayName') font.family: SettingsModel.textMessageFont.family onEditingFinished: Logic.setUsername(text)