mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 22:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Date picker l10n for profile and planner

Browse source 
- 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:
Sergey Starosek 2014-07-16 20:35:22 +04:00 • committed by Dirk Hohndel
parent 0dd40b7a51
commit 14cc59898a
4 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
helpers.h
View file

@ -34,6 +34,7 @@ QString get_short_dive_date_string(timestamp_t when);
QString get_trip_date_string(timestamp_t when, int nr); QString get_trip_date_string(timestamp_t when, int nr);
QString uiLanguage(QLocale *callerLoc); QString uiLanguage(QLocale *callerLoc);
QLocale getLocale(); QLocale getLocale();
QString getDateFormat();
void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsed); void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsed);
#if defined __APPLE__ #if defined __APPLE__

6
qt-gui.cpp
View file

@ -108,6 +108,11 @@ QLocale getLocale()
return loc; return loc;
} }
QString getDateFormat()
{
return dateFormat;
}
void init_ui(void) void init_ui(void)
{ {
// tell Qt to use system proxies // tell Qt to use system proxies
@ -135,6 +140,7 @@ void init_ui(void)
QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath()); QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
QLocale loc; QLocale loc;
QString uiLang = uiLanguage(&loc); QString uiLang = uiLanguage(&loc);
QLocale::setDefault(loc);
// we don't have translations for English - if we don't check for this // 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 // Qt will proceed to load the second language in preference order - not what we want

1
qt-ui/diveplanner.cpp
View file

@ -252,6 +252,7 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
{ {
ui.setupUi(this); ui.setupUi(this);
ui.dateEdit->setDisplayFormat(getDateFormat());
ui.tableWidget->setTitle(tr("Dive planner points")); ui.tableWidget->setTitle(tr("Dive planner points"));
ui.tableWidget->setModel(DivePlannerPointsModel::instance()); ui.tableWidget->setModel(DivePlannerPointsModel::instance());
DivePlannerPointsModel::instance()->setRecalc(true); DivePlannerPointsModel::instance()->setRecalc(true);

1
qt-ui/maintab.cpp
View file

@ -36,6 +36,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
divePictureModel(DivePictureModel::instance()) divePictureModel(DivePictureModel::instance())
{ {
ui.setupUi(this); ui.setupUi(this);
ui.dateEdit->setDisplayFormat(getDateFormat());
memset(&displayed_dive, 0, sizeof(displayed_dive)); memset(&displayed_dive, 0, sizeof(displayed_dive));