summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-04 05:58:47 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-04 05:59:17 +0200
commit818f02ec4a5045328363056ebdfa6c681c9a1d58 (patch)
tree0d62a911fa82f55509923d71a6243764917a9d2a
parentfb84b1185428dd8557bba915c6a018657b92ad2f (diff)
downloadsubsurface-818f02ec4a5045328363056ebdfa6c681c9a1d58.tar.gz
Desktop: fix time format in main tab
Fixes #1234 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--CHANGELOG.md1
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29f348f06..034f51e07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Desktop: fix time format in main tab [#1234]
- Mobile: recalculate derived values after dive edit
- Mobile: fold dive trips to give better overview for large dive lists
- Mobile: fix using current GPS position when editing or adding dives
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 4f80454e8..93ed8b1ac 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -61,6 +61,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info"));
ui.dateEdit->setDisplayFormat(prefs.date_format);
+ ui.timeEdit->setDisplayFormat(prefs.time_format);
memset(&displayed_dive, 0, sizeof(displayed_dive));
memset(&displayedTrip, 0, sizeof(displayedTrip));