mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-03 22:56:49 +00:00
Fix forced timeline selection (eg. showing chat when already selected for contact)
Fix contact edit update Fix source language (en) on bad auto-comment (.ts generated get unwanted '-----')
This commit is contained in:
parent
8cb167978e
commit
d7aaea5022
4 changed files with 6 additions and 3 deletions
|
|
@ -302,7 +302,7 @@ bool VcardModel::addSipAddress (const QString &sipAddress) {
|
|||
return false;
|
||||
}
|
||||
|
||||
qInfo() << QStringLiteral("Add new sip address on vcard: `%1`.").arg(sipAddress);
|
||||
qInfo() << QStringLiteral("Add new sip address on vcard: `%1` from `%2`.").arg(QString::fromStdString(interpretedSipAddress)).arg(sipAddress);
|
||||
|
||||
emit vcardUpdated();
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,10 @@ void TimelineModel::setSelected(const bool& selected){
|
|||
mChatRoomModel->initEntries();
|
||||
}
|
||||
emit selectedChanged(mSelected);
|
||||
}
|
||||
}else if(selected)// Warning, Setting to true is only when we want to force a selection. It's why we send a signal only in this case. We want avoid to change the counter on timelines that are already unselected.
|
||||
// This only work because we want at least only one timeline selected
|
||||
emit selectedChanged(mSelected);
|
||||
|
||||
}
|
||||
|
||||
void TimelineModel::updateUnreadCount(){
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ function handleValueChanged (fields, index, oldValue, newValue, add, update) {
|
|||
: vcard[update](oldValue, newValue)
|
||||
|
||||
fields.setInvalid(index, !soFarSoGood)
|
||||
handleVcardChanged(vcard)
|
||||
}
|
||||
|
||||
function handleSipAddressChanged () {
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ DialogPlus {
|
|||
{ text:qsTr('nHour', '', 1).arg(1), value:3600},
|
||||
//: '%1 day'
|
||||
{ text:qsTr('nDay', '', 1).arg(1), value:86400},
|
||||
//: '%1 days'
|
||||
{ text:qsTr('nDay', '', 3).arg(3), value:259200},
|
||||
//: '%1 week'
|
||||
{ text:qsTr('nWeek', '', 1).arg(1), value:604800}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue