applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[keyboard] Replace own copy of status by the one from Config

Browse source
This commit is contained in:
Adriaan de Groot 2020-10-27 15:53:59 +01:00
parent acb5190217
commit 14c079d1d6
4 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/keyboard/KeyboardPage.cpp
View file

@ -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,

2
src/modules/keyboard/KeyboardPage.h
View file

@ -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 );

3
src/modules/keyboard/KeyboardViewStep.cpp
View file

@ -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();
}

1
src/modules/keyboard/KeyboardViewStep.h
View file

@ -50,7 +50,6 @@ private:
Config* m_config;
KeyboardPage* m_widget;
bool m_nextEnabled;
QString m_prettyStatus;
};
CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )