mirror of
https://github.com/KDE/konsole.git
synced 2026-05-06 05:36:40 -04:00
Fix character sequences produced by <Ctrl/Alt/Ctrl+Alt> + <Left Arrow/Right Arrow> key inputs. Implement support for wild card '*' characters in the result string for keyboard translator entries.
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=743477
This commit is contained in:
@@ -584,9 +584,9 @@ bool KeyboardTranslator::Entry::matches(int keyCode ,
|
||||
|
||||
return true;
|
||||
}
|
||||
QByteArray KeyboardTranslator::Entry::escapedText() const
|
||||
QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
|
||||
{
|
||||
QByteArray result(_text);
|
||||
QByteArray result(text(expandWildCards,modifiers));
|
||||
|
||||
for ( int i = 0 ; i < result.count() ; i++ )
|
||||
{
|
||||
@@ -710,10 +710,10 @@ void KeyboardTranslator::Entry::insertState( QString& item , int state ) const
|
||||
else if ( state == KeyboardTranslator::AnyModifierState )
|
||||
item += "AnyMod";
|
||||
}
|
||||
QString KeyboardTranslator::Entry::resultToString() const
|
||||
QString KeyboardTranslator::Entry::resultToString(bool expandWildCards,Qt::KeyboardModifiers modifiers) const
|
||||
{
|
||||
if ( !_text.isEmpty() )
|
||||
return escapedText();
|
||||
return escapedText(expandWildCards,modifiers);
|
||||
else if ( _command == ScrollPageUpCommand )
|
||||
return "ScrollPageUp";
|
||||
else if ( _command == ScrollPageDownCommand )
|
||||
|
||||
Reference in New Issue
Block a user