From 3254de196a93c8fe0ffca59ffba624c030bc6cad Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Wed, 18 Aug 2021 19:32:56 +0200 Subject: [PATCH] Use only one line for day and date display (except MAEMO). --- src/gui/daynavigatorwidget.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp index dcda38f..b35f915 100644 --- a/src/gui/daynavigatorwidget.cpp +++ b/src/gui/daynavigatorwidget.cpp @@ -112,7 +112,13 @@ void DayNavigatorWidget::paintEvent(QPaintEvent *aEvent) { Q_UNUSED(aEvent); QString selectedDateStr; if (mCurDate.isValid()) { - selectedDateStr = mCurDate.toString("dddd\nyyyy-MM-dd"); + QString selectedDateFormat = +#ifdef MAEMO + "dddd\nyyyy-MM-dd"; +#else + "dddd • yyyy-MM-dd"; +#endif + selectedDateStr = mCurDate.toString(selectedDateFormat); bool hasConference = ((Application*) qApp)->hasActiveConference(); if (hasConference) { Conference& conference = ((Application*) qApp)->activeConference(); @@ -120,7 +126,7 @@ void DayNavigatorWidget::paintEvent(QPaintEvent *aEvent) { QTime shift(0, 0); bool minus = conference.displayTimeShift() < 0; shift = shift.addSecs(conference.displayTimeShift() * 60 * (minus ? -1 : 1)); - selectedDateStr += " (" + (minus ? QString("-") : "+") + shift.toString("HH:mm") + ")"; + selectedDateStr += " • " + (minus ? QString("-") : "+") + shift.toString("HH:mm"); } } } else { -- 2.39.5