From 007650cf2cdd6b64859c0d16c5094b27afbdbfa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Fri, 31 Mar 2017 16:48:49 +0800 Subject: [PATCH] show 24 hour format on tips Change-Id: Id9beed7e99fd281c1989091ca7ec075ab0bf4598 --- plugins/datetime/datetimeplugin.cpp | 5 ++++- plugins/datetime/datetimewidget.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 28405ea14..2d5bf56a7 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -113,7 +113,10 @@ void DatetimePlugin::updateCurrentTimeString() { const QDateTime currentDateTime = QDateTime::currentDateTime(); - m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss")); + if (m_centralWidget->is24HourFormat()) + m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss")); + else + m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" hh:mm:ss A")); const QString currentString = currentDateTime.toString("mm"); diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index 77309ad78..64817bfa0 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -52,8 +52,10 @@ void DatetimeWidget::paintEvent(QPaintEvent *e) if (displayMode == Dock::Efficient) { + const QString text = current.toString(m_24HourFormat ? "hh:mm" : "hh:mm A"); + painter.setPen(Qt::white); - painter.drawText(rect(), Qt::AlignCenter, current.toString(m_24HourFormat ? "hh:mm" : "hh:mm A")); + painter.drawText(rect(), Qt::AlignCenter, text.left(5)); return; }