diff options
Diffstat (limited to 'tests/manual/shortcuts/main.cpp')
| -rw-r--r-- | tests/manual/shortcuts/main.cpp | 95 |
1 files changed, 35 insertions, 60 deletions
diff --git a/tests/manual/shortcuts/main.cpp b/tests/manual/shortcuts/main.cpp index 289e8526f0..514d62a484 100644 --- a/tests/manual/shortcuts/main.cpp +++ b/tests/manual/shortcuts/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QApplication> #include <QVBoxLayout> @@ -33,6 +8,7 @@ #include <QLabel> #include <QPushButton> #include <QDebug> +#include <QtVersion> class ShortcutTester : public QWidget { @@ -49,8 +25,6 @@ private: void setupLayout(); void addToGrid(QWidget *w, int &row, int col); void addShortcutToGrid(const QKeySequence &k, int &row, int col); - void addShortcutToGrid(int key, int &row, int col) - { addShortcutToGrid(QKeySequence(key), row, col); } QGridLayout *m_gridLayout = new QGridLayout; }; @@ -85,56 +59,57 @@ void ShortcutTester::setupLayout() int row = 0; int col = 0; - const int keys1[] = { - Qt::AltModifier + Qt::ShiftModifier + Qt::Key_G, - Qt::AltModifier + Qt::Key_G, - Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_R, - Qt::ControlModifier + Qt::Key_R, - Qt::ControlModifier + Qt::Key_Return, Qt::ControlModifier + Qt::Key_Enter, - Qt::ControlModifier + Qt::ShiftModifier + Qt::AltModifier + Qt::Key_R, - Qt::ShiftModifier + Qt::Key_5, Qt::ShiftModifier + Qt::Key_Percent, + const QKeyCombination keys1[] = { + Qt::AltModifier | Qt::ShiftModifier | Qt::Key_G, + Qt::AltModifier | Qt::Key_G, + Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_R, + Qt::ControlModifier | Qt::Key_R, + Qt::ControlModifier | Qt::Key_Return, Qt::ControlModifier | Qt::Key_Enter, + Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier | Qt::Key_R, + Qt::ShiftModifier | Qt::Key_5, Qt::ShiftModifier | Qt::Key_Percent, Qt::Key_Percent, Qt::Key_5, Qt::Key_Q }; - for (int k : keys1) + for (const auto k : keys1) addShortcutToGrid(k, row, col); row = 0; col++; - const int keys2[] = { - Qt::ControlModifier + Qt::Key_Percent, - Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_5, - Qt::ControlModifier + Qt::Key_5, Qt::AltModifier + Qt::Key_5, - Qt::ControlModifier + Qt::Key_Plus, - Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_Plus, - Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_Equal, - Qt::ControlModifier + Qt::Key_Y, Qt::ShiftModifier + Qt::Key_Comma, - Qt::ControlModifier + Qt::Key_Comma, Qt::ControlModifier + Qt::Key_Slash, - Qt::ControlModifier + Qt::Key_Backslash + const QKeyCombination keys2[] = { + Qt::ControlModifier | Qt::Key_Percent, + Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_5, + Qt::ControlModifier | Qt::Key_5, Qt::AltModifier | Qt::Key_5, + Qt::ControlModifier | Qt::Key_Plus, + Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Plus, + Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Equal, + Qt::ControlModifier | Qt::Key_Y, Qt::ShiftModifier | Qt::Key_Comma, + Qt::ControlModifier | Qt::Key_Comma, Qt::ControlModifier | Qt::Key_Slash, + Qt::ControlModifier | Qt::Key_Backslash }; - for (int k : keys2) + for (const auto k : keys2) addShortcutToGrid(k, row, col); row = 0; col++; - const int keys3[] = { - Qt::MetaModifier + Qt::ShiftModifier + Qt::Key_A, - Qt::MetaModifier + Qt::Key_A, - Qt::MetaModifier + Qt::Key_Q, - Qt::MetaModifier + Qt::ShiftModifier + Qt::Key_5, - Qt::ControlModifier + Qt::Key_BracketRight, - Qt::ShiftModifier + Qt::Key_F3, - Qt::ControlModifier + Qt::Key_F3, - 0x20AC, // EURO SIGN e.g. US (with euro on 5) on 3rd keyboard level - Qt::ControlModifier + 0x20AC + const QKeyCombination keys3[] = { + Qt::MetaModifier | Qt::ShiftModifier | Qt::Key_A, + Qt::MetaModifier | Qt::Key_A, + Qt::MetaModifier | Qt::Key_Q, + Qt::MetaModifier | Qt::ShiftModifier | Qt::Key_5, + Qt::ControlModifier | Qt::Key_BracketRight, + Qt::ShiftModifier | Qt::Key_F3, + Qt::ControlModifier | Qt::Key_F3, }; - for (int k : keys3) + for (const auto k : keys3) addShortcutToGrid(k, row, col); + addShortcutToGrid(0x20AC, row, col); // EURO SIGN e.g. US (with euro on 5) on 3rd keyboard level + addShortcutToGrid(int(Qt::ControlModifier) | 0x20AC, row, col); + // with german (neo 2) layout on linux under ISO_Level3_Shift + ISO_Level5_Shift + I const QKeySequence greekPsi(QString(QStringLiteral("\u03A8"))); addShortcutToGrid(greekPsi, row, col); |