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

[keyboard] Minor additional layout info rework

Browse Source
This commit is contained in:
Artem Grinev 2020-10-25 14:29:33 +03:00
parent 17b9647016
commit 09b5e42734
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/keyboard/Config.cpp
View File

@ -109,14 +109,13 @@ xkbmap_query_grp_option()
return outputLine.mid( index, lastIndex-1 );
}
AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout, bool* found )
AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
{
QFile layoutTable( ":/non-ascii-layouts" );
if( !layoutTable.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
cError() << "Non-ASCII layout table could not be opened";
*found = false;
return {};
return AdditionalLayoutInfo();
}
QString tableLine;
@ -127,20 +126,17 @@ AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout, boo
}
while( !layoutTable.atEnd() || !tableLine.startsWith( layout ) );
if( !tableLine.startsWith(layout) ){
*found = false;
return {};
if( !tableLine.startsWith( layout ) )
{
return AdditionalLayoutInfo();
}
*found = true;
QStringList tableEntries = tableLine.split( " ", SplitSkipEmptyParts );
AdditionalLayoutInfo r;
r.name = tableEntries[0];
r.additionalLayout = tableEntries[1];
r.additionalVariant = tableEntries[2];
r.additionalVariant = tableEntries[2] == "-" ? "" : tableEntries[2];
r.vconsoleKeymap = tableEntries[3];
@ -180,10 +176,9 @@ Config::Config( QObject* parent )
}
connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
bool isNotAsciiCapable = false;
AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout, &isNotAsciiCapable );
AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout);
if(isNotAsciiCapable)
if(!info.additionalLayout.isEmpty())
{
m_selectedLayoutsAdditionalLayoutInfo = info;
QString switchOption = xkbmap_query_grp_option();
@ -195,8 +190,7 @@ Config::Config( QObject* parent )
switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
);
cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
<< "(added " << info.additionalLayout << "-" << info.additionalVariant << " since target layout is not ASCII-capable)";
<< "(added " << info.additionalLayout << "-" << info.additionalVariant << " since current layout is not ASCII-capable)";
}
else
@ -494,7 +488,7 @@ Config::finalize()
gs->insert( "keyboardLayout", m_selectedLayout );
gs->insert( "keyboardVariant", m_selectedVariant ); //empty means default variant
if ( !m_selectedLayoutsAdditionalLayoutInfo.name.isEmpty() )
if ( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
{
gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalLayout);
gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalVariant);

4
src/modules/keyboard/Config.h
View File

@ -21,8 +21,6 @@
#include <QUrl>
struct AdditionalLayoutInfo {
QString name;
QString additionalLayout;
QString additionalVariant;
@ -50,7 +48,7 @@ public:
void setConfigurationMap( const QVariantMap& configurationMap );
static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout, bool* found );
static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout );
private:
void guessLayout( const QStringList& langParts );