diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp index 1585a3dbc..d03199188 100644 --- a/src/KeyBindingEditor.cpp +++ b/src/KeyBindingEditor.cpp @@ -111,7 +111,7 @@ void KeyBindingEditor::setupKeyBindingTable(const KeyboardTranslator* translator const KeyboardTranslator::Entry& entry = entries.at(row); QTableWidgetItem* keyItem = new QTableWidgetItem(entry.conditionToString()); - QTableWidgetItem* textItem = new QTableWidgetItem(QString(entry.text())); + QTableWidgetItem* textItem = new QTableWidgetItem(QString(entry.resultToString())); _ui->keyBindingTable->setItem(row,0,keyItem); _ui->keyBindingTable->setItem(row,1,textItem); diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp index dcf4e5620..6c7428aa8 100644 --- a/src/KeyboardTranslator.cpp +++ b/src/KeyboardTranslator.cpp @@ -250,8 +250,6 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text, if ( (endOfItem || isLastLetter) && !buffer.isEmpty() ) { - qDebug() << "Parsing item: " << buffer; - int itemModifier = 0; int itemKeyCode = 0; int itemFlag = 0; @@ -599,6 +597,23 @@ void KeyboardTranslator::Entry::insertState( QString& item , int state ) const else if ( state == KeyboardTranslator::AnyModifierState ) item += "AnyMod"; } +QString KeyboardTranslator::Entry::resultToString() const +{ + if ( !_text.isEmpty() ) + return _text; + else if ( _command == ScrollPageUpCommand ) + return "ScrollPageUp"; + else if ( _command == ScrollPageDownCommand ) + return "ScrollPageDown"; + else if ( _command == ScrollLineUpCommand ) + return "ScrollLineUp"; + else if ( _command == ScrollLineDownCommand ) + return "ScrollLineDown"; + else if ( _command == ScrollLockCommand ) + return "ScrollLock"; + + return QString(); +} QString KeyboardTranslator::Entry::conditionToString() const { QString result = QKeySequence(_keyCode).toString(); diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h index 085a55784..e8e4cee83 100644 --- a/src/KeyboardTranslator.h +++ b/src/KeyboardTranslator.h @@ -181,6 +181,12 @@ public: */ QString conditionToString() const; + /** + * Returns this entry's result ( ie. its command or character sequence ) + * as a string. + */ + QString resultToString() const; + /** * Returns true if this entry matches the given key sequence, specified * as a combination of @p keyCode , @p modifiers and @p state.