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

[keyboard] Code tidy

Browse Source 
- complain just once (globally) if ckbcomp is not found, rather than
  at every update to the layout.
- tighten up QStringList constructor.
This commit is contained in:
Adriaan de Groot 2021-09-06 12:06:11 +02:00
parent a1fce99a05
commit 4948f634ed
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,10 +124,7 @@ KeyBoardPreview::loadCodes()
return false; return false;
} }
QStringList param; QStringList param { "-model", "pc106", "-layout", layout, "-compact" };
param << "-model"
<< "pc106"
<< "-layout" << layout << "-compact";
if ( !variant.isEmpty() ) if ( !variant.isEmpty() )
{ {
param << "-variant" << variant; param << "-variant" << variant;
@ -140,13 +137,18 @@ KeyBoardPreview::loadCodes()
process.start( "ckbcomp", param ); process.start( "ckbcomp", param );
if ( !process.waitForStarted() ) if ( !process.waitForStarted() )
{ {
cWarning() << "ckbcomp not found , keyboard preview disabled"; static bool need_warning = true;
if ( need_warning )
{
cWarning() << "ckbcomp not found , keyboard preview disabled";
need_warning = false;
}
return false; return false;
} }
if ( !process.waitForFinished() ) if ( !process.waitForFinished() )
{ {
cWarning() << "ckbcomp failed, keyboard preview disabled"; cWarning() << "ckbcomp failed, keyboard preview skipped for" << layout << variant;
return false; return false;
} }