diff options
| author |  Sergey Starosek <sergey.starosek@gmail.com> | 2014-07-16 20:35:22 +0400 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-07-16 13:58:06 -0700 |
| commit | 14cc59898a9b6405ba239919137a5c57e7e6e0d0 (patch) | |
| tree | df935a4514ef1f6bb1c434d6625207a51c87f1e7 | |
| parent | 0dd40b7a514a2ea02c2f4160a74b23c0fb9a41dd (diff) | |
| download | subsurface-14cc59898a9b6405ba239919137a5c57e7e6e0d0.tar.gz | |
Date picker l10n for profile and planner
- set application-wide locale from preferences
- use custom date format for display
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | helpers.h | 1 | ||||
| -rw-r--r-- | qt-gui.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/diveplanner.cpp | 1 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 1 |
4 files changed, 9 insertions, 0 deletions
@@ -34,6 +34,7 @@ QString get_short_dive_date_string(timestamp_t when); QString get_trip_date_string(timestamp_t when, int nr); QString uiLanguage(QLocale *callerLoc); QLocale getLocale(); +QString getDateFormat(); void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsed); #if defined __APPLE__ diff --git a/qt-gui.cpp b/qt-gui.cpp index 4dc21e88f..68f65e76a 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -108,6 +108,11 @@ QLocale getLocale() return loc; } +QString getDateFormat() +{ + return dateFormat; +} + void init_ui(void) { // tell Qt to use system proxies @@ -135,6 +140,7 @@ void init_ui(void) QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath()); QLocale loc; QString uiLang = uiLanguage(&loc); + QLocale::setDefault(loc); // we don't have translations for English - if we don't check for this // Qt will proceed to load the second language in preference order - not what we want diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 7c69c7d6b..9efe80ee1 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -252,6 +252,7 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { ui.setupUi(this); + ui.dateEdit->setDisplayFormat(getDateFormat()); ui.tableWidget->setTitle(tr("Dive planner points")); ui.tableWidget->setModel(DivePlannerPointsModel::instance()); DivePlannerPointsModel::instance()->setRecalc(true); diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 88ff09944..d94b37d07 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -36,6 +36,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), divePictureModel(DivePictureModel::instance()) { ui.setupUi(this); + ui.dateEdit->setDisplayFormat(getDateFormat()); memset(&displayed_dive, 0, sizeof(displayed_dive)); |