diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-05-06 12:29:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-10 09:10:45 +0200 |
| commit | 9a7bc0fc1b8d5a8e0ecec05bc91f8018e995006d (patch) | |
| tree | c718259cb8e0b1972a5dbbfae637aa8ada8c4886 /src | |
| parent | 7ebf21e004094485aea025f877f077c161c76f1b (diff) | |
Rename Numpad to Num, ensure Numpad is translated in all cases on Mac.
Numpad is unnecessarily long.
Change-Id: I19a6ce129e26a4f6f8344f514317214c48abde6e
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index c2f957bc41..af3a46c675 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1226,7 +1226,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence << QModifKeyName(Qt::SHIFT, QLatin1String("shift+")) << QModifKeyName(Qt::ALT, QLatin1String("alt+")) << QModifKeyName(Qt::META, QLatin1String("meta+")) - << QModifKeyName(Qt::KeypadModifier, QLatin1String("numpad+")); + << QModifKeyName(Qt::KeypadModifier, QLatin1String("num+")); } } else { gmodifs = globalPortableModifs(); @@ -1235,7 +1235,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence << QModifKeyName(Qt::SHIFT, QLatin1String("shift+")) << QModifKeyName(Qt::ALT, QLatin1String("alt+")) << QModifKeyName(Qt::META, QLatin1String("meta+")) - << QModifKeyName(Qt::KeypadModifier, QLatin1String("numpad+")); + << QModifKeyName(Qt::KeypadModifier, QLatin1String("num+")); } } if (!gmodifs) return ret; @@ -1247,7 +1247,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence << QModifKeyName(Qt::SHIFT, QCoreApplication::translate("QShortcut", "Shift").toLower().append(QLatin1Char('+'))) << QModifKeyName(Qt::ALT, QCoreApplication::translate("QShortcut", "Alt").toLower().append(QLatin1Char('+'))) << QModifKeyName(Qt::META, QCoreApplication::translate("QShortcut", "Meta").toLower().append(QLatin1Char('+'))) - << QModifKeyName(Qt::KeypadModifier, QCoreApplication::translate("QShortcut", "Numpad").toLower().append(QLatin1Char('+'))); + << QModifKeyName(Qt::KeypadModifier, QCoreApplication::translate("QShortcut", "Num").toLower().append(QLatin1Char('+'))); } modifs += *gmodifs; // Test non-translated ones last @@ -1421,9 +1421,9 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Alt") : QString::fromLatin1("Alt"), format); if ((key & Qt::SHIFT) == Qt::SHIFT) addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Shift") : QString::fromLatin1("Shift"), format); - if ((key & Qt::KeypadModifier) == Qt::KeypadModifier) - addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Numpad") : QString::fromLatin1("Numpad"), format); } + if ((key & Qt::KeypadModifier) == Qt::KeypadModifier) + addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Num") : QString::fromLatin1("Num"), format); key &= ~(Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier | Qt::KeypadModifier); |