applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 20:05:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[keyboard] Move configuration to the Config object

Browse source 
- information from the configuration file -> Config object
- job creation -> Config object

Ignore keyboardq for now.
This commit is contained in:
Adriaan de Groot 2020-10-12 16:30:06 +02:00
parent 0f6602cad7
commit c7c7e6a6c1
6 changed files with 60 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/keyboard/Config.h
View file

@ -33,13 +33,14 @@ public:
void init();
Calamares::JobList
createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
Calamares::JobList createJobs();
QString prettyStatus() const;
void onActivate();
void finalize();
void setConfigurationMap( const QVariantMap& configurationMap );
private:
void guessLayout( const QStringList& langParts );
void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
@ -53,6 +54,12 @@ private:
QString m_selectedVariant;
QTimer m_setxkbmapTimer;
// From configuration
QString m_xOrgConfFileName;
QString m_convertedKeymapPath;
bool m_writeEtcDefaultKeyboard = true;
protected:
KeyboardModelsModel* keyboardModels() const;
KeyboardLayoutModel* keyboardLayouts() const;