measurement system initialization in Qt.

This commit is contained in:
rachytski 2011-10-06 18:29:04 +03:00 committed by Alex Zolotarev
parent 74ad0f5ac3
commit 81cc6212c4
2 changed files with 20 additions and 1 deletions

View file

@ -78,7 +78,10 @@ Ruler::Ruler(Params const & p)
: base_t(p), m_boundRects(1)
{
Settings::Units units;
Settings::Get("Units", units);
units = Settings::Metric;
VERIFY(Settings::Get("Units", units), ());
switch (units)
{
case Settings::Foot:

View file

@ -14,6 +14,7 @@
#include "../std/cstdio.hpp"
#include <QtGui/QApplication>
#include <QtCore/QLocale>
//#ifdef OMIM_OS_WINDOWS
// #include <../src/gui/image/qimageiohandler.h>
@ -85,6 +86,21 @@ int main(int argc, char *argv[])
(void)GetPlatform();
// checking default measurement system.
Settings::Units u;
if (!Settings::Get("Units", u))
{
// set default measurement from system locale
if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
u = Settings::Metric;
else
u = Settings::Foot;
}
Settings::Set("Units", u);
// display EULA if needed
bool eulaAccepted = false;
if (!Settings::Get(SETTING_EULA_ACCEPTED, eulaAccepted) || !eulaAccepted)