From 14c079d1d6d8eab45a6476c43f740bf5aac72d59 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:53:59 +0100
Subject: [PATCH] [keyboard] Replace own copy of status by the one from Config

---
 src/modules/keyboard/KeyboardPage.cpp     | 17 -----------------
 src/modules/keyboard/KeyboardPage.h       |  2 --
 src/modules/keyboard/KeyboardViewStep.cpp |  3 +--
 src/modules/keyboard/KeyboardViewStep.h   |  1 -
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index f97e3ac52..25cd7a366 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -92,23 +92,6 @@ KeyboardPage::~KeyboardPage()
     delete ui;
 }
 
-
-
-
-QString
-KeyboardPage::prettyStatus() const
-{
-    QString status;
-    status += tr( "Set keyboard model to %1.<br/>" ).arg( ui->comboBoxModel->currentText() );
-
-    QString layout = ui->listLayout->currentIndex().data().toString();
-    QString variant = ui->listVariant->currentItem() ? ui->listVariant->currentItem()->text() : QString( "<default>" );
-    status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant );
-
-    return status;
-}
-
-
 QList< Calamares::job_ptr >
 KeyboardPage::createJobs( const QString& xOrgConfFileName,
                           const QString& convertedKeymapPath,
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 4e85ae8b7..6c2f99b68 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -36,8 +36,6 @@ public:
     explicit KeyboardPage( QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-    QString prettyStatus() const;
-
     Calamares::JobList
     createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
 
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 0ba20dd87..5cb168dc5 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -48,7 +48,7 @@ KeyboardViewStep::prettyName() const
 QString
 KeyboardViewStep::prettyStatus() const
 {
-    return m_prettyStatus;
+    return m_config->prettyStatus();
 }
 
 
@@ -105,7 +105,6 @@ void
 KeyboardViewStep::onLeave()
 {
     m_widget->finalize();
-    m_prettyStatus = m_widget->prettyStatus();
 }
 
 
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index 5cf2c6fd9..31769d192 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -50,7 +50,6 @@ private:
     Config* m_config;
     KeyboardPage* m_widget;
     bool m_nextEnabled;
-    QString m_prettyStatus;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )