diff --git a/linphone-app/assets/assistant/create-app-sip-account.rc b/linphone-app/assets/assistant/create-app-sip-account.rc index 34384bcb2..89951bed1 100644 --- a/linphone-app/assets/assistant/create-app-sip-account.rc +++ b/linphone-app/assets/assistant/create-app-sip-account.rc @@ -45,4 +45,8 @@ ^[a-z0-9+_.\-]*$ https://subscribe.linphone.org:444/wizard.php +
+ 1 + https://subscribe.linphone.org/api/ +
diff --git a/linphone-app/assets/assistant/use-app-sip-account.rc b/linphone-app/assets/assistant/use-app-sip-account.rc index b1b3b6f09..1d0249ff0 100644 --- a/linphone-app/assets/assistant/use-app-sip-account.rc +++ b/linphone-app/assets/assistant/use-app-sip-account.rc @@ -45,4 +45,8 @@ ^[a-z0-9+_.\-]*$ https://subscribe.linphone.org:444/wizard.php +
+ 1 + https://subscribe.linphone.org/api/ +
diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index 4335b5858..dc5d4de6c 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -512,42 +512,41 @@ Chat - - newMessagePlaceholder - Zadejte zprávu - - - noFileTransferUrl - Soubor nelze odeslat . -Adresa URL serveru není nakonfigurována. - - - chatTyping - '%1 is typing...' indicate that someone is composing in chat - - %1 píše… - %1 píší… - %1 píše… - - allTextCopied "Copied to clipboard" : when a user copy a text from the menu, this message show up. - Zkopírováno do schránky + selectedTextCopied "Selection copied to clipboard" : when a user copy a text from the menu, this message show up. - Výběr zkopírován do schránky + forwardDialogTitle 'Choose where to forward the message' : Dialog title for choosing where to forward the current message. - Zvolte, kam chcete zprávu přeposlat + conferencesCopiedICS - Pozvánka byla zkopírována + + + + chatTyping + '%1 is typing...' indicate that someone is composing in chat + + + + + + + + noFileTransferUrl + + + + newMessagePlaceholder + diff --git a/linphone-app/src/components/contact/ContactModel.cpp b/linphone-app/src/components/contact/ContactModel.cpp index 3ae5208e3..a2d57827a 100644 --- a/linphone-app/src/components/contact/ContactModel.cpp +++ b/linphone-app/src/components/contact/ContactModel.cpp @@ -212,7 +212,7 @@ Presence::PresenceStatus ContactModel::getPresenceStatus () const { QDateTime ContactModel::getPresenceTimestamp() const{ if(mLinphoneFriend->getPresenceModel()){ - time_t timestamp = mLinphoneFriend->getPresenceModel()->getTimestamp(); + time_t timestamp = mLinphoneFriend->getPresenceModel()->getLatestActivityTimestamp(); if(timestamp == -1) return QDateTime(); else diff --git a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml index 78553b702..b0cbb373e 100644 --- a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml +++ b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml @@ -70,7 +70,8 @@ Item { Text { id:username Layout.fillWidth: true - Layout.alignment: !subtitle.visible ? Qt.AlignVCenter | Qt.AlignLeft: Qt.AlignBottom | Qt.AlignLeft + Layout.preferredHeight: accountStatus.noAccountConfigured ? -1 : parent.height / 2 + Layout.alignment: !subtitle.visible ? Qt.AlignVCenter | Qt.AlignLeft : Qt.AlignBottom | Qt.AlignLeft color: AccountStatusStyle.username.colorModel.color elide: Text.ElideRight font.bold: true