napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keyboard: warn about missing ckbcomp, thanks @abucodonosor

Browse Source
This commit is contained in:
Adriaan de Groot 2017-10-23 11:48:54 -04:00
parent 36a711c87f
commit 9b5772c482
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/keyboard/keyboard.conf
View File

@ -1,3 +1,5 @@
# NOTE: you must have ckbcomp installed and runnable
# on the live system, for keyboard layout previews.
--- ---
# The name of the file to write X11 keyboard settings to # The name of the file to write X11 keyboard settings to
# The default value is the name used by upstream systemd-localed. # The default value is the name used by upstream systemd-localed.

7
src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
View File

@ -20,6 +20,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "utils/Logger.h"
#include "keyboardpreview.h" #include "keyboardpreview.h"
KeyBoardPreview::KeyBoardPreview( QWidget* parent ) KeyBoardPreview::KeyBoardPreview( QWidget* parent )
@ -113,10 +114,16 @@ bool KeyBoardPreview::loadCodes() {
process.setEnvironment(QStringList() << "LANG=C" << "LC_MESSAGES=C"); process.setEnvironment(QStringList() << "LANG=C" << "LC_MESSAGES=C");
process.start("ckbcomp", param); process.start("ckbcomp", param);
if (!process.waitForStarted()) if (!process.waitForStarted())
{
cDebug() << "WARNING: ckbcomp not found , keyboard preview disabled";
return false; return false;
}
if (!process.waitForFinished()) if (!process.waitForFinished())
{
cDebug() << "WARNING: ckbcomp failed, keyboard preview disabled";
return false; return false;
}
// Clear codes // Clear codes
codes.clear(); codes.clear();