data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call history date formatting adjustments (today, yesterday, etc ...)

Browse source
This commit is contained in:
Christophe Deschamps 2024-10-10 16:20:53 +02:00
parent 536a67652d
commit a1ff962d1d
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Linphone/tool/Utils.cpp
View file

@ -259,8 +259,13 @@ QString Utils::formatElapsedTime(int seconds, bool dotsSeparator) {
} }
QString Utils::formatDate(const QDateTime &date, bool includeTime) { QString Utils::formatDate(const QDateTime &date, bool includeTime) {
QString dateDay;
if (date.date() == QDate::currentDate()) dateDay = tr("Aujourd'hui");
else if (date.date() == QDate::currentDate().addDays(-1)) dateDay = tr("Hier");
else {
QString format = date.date().year() == QDateTime::currentDateTime().date().year() ? "dd MMMM" : "dd MMMM yyyy"; QString format = date.date().year() == QDateTime::currentDateTime().date().year() ? "dd MMMM" : "dd MMMM yyyy";
auto dateDay = tr(date.date().toString(format).toLocal8Bit().data()); auto dateDay = tr(date.date().toString(format).toLocal8Bit().data());
}
if (!includeTime) return dateDay; if (!includeTime) return dateDay;
auto time = date.time().toString("hh:mm"); auto time = date.time().toString("hh:mm");

2
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -347,7 +347,7 @@ AbstractMainPage {
} }
Text { Text {
// text: modelData.core.date // text: modelData.core.date
text: UtilsCpp.formatDateElapsedTime(modelData.core.date) text: UtilsCpp.formatDate(modelData.core.date, true)
font { font {
pixelSize: 12 * DefaultStyle.dp pixelSize: 12 * DefaultStyle.dp
weight: 300 * DefaultStyle.dp weight: 300 * DefaultStyle.dp