Adjust shown event time when displayTimeShift is set.

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

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index 5b18da639620a0473d7a5cc48940b5f4476eb049..82b34438156d8d869e4842228bd819f10dfc3531 100644 (file)
--- a/src/gui/daynavigatorwidget.cpp
+++ b/src/gui/daynavigatorwidget.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -21,6 +21,8 @@
 
 #include <QPainter>
 #include <QLabel>
+#include <conference.h>
+#include <application.h>
 
 
 DayNavigatorWidget::DayNavigatorWidget(QWidget *aParent): QWidget(aParent) {
@@ -107,8 +109,22 @@ void DayNavigatorWidget::nextDayButtonClicked() {
 
 void DayNavigatorWidget::paintEvent(QPaintEvent *aEvent) {
     Q_UNUSED(aEvent);
-
-    QString selectedDateStr = mCurDate.isValid() ? mCurDate.toString("dddd\nyyyy-MM-dd") : tr("No date");
+    QString selectedDateStr;
+    if (mCurDate.isValid()) {
+        selectedDateStr = mCurDate.toString("dddd\nyyyy-MM-dd");
+        bool hasConference = ((Application*) qApp)->hasActiveConference();
+        if (hasConference) {
+            Conference& conference = ((Application*) qApp)->activeConference();
+            if (conference.hasDisplayTimeShift() && conference.displayTimeShift() != 0) {
+                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") + ")";
+            }
+        }
+    } else {
+        selectedDateStr = tr("No date");
+    }
     QPainter painter(this);
     painter.save();
 
@@ -121,7 +137,12 @@ void DayNavigatorWidget::paintEvent(QPaintEvent *aEvent) {
 #ifdef MAEMO
     qreal factor = 0.8;
 #else
-    qreal factor = (qreal) 2 * q.width() / painter.fontMetrics().width(selectedDateStr);
+#if QT_VERSION >= 0x050b00 // QT 5.11
+    auto dateStrWidth = painter.fontMetrics().horizontalAdvance(selectedDateStr);
+#else
+    auto dateStrWidth = painter.fontMetrics().width(selectedDateStr);
+#endif
+    qreal factor = (qreal) 2 * q.width() / dateStrWidth;
 #endif
     if (factor < 1) f.setPointSizeF(f.pointSizeF() * factor);
     painter.setFont(f);