Page MenuHomePhabricator (Chris)
Files F86167

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/ukeysequence.cpp b/ukeysequence.cpp
index b3508f6..fd67f33 100644
--- a/ukeysequence.cpp
+++ b/ukeysequence.cpp
@@ -1,130 +1,130 @@
#include "ukeysequence.h"
#include <QDebug>
UKeySequence::UKeySequence(QObject *parent)
: QObject(parent)
{
}
UKeySequence::UKeySequence(const QString &str, QObject *parent)
: QObject(parent)
{
fromString(str);
}
void UKeySequence::fromString(const QString &str)
{
QStringList keys = str.split('+');
for (int i = 0; i < keys.size(); i++) {
addKey(keys[i]);
}
}
QString UKeySequence::toString()
{
QVector<Qt::Key> simpleKeys = getSimpleKeys();
QVector<Qt::Key> modifiers = getModifiers();
QStringList result;
for (int i = 0; i < modifiers.size(); i++) {
result.push_back(keyToStr(modifiers[i]));
}
for (int i = 0; i < simpleKeys.size(); i++) {
result.push_back(keyToStr(simpleKeys[i]));
}
return result.join('+');
}
QVector<Qt::Key> UKeySequence::getSimpleKeys() const
{
QVector<Qt::Key> result;
for (int i = 0; i < mKeys.size(); i++) {
if (!isModifier(mKeys[i])) {
result.push_back(mKeys[i]);
}
}
return result;
}
QVector<Qt::Key> UKeySequence::getModifiers() const
{
QVector<Qt::Key> result;
for (int i = 0; i < mKeys.size(); i++) {
if (isModifier(mKeys[i])) {
result.push_back(mKeys[i]);
}
}
return result;
}
void UKeySequence::addModifiers(Qt::KeyboardModifiers mod)
{
if (mod == Qt::NoModifier) {
return;
}
if (mod & Qt::ShiftModifier) {
addKey(Qt::Key_Shift);
}
if (mod & Qt::ControlModifier) {
addKey(Qt::Key_Control);
}
if (mod & Qt::AltModifier) {
addKey(Qt::Key_Alt);
}
if (mod & Qt::MetaModifier) {
addKey(Qt::Key_Meta);
}
}
void UKeySequence::addKey(const QString &key)
{
if (key.contains("+") || key.contains(",")) {
qWarning() << "Wrong key";
return;
}
QString mod = key.toLower();
// qDebug() << "mod: " << mod;
if (mod == "alt") {
addKey(Qt::Key_Alt);
return;
}
if (mod == "shift" || mod == "shft") {
addKey(Qt::Key_Shift);
return;
}
if (mod == "control" || mod == "ctrl") {
addKey(Qt::Key_Control);
return;
}
if (mod == "win" || mod == "meta") {
addKey(Qt::Key_Meta);
return;
}
QKeySequence seq(key);
if (seq.count() != 1) {
qWarning() << "Wrong key";
return;
}
- addKey((Qt::Key) seq[0]);
+ addKey(seq[0].key());
}
void UKeySequence::addKey(Qt::Key key)
{
if (key <= 0) {
return;
}
for (int i = 0; i < mKeys.size(); i++) {
if (mKeys[i] == key) {
return;
}
}
// qDebug() << "Key added: " << key;
mKeys.push_back(key);
}
void UKeySequence::addKey(const QKeyEvent *event)
{
addKey((Qt::Key) event->key());
addModifiers(event->modifiers());
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 11, 7:10 PM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42703
Default Alt Text
(3 KB)

Event Timeline