diff options
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 64 |
1 files changed, 54 insertions, 10 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 07ec658818..44de8c5847 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -257,6 +257,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni \row \li FindPrevious \li Shift+F3, Ctrl+Shift+G \li Ctrl+Shift+G \li Shift+F3 \li Ctrl+Shift+G, Shift+F3 \row \li Replace \li Ctrl+H \li (none) \li Ctrl+R \li Ctrl+H \row \li SelectAll \li Ctrl+A \li Ctrl+A \li Ctrl+A \li Ctrl+A + \row \li Deselect \li \li \li Ctrl+Shift+A \li Ctrl+Shift+A \row \li Bold \li Ctrl+B \li Ctrl+B \li Ctrl+B \li Ctrl+B \row \li Italic \li Ctrl+I \li Ctrl+I \li Ctrl+I \li Ctrl+I \row \li Underline \li Ctrl+U \li Ctrl+U \li Ctrl+U \li Ctrl+U @@ -753,6 +754,7 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = { {QKeySequence::Close, 0, Qt::CTRL | Qt::Key_F4, KB_Mac}, {QKeySequence::NextChild, 0, Qt::CTRL | Qt::Key_F6, KB_Win}, {QKeySequence::FullScreen, 1, Qt::CTRL | Qt::Key_F11, KB_Gnome}, + {QKeySequence::Deselect, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_A, KB_X11}, {QKeySequence::FullScreen, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_F, KB_KDE}, {QKeySequence::FindPrevious, 1, Qt::CTRL | Qt::SHIFT | Qt::Key_G, KB_Gnome | KB_Mac}, {QKeySequence::FindPrevious, 0, Qt::CTRL | Qt::SHIFT | Qt::Key_G, KB_Win}, @@ -866,6 +868,7 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate \value SaveAs Save document after prompting the user for a file name. \value Save Save document. \value SelectAll Select all text. + \value Deselect Deselect text. Since 5.1 \value SelectEndOfBlock Extend selection to the end of a text block. This shortcut is only used on OS X. \value SelectEndOfDocument Extend selection to end of document. \value SelectEndOfLine Extend selection to end of line. @@ -878,7 +881,7 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate \value SelectPreviousPage Extend selection to previous page. \value SelectPreviousWord Extend selection to previous word. \value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on OS X. - \value SelectStartOfDocument Extend selection to start of document. + \value SelectStartOfDocument Extend selection to start of document. \value SelectStartOfLine Extend selection to start of line. \value Underline Underline text. \value Undo Undo. @@ -892,10 +895,10 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate /*! \since 4.2 - Constructs a QKeySequence object for the given \a key. - The result will depend on the currently running platform. + Constructs a QKeySequence object for the given \a key. + The result will depend on the currently running platform. - The resulting object will be based on the first element in the + The resulting object will be based on the first element in the list of key bindings for the \a key. */ QKeySequence::QKeySequence(StandardKey key) @@ -903,7 +906,7 @@ QKeySequence::QKeySequence(StandardKey key) const QList <QKeySequence> bindings = keyBindings(key); //pick only the first/primary shortcut from current bindings if (bindings.size() > 0) { - d = bindings.first().d; + d = bindings.first().d; d->ref.ref(); } else @@ -991,8 +994,8 @@ static inline int maybeSwapShortcut(int shortcut) \since 4.2 Returns a list of key bindings for the given \a key. - The result of calling this function will vary based on the target platform. - The first element of the list indicates the primary shortcut for the given platform. + The result of calling this function will vary based on the target platform. + The first element of the list indicates the primary shortcut for the given platform. If the result contains more than one result, these can be considered alternative shortcuts on the same platform for the given \a key. */ @@ -1509,9 +1512,9 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const \obsolete - Use toString() instead. - - Returns the key sequence as a QString. This is equivalent to + Use toString() instead. + + Returns the key sequence as a QString. This is equivalent to calling toString(QKeySequence::NativeText). Note that the result is not platform independent. */ @@ -1681,6 +1684,47 @@ QKeySequence QKeySequence::fromString(const QString &str, SequenceFormat format) return QKeySequence(str, format); } +/*! + \since 5.1 + + Return a list of QKeySequence from the string \a str based on \a format. + + \sa fromString() + \sa listToString() +*/ +QList<QKeySequence> QKeySequence::listFromString(const QString &str, SequenceFormat format) +{ + QList<QKeySequence> result; + + QStringList strings = str.split(QLatin1String("; ")); + foreach (const QString &string, strings) { + result << fromString(string, format); + } + + return result; +} + +/*! + \since 5.1 + + Return a string representation of \a list based on \a format. + + \sa toString() + \sa listFromString() +*/ +QString QKeySequence::listToString(const QList<QKeySequence> &list, SequenceFormat format) +{ + QString result; + + foreach (const QKeySequence &sequence, list) { + result += sequence.toString(format); + result += QLatin1String("; "); + } + result.truncate(result.length() - 2); + + return result; +} + /***************************************************************************** QKeySequence stream functions *****************************************************************************/ |