FEAT: Added 12-hour time option for overlay (Resolves mumble-voip#6402)

curtispolic · Nov 8, 2024 · d1f144f · d1f144f
1 parent c7d902b
commit d1f144f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/mumble/Overlay.ui b/src/mumble/Overlay.ui
@@ -160,6 +160,16 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QCheckBox" name="qcbTime24">
+                 <property name="toolTip">
+                  <string>If checked the time in the overlay will be displayed in 24-hour format.</string>
+                 </property>
+                 <property name="text">
+                  <string>Use 24-hour clock</string>
+                 </property>
+                </widget>
+               </item>
                <item>
                 <widget class="QPushButton" name="qpbFpsFont">
                  <property name="toolTip">

diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp
@@ -135,7 +135,8 @@ void OverlayConfig::refreshFpsLive() {
 
 void OverlayConfig::refreshTimeLive() {
 	if (s.os.bTime) {
-		bpTimeDemo = OverlayTextLine(QString::fromLatin1("%1").arg(QTime::currentTime().toString()), s.os.qfFps)
+		const QString timeString = QTime::currentTime().toString(QLatin1String(s.os.bTime24 ? "HH:mm:ss" : "hh:mm:ss AP"));
+		bpTimeDemo = OverlayTextLine(QString::fromLatin1("%1").arg(timeString), s.os.qfFps)
 						 .createPixmap(s.os.qcFps);
 		qgpiTimeLive->setPixmap(bpTimeDemo.scaled(bpTimeDemo.size() * fViewScale));
 		qgpiTimeLive->setOffset((-bpTimeDemo.qpBasePoint + QPoint(0, bpTimeDemo.iAscent)) * fViewScale);
@@ -255,6 +256,7 @@ void OverlayConfig::load(const Settings &r) {
 	loadCheckBox(qcbEnable, s.os.bEnable);
 	qcbShowFps->setChecked(s.os.bFps);
 	qcbShowTime->setChecked(s.os.bTime);
+	qcbTime24->setChecked(s.os.bTime24);
 	qgpFps->setEnabled(s.os.bEnable);
 
 	qcbOverlayExclusionMode->setCurrentIndex(static_cast< int >(s.os.oemOverlayExcludeMode));
@@ -423,6 +425,7 @@ void OverlayConfig::save() const {
 	s.os.bEnable = qcbEnable->isChecked();
 	s.os.bFps    = qcbShowFps->isChecked();
 	s.os.bTime   = qcbShowTime->isChecked();
+	s.os.bTime24 = qcbTime24->isChecked();
 
 	s.os.oemOverlayExcludeMode =
 		static_cast< OverlaySettings::OverlayExclusionMode >(qcbOverlayExclusionMode->currentIndex());

diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h
@@ -143,6 +143,7 @@ struct OverlaySettings {
 	bool bBox           = false;
 	bool bFps           = false;
 	bool bTime          = false;
+	bool bTime24		= false;
 
 	qreal fUserName              = 0.0f;
 	qreal fChannel               = 0.0f;