mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-27 19:06:22 +00:00
Replace old flexiapi url by url from assistant rc.
Use presence model last activity API for timestamp. Fix account display name size.
This commit is contained in:
parent
b3900c9105
commit
03b9e0c03c
5 changed files with 32 additions and 24 deletions
|
|
@ -45,4 +45,8 @@
|
||||||
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
|
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
|
||||||
<entry name="xmlrpc_url" overwrite="true">https://subscribe.linphone.org:444/wizard.php</entry>
|
<entry name="xmlrpc_url" overwrite="true">https://subscribe.linphone.org:444/wizard.php</entry>
|
||||||
</section>
|
</section>
|
||||||
|
<section name="account_creator">
|
||||||
|
<entry name="backend" overwrite="true">1</entry>
|
||||||
|
<entry name="url" overwrite="true">https://subscribe.linphone.org/api/</entry>
|
||||||
|
</section>
|
||||||
</config>
|
</config>
|
||||||
|
|
|
||||||
|
|
@ -45,4 +45,8 @@
|
||||||
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
|
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
|
||||||
<entry name="xmlrpc_url" overwrite="true">https://subscribe.linphone.org:444/wizard.php</entry>
|
<entry name="xmlrpc_url" overwrite="true">https://subscribe.linphone.org:444/wizard.php</entry>
|
||||||
</section>
|
</section>
|
||||||
|
<section name="account_creator">
|
||||||
|
<entry name="backend" overwrite="true">1</entry>
|
||||||
|
<entry name="url" overwrite="true">https://subscribe.linphone.org/api/</entry>
|
||||||
|
</section>
|
||||||
</config>
|
</config>
|
||||||
|
|
|
||||||
|
|
@ -512,42 +512,41 @@
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>Chat</name>
|
<name>Chat</name>
|
||||||
<message>
|
|
||||||
<source>newMessagePlaceholder</source>
|
|
||||||
<translation>Zadejte zprávu</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>noFileTransferUrl</source>
|
|
||||||
<translation>Soubor nelze odeslat .
|
|
||||||
Adresa URL serveru není nakonfigurována.</translation>
|
|
||||||
</message>
|
|
||||||
<message numerus="yes">
|
|
||||||
<source>chatTyping</source>
|
|
||||||
<extracomment>'%1 is typing...' indicate that someone is composing in chat</extracomment>
|
|
||||||
<translation>
|
|
||||||
<numerusform>%1 píše…</numerusform>
|
|
||||||
<numerusform>%1 píší…</numerusform>
|
|
||||||
<numerusform>%1 píše…</numerusform>
|
|
||||||
</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
<message>
|
||||||
<source>allTextCopied</source>
|
<source>allTextCopied</source>
|
||||||
<extracomment>"Copied to clipboard" : when a user copy a text from the menu, this message show up.</extracomment>
|
<extracomment>"Copied to clipboard" : when a user copy a text from the menu, this message show up.</extracomment>
|
||||||
<translation>Zkopírováno do schránky</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>selectedTextCopied</source>
|
<source>selectedTextCopied</source>
|
||||||
<extracomment>"Selection copied to clipboard" : when a user copy a text from the menu, this message show up.</extracomment>
|
<extracomment>"Selection copied to clipboard" : when a user copy a text from the menu, this message show up.</extracomment>
|
||||||
<translation>Výběr zkopírován do schránky</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>forwardDialogTitle</source>
|
<source>forwardDialogTitle</source>
|
||||||
<extracomment>'Choose where to forward the message' : Dialog title for choosing where to forward the current message.</extracomment>
|
<extracomment>'Choose where to forward the message' : Dialog title for choosing where to forward the current message.</extracomment>
|
||||||
<translation>Zvolte, kam chcete zprávu přeposlat</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>conferencesCopiedICS</source>
|
<source>conferencesCopiedICS</source>
|
||||||
<translation>Pozvánka byla zkopírována</translation>
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message numerus="yes">
|
||||||
|
<source>chatTyping</source>
|
||||||
|
<extracomment>'%1 is typing...' indicate that someone is composing in chat</extracomment>
|
||||||
|
<translation type="unfinished">
|
||||||
|
<numerusform></numerusform>
|
||||||
|
<numerusform></numerusform>
|
||||||
|
<numerusform></numerusform>
|
||||||
|
</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>noFileTransferUrl</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>newMessagePlaceholder</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
|
|
||||||
|
|
@ -212,7 +212,7 @@ Presence::PresenceStatus ContactModel::getPresenceStatus () const {
|
||||||
|
|
||||||
QDateTime ContactModel::getPresenceTimestamp() const{
|
QDateTime ContactModel::getPresenceTimestamp() const{
|
||||||
if(mLinphoneFriend->getPresenceModel()){
|
if(mLinphoneFriend->getPresenceModel()){
|
||||||
time_t timestamp = mLinphoneFriend->getPresenceModel()->getTimestamp();
|
time_t timestamp = mLinphoneFriend->getPresenceModel()->getLatestActivityTimestamp();
|
||||||
if(timestamp == -1)
|
if(timestamp == -1)
|
||||||
return QDateTime();
|
return QDateTime();
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,8 @@ Item {
|
||||||
Text {
|
Text {
|
||||||
id:username
|
id:username
|
||||||
Layout.fillWidth: true
|
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
|
color: AccountStatusStyle.username.colorModel.color
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
font.bold: true
|
font.bold: true
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue