From 5fdca37db51ea8b98123995ec75b0fb6211a3761 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 26 Nov 2014 18:52:44 +0100
Subject: [PATCH] Focus fix in Locale page.

---
 src/modules/locale/LocalePage.cpp     | 7 +++++++
 src/modules/locale/LocalePage.h       | 2 ++
 src/modules/locale/LocaleViewStep.cpp | 7 +++++++
 src/modules/locale/LocaleViewStep.h   | 1 +
 4 files changed, 17 insertions(+)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 1dae702ca..170ddc5ff 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -290,6 +290,13 @@ LocalePage::lcLocale()
 }
 
 
+void
+LocalePage::onActivate()
+{
+    m_regionCombo->setFocus();
+}
+
+
 QString
 LocalePage::guessLCLocale()
 {
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index 3691f791f..a53a6ceec 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -45,6 +45,8 @@ public:
 
     QString lcLocale();
 
+    void onActivate();
+
 private:
     QString guessLCLocale();
     QString prettyLCLocale( const QString& lcLocale );
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 60fd5b4cb..4422fb53f 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -134,6 +134,13 @@ LocaleViewStep::jobs() const
 }
 
 
+void
+LocaleViewStep::onActivate()
+{
+    m_actualWidget->onActivate();
+}
+
+
 void
 LocaleViewStep::onLeave()
 {
diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h
index da3ba4402..74802360f 100644
--- a/src/modules/locale/LocaleViewStep.h
+++ b/src/modules/locale/LocaleViewStep.h
@@ -54,6 +54,7 @@ public:
 
     QList< Calamares::job_ptr > jobs() const override;
 
+    void onActivate() override;
     void onLeave() override;
 
     void setConfigurationMap( const QVariantMap& configurationMap ) override;