applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 19:35:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyboard: Pass settings directly, not through GlobalStorage.

Browse source 
Pass the settings from keyboard.conf directly to the
SetKeyboardLayoutJob rather than through GlobalStorage.
This commit is contained in:
Kevin Kofler 2014-11-11 14:37:05 +01:00
parent 2fec6e3202
commit 86d51b4a9c
6 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/keyboard/SetKeyboardLayoutJob.h
View file

@ -29,7 +29,9 @@ class SetKeyboardLayoutJob : public Calamares::Job
public:
SetKeyboardLayoutJob( const QString& model,
const QString& layout,
const QString& variant );
const QString& variant,
const QString& xOrgConfFileName,
const QString& convertedKeymapPath );
QString prettyName() const override;
Calamares::JobResult exec() override;
@ -44,6 +46,8 @@ private:
QString m_model;
QString m_layout;
QString m_variant;
QString m_xOrgConfFileName;
QString m_convertedKeymapPath;
};
#endif /* SETKEYBOARDLAYOUTJOB_H */