Use only one line for day and date display (except MAEMO).

[toast/confclerk.git] / src / gui / daynavigatorwidget.cpp

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index dcda38f327f7c8284133682d2fa3acd68a2d6932..b35f915f159c3abb298fcbfd6276a77f6315962b 100644 (file)
--- 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()) {
     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();
         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));
                 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 {
             }
         }
     } else {