mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
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>
This commit is contained in:
parent
0dd40b7a51
commit
14cc59898a
4 changed files with 9 additions and 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__
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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));
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue