X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/5b7fa79bd7a4f4b468a82947cc1659e866084c73..080dc7d603d45ba0662aa731418993ddd45b5fe8:/src/gui/daynavigatorwidget.cpp

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index 82b3443..1b61efd 100644
--- a/src/gui/daynavigatorwidget.cpp
+++ b/src/gui/daynavigatorwidget.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -17,12 +17,13 @@
  * You should have received a copy of the GNU General Public License along with
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "daynavigatorwidget.h"
 
 #include <QPainter>
 #include <QLabel>
-#include <conference.h>
-#include <application.h>
+
+#include "daynavigatorwidget.h"
+#include "conference.h"
+#include "application.h"
 
 
 DayNavigatorWidget::DayNavigatorWidget(QWidget *aParent): QWidget(aParent) {
@@ -82,6 +83,14 @@ void DayNavigatorWidget::unsetDates() {
     this->update();
 }
 
+QSize DayNavigatorWidget::minimumSizeHint() const {
+#ifdef MAEMO
+    return QSize(20, 0);
+#else
+    return QSize(fontMetrics().lineSpacing() * 3 / 2, 0);
+#endif
+}
+
 
 void DayNavigatorWidget::configureNavigation() {
     prevDayButton->setDisabled(!mStartDate.isValid() || mCurDate == mStartDate);
@@ -111,7 +120,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();
@@ -119,7 +134,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 {