From 72d4e25ff5f31ee678d3210a25eba69b6509f443 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Mon, 12 Sep 2011 12:51:13 +0300
Subject: [PATCH] [qt] Added default metric/imperial setting from the system

---
 platform/settings.hpp     |  2 +-
 qt/preferences_dialog.cpp |  9 ++++++++-
 qt/search_panel.cpp       | 10 +++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/platform/settings.hpp b/platform/settings.hpp
index e3471633cb..969a12db67 100644
--- a/platform/settings.hpp
+++ b/platform/settings.hpp
@@ -40,4 +40,4 @@ namespace Settings
   }
 
   enum Units { Metric, Yard, Foot };
-};
+}
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 86412f5c57..e5bb937396 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -69,7 +69,14 @@ namespace qt
       radioBox->setLayout(pLayout);
 
       Units u;
-      if (!Settings::Get("Units", u)) u = Metric;
+      if (!Settings::Get("Units", u))
+      {
+        // set default measurement from system locale
+        if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
+          u = Metric;
+        else
+          u = Foot;
+      }
       m_pUnits->button(static_cast<int>(u))->setChecked(true);
 
       connect(m_pUnits, SIGNAL(buttonClicked(int)), this, SLOT(OnUnitsChanged(int)));
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 773098d8e2..cc13520da0 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -105,7 +105,15 @@ namespace
   {
     using namespace Settings;
     Units u;
-    if (!Settings::Get("Units", u)) u = Metric;
+    if (!Settings::Get("Units", u))
+    {
+      // set default measurement from system locale
+      if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
+        u = Metric;
+      else
+        u = Foot;
+      Settings::Set("Units", u);
+    }
 
     switch (u)
     {