diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-22 17:38:09 +0200 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-22 17:38:09 +0200 |
commit | 8bed00ab34e31f2b9c70026d418d923913325798 (patch) | |
tree | f289c15575415a36bc19c047a2037998e9b11ce8 /src/gui | |
parent | 186755fd56b58dc97250846c5305ef89f9487f86 (diff) | |
download | kconfig-8bed00ab34e31f2b9c70026d418d923913325798.tar.gz kconfig-8bed00ab34e31f2b9c70026d418d923913325798.tar.bz2 |
Run clang-format on all cpp/h files
NO_CHANGELOG
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kconfiggroupgui.cpp | 30 | ||||
-rw-r--r-- | src/gui/kconfiggui.cpp | 11 | ||||
-rw-r--r-- | src/gui/kconfigloader.cpp | 63 | ||||
-rw-r--r-- | src/gui/kconfigloader.h | 2 | ||||
-rw-r--r-- | src/gui/kconfigloaderhandler_p.h | 1 | ||||
-rw-r--r-- | src/gui/kconfigskeleton.cpp | 21 | ||||
-rw-r--r-- | src/gui/kconfigskeleton.h | 20 | ||||
-rw-r--r-- | src/gui/kstandardshortcut.cpp | 471 | ||||
-rw-r--r-- | src/gui/kstandardshortcut.h | 6 | ||||
-rw-r--r-- | src/gui/kwindowconfig.cpp | 4 | ||||
-rw-r--r-- | src/gui/kwindowconfig.h | 4 |
11 files changed, 402 insertions, 231 deletions
diff --git a/src/gui/kconfiggroupgui.cpp b/src/gui/kconfiggroupgui.cpp index 96b042af..5fbdbfad 100644 --- a/src/gui/kconfiggroupgui.cpp +++ b/src/gui/kconfiggroupgui.cpp @@ -21,14 +21,11 @@ * @returns true if something was handled (even if output was set to clear or default) * or false if nothing was handled (e.g., Core type) */ -static bool readEntryGui(const QByteArray &data, const char *key, const QVariant &input, - QVariant &output) +static bool readEntryGui(const QByteArray &data, const char *key, const QVariant &input, QVariant &output) { const auto errString = [&]() { return QStringLiteral("\"%1\" - conversion from \"%3\" to %2 failed") - .arg(QLatin1String(key), - QLatin1String(QVariant::typeToName(input.type())), - QLatin1String(data.constData()) ); + .arg(QLatin1String(key), QLatin1String(QVariant::typeToName(input.type())), QLatin1String(data.constData())); }; // set in case of failure @@ -37,7 +34,7 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant switch (static_cast<QMetaType::Type>(input.type())) { case QMetaType::QColor: { if (data.isEmpty() || data == "invalid") { - output = QColor(); // return what was stored + output = QColor(); // return what was stored return true; } else if (data.at(0) == '#') { QColor col; @@ -59,7 +56,7 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant if (count != 3 && count != 4) { const QString formatError = QStringLiteral(" (wrong format: expected '%1' items, read '%2')"); qCritical() << qPrintable(errString()) << qPrintable(formatError.arg(QStringLiteral("3' or '4")).arg(count)); - return true; // return default + return true; // return default } int temp[4]; @@ -72,9 +69,7 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant return true; // return default } if (j < 0 || j > 255) { - static const char *const components[] = { - "red", "green", "blue", "alpha" - }; + static const char *const components[] = {"red", "green", "blue", "alpha"}; const QString boundsError = QStringLiteral(" (bounds error: %1 component %2)"); qCritical() << qPrintable(errString()) << qPrintable(boundsError.arg(QLatin1String(components[i])).arg(j < 0 ? QStringLiteral("< 0") : QStringLiteral("> 255"))); @@ -114,13 +109,13 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant case QMetaType::QCursor: case QMetaType::QSizePolicy: case QMetaType::QPen: - // we may want to handle these in the future + // we may want to handle these in the future default: break; } - return false; // not handled + return false; // not handled } /** @@ -129,8 +124,7 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant * @returns true if something was handled (even if an empty value was written) * or false if nothing was handled (e.g., Core type) */ -static bool writeEntryGui(KConfigGroup *cg, const char *key, const QVariant &prop, - KConfigGroup::WriteConfigFlags pFlags) +static bool writeEntryGui(KConfigGroup *cg, const char *key, const QVariant &prop, KConfigGroup::WriteConfigFlags pFlags) { switch (static_cast<QMetaType::Type>(prop.type())) { case QMetaType::QColor: { @@ -161,10 +155,8 @@ static bool writeEntryGui(KConfigGroup *cg, const char *key, const QVariant &pro // https://bugreports.qt.io/browse/QTBUG-63792 // https://bugs.kde.org/show_bug.cgi?id=378523 if (f.weight() == QFont::Normal - && (f.styleName() == QLatin1String("Regular") - || f.styleName() == QLatin1String("Normal") - || f.styleName() == QLatin1String("Book") - || f.styleName() == QLatin1String("Roman"))) { + && (f.styleName() == QLatin1String("Regular") || f.styleName() == QLatin1String("Normal") || f.styleName() == QLatin1String("Book") + || f.styleName() == QLatin1String("Roman"))) { f.setStyleName(QString()); } cg->writeEntry(key, f.toString().toUtf8(), pFlags); @@ -194,7 +186,7 @@ static int initKConfigGroupGui() { _kde_internal_KConfigGroupGui.readEntryGui = readEntryGui; _kde_internal_KConfigGroupGui.writeEntryGui = writeEntryGui; - return 42; // because 42 is nicer than 1 or 0 + return 42; // because 42 is nicer than 1 or 0 } #ifdef Q_CONSTRUCTOR_FUNCTION diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp index 1daeec45..938fbd93 100644 --- a/src/gui/kconfiggui.cpp +++ b/src/gui/kconfiggui.cpp @@ -13,9 +13,7 @@ static QString configName(const QString &id, const QString &key) { - return(QLatin1String("session/") + QGuiApplication::applicationName() + - QLatin1Char('_') + id + - QLatin1Char('_') + key); + return (QLatin1String("session/") + QGuiApplication::applicationName() + QLatin1Char('_') + id + QLatin1Char('_') + key); } static KConfig *s_sessionConfig = nullptr; @@ -28,9 +26,7 @@ KConfig *KConfigGui::sessionConfig() if (!hasSessionConfig() && qApp->isSessionRestored()) { // create the default instance specific config object // from applications' -session command line parameter - s_sessionConfig = new KConfig(configName(qApp->sessionId(), - qApp->sessionKey()), - KConfig::SimpleConfig); + s_sessionConfig = new KConfig(configName(qApp->sessionId(), qApp->sessionKey()), KConfig::SimpleConfig); } return s_sessionConfig; @@ -44,8 +40,7 @@ void KConfigGui::setSessionConfig(const QString &id, const QString &key) } // create a new instance specific config object from supplied id & key - s_sessionConfig = new KConfig(configName(id, key), - KConfig::SimpleConfig); + s_sessionConfig = new KConfig(configName(id, key), KConfig::SimpleConfig); } bool KConfigGui::hasSessionConfig() diff --git a/src/gui/kconfigloader.cpp b/src/gui/kconfigloader.cpp index 538a38ff..bc1751f4 100644 --- a/src/gui/kconfigloader.cpp +++ b/src/gui/kconfigloader.cpp @@ -27,8 +27,8 @@ void ConfigLoaderPrivate::parse(KConfigLoader *loader, QIODevice *xml) } ConfigLoaderHandler::ConfigLoaderHandler(KConfigLoader *config, ConfigLoaderPrivate *d) - : m_config(config), - d(d) + : m_config(config) + , d(d) { resetState(); } @@ -86,7 +86,7 @@ bool ConfigLoaderHandler::startElement(const QStringRef &localName, const QXmlSt for (const auto &attr : attrs) { const QStringRef name = attr.name(); if (name.compare(QLatin1String("name"), Qt::CaseInsensitive) == 0) { - //qDebug() << "set group to" << attrs.value(i); + // qDebug() << "set group to" << attrs.value(i); group = attr.value().toString(); } } @@ -137,7 +137,7 @@ bool ConfigLoaderHandler::characters(const QStringRef &ch) bool ConfigLoaderHandler::endElement(const QStringRef &localName) { -// qDebug() << "ConfigLoaderHandler::endElement(" << localName << qName; + // qDebug() << "ConfigLoaderHandler::endElement(" << localName << qName; const QStringRef tag = localName; if (tag.compare(QLatin1String("entry"), Qt::CaseInsensitive) == 0) { addItem(); @@ -189,22 +189,16 @@ void ConfigLoaderHandler::addItem() } else if (m_type == QLatin1String("color")) { item = m_config->addItemColor(m_name, *d->newColor(), QColor(m_default), m_key); } else if (m_type == QLatin1String("datetime")) { - item = m_config->addItemDateTime(m_name, *d->newDateTime(), - QDateTime::fromString(m_default), m_key); + item = m_config->addItemDateTime(m_name, *d->newDateTime(), QDateTime::fromString(m_default), m_key); } else if (m_type == QLatin1String("enum")) { m_key = (m_key.isEmpty()) ? m_name : m_key; - KConfigSkeleton::ItemEnum *enumItem = - new KConfigSkeleton::ItemEnum(m_config->currentGroup(), - m_key, *d->newInt(), - m_enumChoices, - m_default.toUInt()); + KConfigSkeleton::ItemEnum *enumItem = new KConfigSkeleton::ItemEnum(m_config->currentGroup(), m_key, *d->newInt(), m_enumChoices, m_default.toUInt()); m_config->addItem(enumItem, m_name); item = enumItem; } else if (m_type == QLatin1String("font")) { item = m_config->addItemFont(m_name, *d->newFont(), QFont(m_default), m_key); } else if (m_type == QLatin1String("int")) { - KConfigSkeleton::ItemInt *intItem = m_config->addItemInt(m_name, *d->newInt(), - m_default.toInt(), m_key); + KConfigSkeleton::ItemInt *intItem = m_config->addItemInt(m_name, *d->newInt(), m_default.toInt(), m_key); if (m_haveMin) { intItem->setMinValue(m_min); @@ -222,13 +216,11 @@ void ConfigLoaderHandler::addItem() } else if (m_type == QLatin1String("string")) { item = m_config->addItemString(m_name, *d->newString(), m_default, m_key); } else if (m_type == QLatin1String("stringlist")) { - //FIXME: the split() is naive and will break on lists with ,'s in them - //empty parts are not wanted in this case - item = m_config->addItemStringList(m_name, *d->newStringList(), - m_default.split(QLatin1Char(','), Qt::SkipEmptyParts), m_key); + // FIXME: the split() is naive and will break on lists with ,'s in them + // empty parts are not wanted in this case + item = m_config->addItemStringList(m_name, *d->newStringList(), m_default.split(QLatin1Char(','), Qt::SkipEmptyParts), m_key); } else if (m_type == QLatin1String("uint")) { - KConfigSkeleton::ItemUInt *uintItem = - m_config->addItemUInt(m_name, *d->newUint(), m_default.toUInt(), m_key); + KConfigSkeleton::ItemUInt *uintItem = m_config->addItemUInt(m_name, *d->newUint(), m_default.toUInt(), m_key); if (m_haveMin) { uintItem->setMinValue(m_min); } @@ -238,15 +230,11 @@ void ConfigLoaderHandler::addItem() item = uintItem; } else if (m_type == QLatin1String("url")) { m_key = (m_key.isEmpty()) ? m_name : m_key; - KConfigSkeleton::ItemUrl *urlItem = - new KConfigSkeleton::ItemUrl(m_config->currentGroup(), - m_key, *d->newUrl(), - QUrl::fromUserInput(m_default)); + KConfigSkeleton::ItemUrl *urlItem = new KConfigSkeleton::ItemUrl(m_config->currentGroup(), m_key, *d->newUrl(), QUrl::fromUserInput(m_default)); m_config->addItem(urlItem, m_name); item = urlItem; } else if (m_type == QLatin1String("double")) { - KConfigSkeleton::ItemDouble *doubleItem = m_config->addItemDouble(m_name, - *d->newDouble(), m_default.toDouble(), m_key); + KConfigSkeleton::ItemDouble *doubleItem = m_config->addItemDouble(m_name, *d->newDouble(), m_default.toDouble(), m_key); if (m_haveMin) { doubleItem->setMinValue(m_min); } @@ -262,8 +250,7 @@ void ConfigLoaderHandler::addItem() } item = m_config->addItemIntList(m_name, *d->newIntList(), defaultList, m_key); } else if (m_type == QLatin1String("longlong")) { - KConfigSkeleton::ItemLongLong *longlongItem = m_config->addItemLongLong(m_name, - *d->newLongLong(), m_default.toLongLong(), m_key); + KConfigSkeleton::ItemLongLong *longlongItem = m_config->addItemLongLong(m_name, *d->newLongLong(), m_default.toLongLong(), m_key); if (m_haveMin) { longlongItem->setMinValue(m_min); } @@ -288,8 +275,7 @@ void ConfigLoaderHandler::addItem() QRect defaultRect; const QStringList tmpList = m_default.split(QLatin1Char(',')); if (tmpList.size() >= 4) { - defaultRect.setCoords(tmpList[0].toInt(), tmpList[1].toInt(), - tmpList[2].toInt(), tmpList[3].toInt()); + defaultRect.setCoords(tmpList[0].toInt(), tmpList[1].toInt(), tmpList[2].toInt(), tmpList[3].toInt()); } item = m_config->addItemRect(m_name, *d->newRect(), defaultRect, m_key); } else if (m_type == QLatin1String("size")) { @@ -301,8 +287,7 @@ void ConfigLoaderHandler::addItem() } item = m_config->addItemSize(m_name, *d->newSize(), defaultSize, m_key); } else if (m_type == QLatin1String("ulonglong")) { - KConfigSkeleton::ItemULongLong *ulonglongItem = - m_config->addItemULongLong(m_name, *d->newULongLong(), m_default.toULongLong(), m_key); + KConfigSkeleton::ItemULongLong *ulonglongItem = m_config->addItemULongLong(m_name, *d->newULongLong(), m_default.toULongLong(), m_key); if (m_haveMin) { ulonglongItem->setMinValue(m_min); } @@ -345,25 +330,25 @@ void ConfigLoaderHandler::resetState() } KConfigLoader::KConfigLoader(const QString &configFile, QIODevice *xml, QObject *parent) - : KConfigSkeleton(configFile, parent), - d(new ConfigLoaderPrivate) + : KConfigSkeleton(configFile, parent) + , d(new ConfigLoaderPrivate) { d->parse(this, xml); } KConfigLoader::KConfigLoader(KSharedConfigPtr config, QIODevice *xml, QObject *parent) - : KConfigSkeleton(std::move(config), parent), - d(new ConfigLoaderPrivate) + : KConfigSkeleton(std::move(config), parent) + , d(new ConfigLoaderPrivate) { d->parse(this, xml); } -//FIXME: obviously this is broken and should be using the group as the root, +// FIXME: obviously this is broken and should be using the group as the root, // but KConfigSkeleton does not currently support this. it will eventually though, // at which point this can be addressed properly KConfigLoader::KConfigLoader(const KConfigGroup &config, QIODevice *xml, QObject *parent) - : KConfigSkeleton(KSharedConfig::openConfig(config.config()->name(), config.config()->openFlags(), config.config()->locationType()), parent), - d(new ConfigLoaderPrivate) + : KConfigSkeleton(KSharedConfig::openConfig(config.config()->name(), config.config()->openFlags(), config.config()->locationType()), parent) + , d(new ConfigLoaderPrivate) { KConfigGroup group = config.parent(); d->baseGroup = config.name(); @@ -418,7 +403,7 @@ bool KConfigLoader::usrSave() { if (d->saveDefaults) { const auto listItems = items(); - for (const auto& item : listItems) { + for (const auto &item : listItems) { config()->group(item->group()).writeEntry(item->key(), ""); } } diff --git a/src/gui/kconfigloader.h b/src/gui/kconfigloader.h index 2e97ccd8..e40b68cb 100644 --- a/src/gui/kconfigloader.h +++ b/src/gui/kconfigloader.h @@ -166,4 +166,4 @@ private: ConfigLoaderPrivate *const d; }; -#endif //multiple inclusion guard +#endif // multiple inclusion guard diff --git a/src/gui/kconfigloaderhandler_p.h b/src/gui/kconfigloaderhandler_p.h index cf9b7081..bc199e0e 100644 --- a/src/gui/kconfigloaderhandler_p.h +++ b/src/gui/kconfigloaderhandler_p.h @@ -44,4 +44,3 @@ private: }; #endif - diff --git a/src/gui/kconfigskeleton.cpp b/src/gui/kconfigskeleton.cpp index 031c7fbb..c3881c3b 100644 --- a/src/gui/kconfigskeleton.cpp +++ b/src/gui/kconfigskeleton.cpp @@ -20,9 +20,7 @@ KConfigSkeleton::KConfigSkeleton(KSharedConfig::Ptr pConfig, QObject *parent) { } -KConfigSkeleton::ItemColor::ItemColor(const QString &_group, const QString &_key, - QColor &reference, - const QColor &defaultValue) +KConfigSkeleton::ItemColor::ItemColor(const QString &_group, const QString &_key, QColor &reference, const QColor &defaultValue) : KConfigSkeletonGenericItem<QColor>(_group, _key, reference, defaultValue) { } @@ -51,9 +49,7 @@ QVariant KConfigSkeleton::ItemColor::property() const return QVariant(mReference); } -KConfigSkeleton::ItemFont::ItemFont(const QString &_group, const QString &_key, - QFont &reference, - const QFont &defaultValue) +KConfigSkeleton::ItemFont::ItemFont(const QString &_group, const QString &_key, QFont &reference, const QFont &defaultValue) : KConfigSkeletonGenericItem<QFont>(_group, _key, reference, defaultValue) { } @@ -82,23 +78,18 @@ QVariant KConfigSkeleton::ItemFont::property() const return QVariant(mReference); } -KConfigSkeleton::ItemColor *KConfigSkeleton::addItemColor(const QString &name, QColor &reference, - const QColor &defaultValue, const QString &key) +KConfigSkeleton::ItemColor *KConfigSkeleton::addItemColor(const QString &name, QColor &reference, const QColor &defaultValue, const QString &key) { KConfigSkeleton::ItemColor *item; - item = new KConfigSkeleton::ItemColor(d->mCurrentGroup, key.isNull() ? name : key, - reference, defaultValue); + item = new KConfigSkeleton::ItemColor(d->mCurrentGroup, key.isNull() ? name : key, reference, defaultValue); addItem(item, name); return item; } -KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont(const QString &name, QFont &reference, - const QFont &defaultValue, const QString &key) +KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont(const QString &name, QFont &reference, const QFont &defaultValue, const QString &key) { KConfigSkeleton::ItemFont *item; - item = new KConfigSkeleton::ItemFont(d->mCurrentGroup, key.isNull() ? name : key, - reference, defaultValue); + item = new KConfigSkeleton::ItemFont(d->mCurrentGroup, key.isNull() ? name : key, reference, defaultValue); addItem(item, name); return item; } - diff --git a/src/gui/kconfigskeleton.h b/src/gui/kconfigskeleton.h index 8e88e8d8..3f0aec87 100644 --- a/src/gui/kconfigskeleton.h +++ b/src/gui/kconfigskeleton.h @@ -32,13 +32,11 @@ public: /** * Class for handling a color preferences item. */ - class KCONFIGGUI_EXPORT ItemColor: public KConfigSkeletonGenericItem < QColor > + class KCONFIGGUI_EXPORT ItemColor : public KConfigSkeletonGenericItem<QColor> { public: /** @copydoc KConfigSkeletonGenericItem::KConfigSkeletonGenericItem */ - ItemColor(const QString &_group, const QString &_key, - QColor &reference, - const QColor &defaultValue = QColor(128, 128, 128)); + ItemColor(const QString &_group, const QString &_key, QColor &reference, const QColor &defaultValue = QColor(128, 128, 128)); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ void readConfig(KConfig *config) override; @@ -56,12 +54,11 @@ public: /** * Class for handling a font preferences item. */ - class KCONFIGGUI_EXPORT ItemFont: public KConfigSkeletonGenericItem < QFont > + class KCONFIGGUI_EXPORT ItemFont : public KConfigSkeletonGenericItem<QFont> { public: /** @copydoc KConfigSkeletonGenericItem::KConfigSkeletonGenericItem */ - ItemFont(const QString &_group, const QString &_key, QFont &reference, - const QFont &defaultValue = QFont()); + ItemFont(const QString &_group, const QString &_key, QFont &reference, const QFont &defaultValue = QFont()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ void readConfig(KConfig *config) override; @@ -103,9 +100,7 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemColor *addItemColor(const QString &name, QColor &reference, - const QColor &defaultValue = QColor(128, 128, 128), - const QString &key = QString()); + ItemColor *addItemColor(const QString &name, QColor &reference, const QColor &defaultValue = QColor(128, 128, 128), const QString &key = QString()); /** * Register an item of type QFont. @@ -118,10 +113,7 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemFont *addItemFont(const QString &name, QFont &reference, - const QFont &defaultValue = QFont(), - const QString &key = QString()); - + ItemFont *addItemFont(const QString &name, QFont &reference, const QFont &defaultValue = QFont(), const QString &key = QString()); }; #endif diff --git a/src/gui/kstandardshortcut.cpp b/src/gui/kstandardshortcut.cpp index c55d71c3..ac8431df 100644 --- a/src/gui/kstandardshortcut.cpp +++ b/src/gui/kstandardshortcut.cpp @@ -19,7 +19,6 @@ namespace KStandardShortcut { - struct KStandardShortcutInfo { //! The standard shortcut id. @see StandardShortcut StandardShortcut id; @@ -32,7 +31,10 @@ struct KStandardShortcutInfo { const char *name; //! Localized label for user-visible display, including translation context. - struct { const char *text; const char *context; } description; + struct { + const char *text; + const char *context; + } description; //! The keys for this shortcut int cutDefault, cutDefault2; @@ -47,11 +49,11 @@ struct KStandardShortcutInfo { Category category; }; -#define CTRL(x) Qt::CTRL|Qt::Key_##x -#define SHIFT(x) Qt::SHIFT|Qt::Key_##x -#define CTRLSHIFT(x) Qt::CTRL|Qt::SHIFT|Qt::Key_##x -#define ALT(x) Qt::ALT|Qt::Key_##x -#define ALTSHIFT(x) Qt::ALT|Qt::SHIFT|Qt::Key_##x +#define CTRL(x) Qt::CTRL | Qt::Key_##x +#define SHIFT(x) Qt::SHIFT | Qt::Key_##x +#define CTRLSHIFT(x) Qt::CTRL | Qt::SHIFT | Qt::Key_##x +#define ALT(x) Qt::ALT | Qt::Key_##x +#define ALTSHIFT(x) Qt::ALT | Qt::SHIFT | Qt::Key_##x /** Array of predefined KStandardShortcutInfo objects, which cover all the "standard" accelerators. Each enum value from StandardShortcut @@ -60,129 +62,351 @@ struct KStandardShortcutInfo { // STUFF WILL BREAK IF YOU DON'T READ THIS!!! // Read the comments of the big enum in kstandardshortcut.h before you change anything! static KStandardShortcutInfo g_infoStandardShortcut[] = { -//Group File, - { AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory }, - { Open, "Open", QT_TRANSLATE_NOOP3("KStandardShortcut", "Open", "@action"), CTRL(O), 0, QList<QKeySequence>(), false, Category::File }, - { New, "New", QT_TRANSLATE_NOOP3("KStandardShortcut", "New", "@action"), CTRL(N), 0, QList<QKeySequence>(), false, Category::File }, - { Close, "Close", QT_TRANSLATE_NOOP3("KStandardShortcut", "Close", "@action"), CTRL(W), CTRL(Escape), QList<QKeySequence>(), false, Category::File }, - { Save, "Save", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save", "@action"), CTRL(S), 0, QList<QKeySequence>(), false, Category::File }, - { Print, "Print", QT_TRANSLATE_NOOP3("KStandardShortcut", "Print", "@action"), CTRL(P), 0, QList<QKeySequence>(), false, Category::File }, - { Quit, "Quit", QT_TRANSLATE_NOOP3("KStandardShortcut", "Quit", "@action"), CTRL(Q), 0, QList<QKeySequence>(), false, Category::Navigation }, - -//Group Edit - { Undo, "Undo", QT_TRANSLATE_NOOP3("KStandardShortcut", "Undo", "@action"), CTRL(Z), 0, QList<QKeySequence>(), false, Category::Edit }, - { Redo, "Redo", QT_TRANSLATE_NOOP3("KStandardShortcut", "Redo", "@action"), CTRLSHIFT(Z), 0, QList<QKeySequence>(), false, Category::Edit }, + // Group File, + {AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory}, + {Open, "Open", QT_TRANSLATE_NOOP3("KStandardShortcut", "Open", "@action"), CTRL(O), 0, QList<QKeySequence>(), false, Category::File}, + {New, "New", QT_TRANSLATE_NOOP3("KStandardShortcut", "New", "@action"), CTRL(N), 0, QList<QKeySequence>(), false, Category::File}, + {Close, "Close", QT_TRANSLATE_NOOP3("KStandardShortcut", "Close", "@action"), CTRL(W), CTRL(Escape), QList<QKeySequence>(), false, Category::File}, + {Save, "Save", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save", "@action"), CTRL(S), 0, QList<QKeySequence>(), false, Category::File}, + {Print, "Print", QT_TRANSLATE_NOOP3("KStandardShortcut", "Print", "@action"), CTRL(P), 0, QList<QKeySequence>(), false, Category::File}, + {Quit, "Quit", QT_TRANSLATE_NOOP3("KStandardShortcut", "Quit", "@action"), CTRL(Q), 0, QList<QKeySequence>(), false, Category::Navigation}, + + // Group Edit + {Undo, "Undo", QT_TRANSLATE_NOOP3("KStandardShortcut", "Undo", "@action"), CTRL(Z), 0, QList<QKeySequence>(), false, Category::Edit}, + {Redo, "Redo", QT_TRANSLATE_NOOP3("KStandardShortcut", "Redo", "@action"), CTRLSHIFT(Z), 0, QList<QKeySequence>(), false, Category::Edit}, // Both "Cut" and "Delete" use Shift+Delete, but this is okay; see // https://commits.kde.org/kxmlgui/8eabbf6725386e716b7536c71a9181dfe5d959f0 - { Cut, "Cut", QT_TRANSLATE_NOOP3("KStandardShortcut", "Cut", "@action"), CTRL(X), SHIFT(Delete), QList<QKeySequence>(), false, Category::Edit }, - { Copy, "Copy", QT_TRANSLATE_NOOP3("KStandardShortcut", "Copy", "@action"), CTRL(C), CTRL(Insert), QList<QKeySequence>(), false, Category::Edit}, - { Paste, "Paste", QT_TRANSLATE_NOOP3("KStandardShortcut", "Paste", "@action"), CTRL(V), SHIFT(Insert), QList<QKeySequence>(), false, Category::Edit }, - { PasteSelection, "Paste Selection", QT_TRANSLATE_NOOP3("KStandardShortcut", "Paste Selection", "@action"), CTRLSHIFT(Insert), 0, QList<QKeySequence>(), false, Category::Edit }, - - { SelectAll, "SelectAll", QT_TRANSLATE_NOOP3("KStandardShortcut", "Select All", "@action"), CTRL(A), 0, QList<QKeySequence>(), false, Category::Edit }, - { Deselect, "Deselect", QT_TRANSLATE_NOOP3("KStandardShortcut", "Deselect", "@action"), CTRLSHIFT(A), 0, QList<QKeySequence>(), false, Category::Edit }, - { DeleteWordBack, "DeleteWordBack", QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete Word Backwards", "@action"), CTRL(Backspace), 0, QList<QKeySequence>(), false, Category::Edit }, - { DeleteWordForward, "DeleteWordForward", QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete Word Forward", "@action"), CTRL(Delete), 0, QList<QKeySequence>(), false, Category::Edit }, - - { Find, "Find", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find", "@action"), CTRL(F), 0, QList<QKeySequence>(), false, Category::Edit }, - { FindNext, "FindNext", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find Next", "@action"), Qt::Key_F3, 0, QList<QKeySequence>(), false, Category::Edit }, - { FindPrev, "FindPrev", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find Prev", "@action"), SHIFT(F3), 0, QList<QKeySequence>(), false, Category::Edit }, - { Replace, "Replace", QT_TRANSLATE_NOOP3("KStandardShortcut", "Replace", "@action"), CTRL(R), 0, QList<QKeySequence>(), false, Category::Edit }, - -//Group Navigation - { Home, "Home", QT_TRANSLATE_NOOP3("KStandardShortcut", "Home", "@action Go to main page"), ALT(Home), Qt::Key_HomePage, QList<QKeySequence>(), false, Category::Navigation }, - { Begin, "Begin", QT_TRANSLATE_NOOP3("KStandardShortcut", "Begin", "@action Beginning of document"), CTRL(Home), 0, QList<QKeySequence>(), false, Category::Navigation }, - { End, "End", QT_TRANSLATE_NOOP3("KStandardShortcut", "End", "@action End of document"), CTRL(End), 0, QList<QKeySequence>(), false, Category::Navigation }, - { Prior, "Prior", QT_TRANSLATE_NOOP3("KStandardShortcut", "Prior", "@action"), Qt::Key_PageUp, 0, QList<QKeySequence>(), false, Category::Navigation }, - { Next, "Next", QT_TRANSLATE_NOOP3("KStandardShortcut", "Next", "@action Opposite to Prior"), Qt::Key_PageDown, 0, QList<QKeySequence>(), false, Category::Navigation }, - - { Up, "Up", QT_TRANSLATE_NOOP3("KStandardShortcut", "Up", "@action"), ALT(Up), 0, QList<QKeySequence>(), false, Category::Navigation }, - { Back, "Back", QT_TRANSLATE_NOOP3("KStandardShortcut", "Back", "@action"), ALT(Left), Qt::Key_Back, QList<QKeySequence>(), false, Category::Navigation }, - { Forward, "Forward", QT_TRANSLATE_NOOP3("KStandardShortcut", "Forward", "@action"), ALT(Right), Qt::Key_Forward, QList<QKeySequence>(), false, Category::Navigation }, - { Reload, "Reload", QT_TRANSLATE_NOOP3("KStandardShortcut", "Reload", "@action"), Qt::Key_F5, Qt::Key_Refresh, QList<QKeySequence>(), false, Category::Navigation }, - - { BeginningOfLine, "BeginningOfLine", QT_TRANSLATE_NOOP3("KStandardShortcut", "Beginning of Line", "@action"), Qt::Key_Home, 0, QList<QKeySequence>(), false, Category::Navigation }, - { EndOfLine, "EndOfLine", QT_TRANSLATE_NOOP3("KStandardShortcut", "End of Line", "@action"), Qt::Key_End, 0, QList<QKeySequence>(), false, Category::Navigation }, - { GotoLine, "GotoLine", QT_TRANSLATE_NOOP3("KStandardShortcut", "Go to Line", "@action"), CTRL(G), 0, QList<QKeySequence>(), false, Category::Navigation }, - { BackwardWord, "BackwardWord", QT_TRANSLATE_NOOP3("KStandardShortcut", "Backward Word", "@action"), CTRL(Left), 0, QList<QKeySequence>(), false, Category::Navigation }, - { ForwardWord, "ForwardWord", QT_TRANSLATE_NOOP3("KStandardShortcut", "Forward Word", "@action"), CTRL(Right), 0, QList<QKeySequence>(), false, Category::Navigation }, - - { AddBookmark, "AddBookmark", QT_TRANSLATE_NOOP3("KStandardShortcut", "Add Bookmark", "@action"), CTRL(B), 0, QList<QKeySequence>(), false, Category::Navigation }, - { ZoomIn, "ZoomIn", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom In", "@action"), CTRL(Plus), CTRL(Equal), QList<QKeySequence>(), false, Category::View }, - { ZoomOut, "ZoomOut", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom Out", "@action"), CTRL(Minus), 0, QList<QKeySequence>(), false, Category::View }, - { FullScreen, "FullScreen", QT_TRANSLATE_NOOP3("KStandardShortcut", "Full Screen Mode", "@action"), CTRLSHIFT(F), 0, QList<QKeySequence>(), false, Category::View }, - - { ShowMenubar, "ShowMenubar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Menu Bar", "@action"), CTRL(M), 0, QList<QKeySequence>(), false, Category::View }, - { TabNext, "Activate Next Tab", QT_TRANSLATE_NOOP3("KStandardShortcut", "Activate Next Tab", "@action"), CTRL(PageDown), CTRL(BracketRight), QList<QKeySequence>(), false, Category::Navigation }, - { TabPrev, "Activate Previous Tab", QT_TRANSLATE_NOOP3("KStandardShortcut", "Activate Previous Tab", "@action"), CTRL(PageUp), CTRL(BracketLeft), QList<QKeySequence>(), false, Category::Navigation }, - - //Group Help - { Help, "Help", QT_TRANSLATE_NOOP3("KStandardShortcut", "Help", "@action"), Qt::Key_F1, 0, QList<QKeySequence>(), false, Category::Help }, - { WhatsThis, "WhatsThis", QT_TRANSLATE_NOOP3("KStandardShortcut", "What's This", "@action"), SHIFT(F1), 0, QList<QKeySequence>(), false, Category::Help }, - -//Group TextCompletion - { TextCompletion, "TextCompletion", QT_TRANSLATE_NOOP3("KStandardShortcut", "Text Completion", "@action"), CTRL(E), 0, QList<QKeySequence>(), false, Category::Edit }, - { PrevCompletion, "PrevCompletion", QT_TRANSLATE_NOOP3("KStandardShortcut", "Previous Completion Match", "@action"), CTRL(Up), 0, QList<QKeySequence>(), false, Category::Edit }, - { NextCompletion, "NextCompletion", QT_TRANSLATE_NOOP3("KStandardShortcut", "Next Completion Match", "@action"), CTRL(Down), 0, QList<QKeySequence>(), false, Category::Edit }, - { SubstringCompletion, "SubstringCompletion", QT_TRANSLATE_NOOP3("KStandardShortcut", "Substring Completion", "@action"), CTRL(T), 0, QList<QKeySequence>(), false, Category::Edit }, - - { RotateUp, "RotateUp", QT_TRANSLATE_NOOP3("KStandardShortcut", "Previous Item in List", "@action"), Qt::Key_Up, 0, QList<QKeySequence>(), false, Category::Navigation }, - { RotateDown, "RotateDown", QT_TRANSLATE_NOOP3("KStandardShortcut", "Next Item in List", "@action"), Qt::Key_Down, 0, QList<QKeySequence>(), false, Category::Navigation }, - - { OpenRecent, "OpenRecent", QT_TRANSLATE_NOOP3("KStandardShortcut", "Open Recent", "@action"), 0, 0, QList<QKeySequence>(), false, Category::File }, - { SaveAs, "SaveAs", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save As", "@action"), CTRLSHIFT(S), 0, QList<QKeySequence>(), false, Category::File }, - { Revert, "Revert", QT_TRANSLATE_NOOP3("KStandardShortcut", "Revert", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit }, - { PrintPreview, "PrintPreview", QT_TRANSLATE_NOOP3("KStandardShortcut", "Print Preview", "@action"), 0, 0, QList<QKeySequence>(), false, Category::File }, - { Mail, "Mail", QT_TRANSLATE_NOOP3("KStandardShortcut", "Mail", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, - { Clear, "Clear", QT_TRANSLATE_NOOP3("KStandardShortcut", "Clear", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit }, - { ActualSize, "ActualSize", QT_TRANSLATE_NOOP3("KStandardShortcut", "Actual Size", "@action"), CTRL(0), 0, QList<QKeySequence>(), false, Category::View }, - { FitToPage, "FitToPage", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Page", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, - { FitToWidth, "FitToWidth", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Width", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, - { FitToHeight, "FitToHeight", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Height", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, - { Zoom, "Zoom", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, - { Goto, "Goto", QT_TRANSLATE_NOOP3("KStandardShortcut", "Goto", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Navigation }, - { GotoPage, "GotoPage", QT_TRANSLATE_NOOP3("KStandardShortcut", "Goto Page", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Navigation }, - { DocumentBack, "DocumentBack", QT_TRANSLATE_NOOP3("KStandardShortcut", "Document Back", "@action"), ALTSHIFT(Left), 0, QList<QKeySequence>(), false, Category::Navigation }, - { DocumentForward, "DocumentForward", QT_TRANSLATE_NOOP3("KStandardShortcut", "Document Forward", "@action"), ALTSHIFT(Right), 0, QList<QKeySequence>(), false, Category::Navigation }, - { EditBookmarks, "EditBookmarks", QT_TRANSLATE_NOOP3("KStandardShortcut", "Edit Bookmarks", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Navigation }, - { Spelling, "Spelling", QT_TRANSLATE_NOOP3("KStandardShortcut", "Spelling", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit }, - { ShowToolbar, "ShowToolbar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Toolbar", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, - { ShowStatusbar, "ShowStatusbar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Statusbar", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View }, + {Cut, "Cut", QT_TRANSLATE_NOOP3("KStandardShortcut", "Cut", "@action"), CTRL(X), SHIFT(Delete), QList<QKeySequence>(), false, Category::Edit}, + {Copy, "Copy", QT_TRANSLATE_NOOP3("KStandardShortcut", "Copy", "@action"), CTRL(C), CTRL(Insert), QList<QKeySequence>(), false, Category::Edit}, + {Paste, "Paste", QT_TRANSLATE_NOOP3("KStandardShortcut", "Paste", "@action"), CTRL(V), SHIFT(Insert), QList<QKeySequence>(), false, Category::Edit}, + {PasteSelection, + "Paste Selection", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Paste Selection", "@action"), + CTRLSHIFT(Insert), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + + {SelectAll, "SelectAll", QT_TRANSLATE_NOOP3("KStandardShortcut", "Select All", "@action"), CTRL(A), 0, QList<QKeySequence>(), false, Category::Edit}, + {Deselect, "Deselect", QT_TRANSLATE_NOOP3("KStandardShortcut", "Deselect", "@action"), CTRLSHIFT(A), 0, QList<QKeySequence>(), false, Category::Edit}, + {DeleteWordBack, + "DeleteWordBack", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete Word Backwards", "@action"), + CTRL(Backspace), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + {DeleteWordForward, + "DeleteWordForward", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete Word Forward", "@action"), + CTRL(Delete), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + + {Find, "Find", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find", "@action"), CTRL(F), 0, QList<QKeySequence>(), false, Category::Edit}, + {FindNext, "FindNext", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find Next", "@action"), Qt::Key_F3, 0, QList<QKeySequence>(), false, Category::Edit}, + {FindPrev, "FindPrev", QT_TRANSLATE_NOOP3("KStandardShortcut", "Find Prev", "@action"), SHIFT(F3), 0, QList<QKeySequence>(), false, Category::Edit}, + {Replace, "Replace", QT_TRANSLATE_NOOP3("KStandardShortcut", "Replace", "@action"), CTRL(R), 0, QList<QKeySequence>(), false, Category::Edit}, + + // Group Navigation + {Home, + "Home", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Home", "@action Go to main page"), + ALT(Home), + Qt::Key_HomePage, + QList<QKeySequence>(), + false, + Category::Navigation}, + {Begin, + "Begin", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Begin", "@action Beginning of document"), + CTRL(Home), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {End, "End", QT_TRANSLATE_NOOP3("KStandardShortcut", "End", "@action End of document"), CTRL(End), 0, QList<QKeySequence>(), false, Category::Navigation}, + {Prior, "Prior", QT_TRANSLATE_NOOP3("KStandardShortcut", "Prior", "@action"), Qt::Key_PageUp, 0, QList<QKeySequence>(), false, Category::Navigation}, + {Next, + "Next", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Next", "@action Opposite to Prior"), + Qt::Key_PageDown, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + + {Up, "Up", QT_TRANSLATE_NOOP3("KStandardShortcut", "Up", "@action"), ALT(Up), 0, QList<QKeySequence>(), false, Category::Navigation}, + {Back, "Back", QT_TRANSLATE_NOOP3("KStandardShortcut", "Back", "@action"), ALT(Left), Qt::Key_Back, QList<QKeySequence>(), false, Category::Navigation}, + {Forward, + "Forward", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Forward", "@action"), + ALT(Right), + Qt::Key_Forward, + QList<QKeySequence>(), + false, + Category::Navigation}, + {Reload, + "Reload", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Reload", "@action"), + Qt::Key_F5, + Qt::Key_Refresh, + QList<QKeySequence>(), + false, + Category::Navigation}, + + {BeginningOfLine, + "BeginningOfLine", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Beginning of Line", "@action"), + Qt::Key_Home, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {EndOfLine, + "EndOfLine", + QT_TRANSLATE_NOOP3("KStandardShortcut", "End of Line", "@action"), + Qt::Key_End, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {GotoLine, "GotoLine", QT_TRANSLATE_NOOP3("KStandardShortcut", "Go to Line", "@action"), CTRL(G), 0, QList<QKeySequence>(), false, Category::Navigation}, + {BackwardWord, + "BackwardWord", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Backward Word", "@action"), + CTRL(Left), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {ForwardWord, + "ForwardWord", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Forward Word", "@action"), + CTRL(Right), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + + {AddBookmark, + "AddBookmark", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Add Bookmark", "@action"), + CTRL(B), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {ZoomIn, "ZoomIn", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom In", "@action"), CTRL(Plus), CTRL(Equal), QList<QKeySequence>(), false, Category::View}, + {ZoomOut, "ZoomOut", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom Out", "@action"), CTRL(Minus), 0, QList<QKeySequence>(), false, Category::View}, + {FullScreen, + "FullScreen", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Full Screen Mode", "@action"), + CTRLSHIFT(F), + 0, + QList<QKeySequence>(), + false, + Category::View}, + + {ShowMenubar, "ShowMenubar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Menu Bar", "@action"), CTRL(M), 0, QList<QKeySequence>(), false, Category::View}, + {TabNext, + "Activate Next Tab", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Activate Next Tab", "@action"), + CTRL(PageDown), + CTRL(BracketRight), + QList<QKeySequence>(), + false, + Category::Navigation}, + {TabPrev, + "Activate Previous Tab", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Activate Previous Tab", "@action"), + CTRL(PageUp), + CTRL(BracketLeft), + QList<QKeySequence>(), + false, + Category::Navigation}, + + // Group Help + {Help, "Help", QT_TRANSLATE_NOOP3("KStandardShortcut", "Help", "@action"), Qt::Key_F1, 0, QList<QKeySequence>(), false, Category::Help}, + {WhatsThis, "WhatsThis", QT_TRANSLATE_NOOP3("KStandardShortcut", "What's This", "@action"), SHIFT(F1), 0, QList<QKeySequence>(), false, Category::Help}, + + // Group TextCompletion + {TextCompletion, + "TextCompletion", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Text Completion", "@action"), + CTRL(E), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + {PrevCompletion, + "PrevCompletion", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Previous Completion Match", "@action"), + CTRL(Up), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + {NextCompletion, + "NextCompletion", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Next Completion Match", "@action"), + CTRL(Down), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + {SubstringCompletion, + "SubstringCompletion", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Substring Completion", "@action"), + CTRL(T), + 0, + QList<QKeySequence>(), + false, + Category::Edit}, + + {RotateUp, + "RotateUp", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Previous Item in List", "@action"), + Qt::Key_Up, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {RotateDown, + "RotateDown", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Next Item in List", "@action"), + Qt::Key_Down, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + + {OpenRecent, "OpenRecent", QT_TRANSLATE_NOOP3("KStandardShortcut", "Open Recent", "@action"), 0, 0, QList<QKeySequence>(), false, Category::File}, + {SaveAs, "SaveAs", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save As", "@action"), CTRLSHIFT(S), 0, QList<QKeySequence>(), false, Category::File}, + {Revert, "Revert", QT_TRANSLATE_NOOP3("KStandardShortcut", "Revert", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit}, + {PrintPreview, "PrintPreview", QT_TRANSLATE_NOOP3("KStandardShortcut", "Print Preview", "@action"), 0, 0, QList<QKeySequence>(), false, Category::File}, + {Mail, "Mail", QT_TRANSLATE_NOOP3("KStandardShortcut", "Mail", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, + {Clear, "Clear", QT_TRANSLATE_NOOP3("KStandardShortcut", "Clear", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit}, + {ActualSize, "ActualSize", QT_TRANSLATE_NOOP3("KStandardShortcut", "Actual Size", "@action"), CTRL(0), 0, QList<QKeySequence>(), false, Category::View}, + {FitToPage, "FitToPage", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Page", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, + {FitToWidth, "FitToWidth", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Width", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, + {FitToHeight, "FitToHeight", QT_TRANSLATE_NOOP3("KStandardShortcut", "Fit To Height", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, + {Zoom, "Zoom", QT_TRANSLATE_NOOP3("KStandardShortcut", "Zoom", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, + {Goto, "Goto", QT_TRANSLATE_NOOP3("KStandardShortcut", "Goto", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Navigation}, + {GotoPage, "GotoPage", QT_TRANSLATE_NOOP3("KStandardShortcut", "Goto Page", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Navigation}, + {DocumentBack, + "DocumentBack", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Document Back", "@action"), + ALTSHIFT(Left), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {DocumentForward, + "DocumentForward", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Document Forward", "@action"), + ALTSHIFT(Right), + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {EditBookmarks, + "EditBookmarks", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Edit Bookmarks", "@action"), + 0, + 0, + QList<QKeySequence>(), + false, + Category::Navigation}, + {Spelling, "Spelling", QT_TRANSLATE_NOOP3("KStandardShortcut", "Spelling", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Edit}, + {ShowToolbar, "ShowToolbar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Toolbar", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, + {ShowStatusbar, "ShowStatusbar", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show Statusbar", "@action"), 0, 0, QList<QKeySequence>(), false, Category::View}, #if KCONFIGGUI_BUILD_DEPRECATED_SINCE(5, 39) - { SaveOptions, "SaveOptions", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save Options", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings }, + {SaveOptions, "SaveOptions", QT_TRANSLATE_NOOP3("KStandardShortcut", "Save Options", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings}, #else // dummy entry - { SaveOptions_DEPRECATED_DO_NOT_USE, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory }, + {SaveOptions_DEPRECATED_DO_NOT_USE, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory}, #endif - { KeyBindings, "KeyBindings", QT_TRANSLATE_NOOP3("KStandardShortcut", "Key Bindings", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings }, - { Preferences, "Preferences", QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Application", "@action"), CTRLSHIFT(Comma), 0, QList<QKeySequence>(), false, Category::Settings }, - { ConfigureToolbars, "ConfigureToolbars", QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Toolbars", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings }, - { ConfigureNotifications, "ConfigureNotifications", QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Notifications", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings }, - { TipofDay, "TipofDay", QT_TRANSLATE_NOOP3("KStandardShortcut", "Tip Of Day", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, - { ReportBug, "ReportBug", QT_TRANSLATE_NOOP3("KStandardShortcut", "Report Bug", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, - { SwitchApplicationLanguage, "SwitchApplicationLanguage", QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Language...", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings }, - { AboutApp, "AboutApp", QT_TRANSLATE_NOOP3("KStandardShortcut", "About Application", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, - { AboutKDE, "AboutKDE", QT_TRANSLATE_NOOP3("KStandardShortcut", "About KDE", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, + {KeyBindings, "KeyBindings", QT_TRANSLATE_NOOP3("KStandardShortcut", "Key Bindings", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Settings}, + {Preferences, + "Preferences", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Application", "@action"), + CTRLSHIFT(Comma), + 0, + QList<QKeySequence>(), + false, + Category::Settings}, + {ConfigureToolbars, + "ConfigureToolbars", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Toolbars", "@action"), + 0, + 0, + QList<QKeySequence>(), + false, + Category::Settings}, + {ConfigureNotifications, + "ConfigureNotifications", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Notifications", "@action"), + 0, + 0, + QList<QKeySequence>(), + false, + Category::Settings}, + {TipofDay, "TipofDay", QT_TRANSLATE_NOOP3("KStandardShortcut", "Tip Of Day", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, + {ReportBug, "ReportBug", QT_TRANSLATE_NOOP3("KStandardShortcut", "Report Bug", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, + {SwitchApplicationLanguage, + "SwitchApplicationLanguage", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Configure Language...", "@action"), + 0, + 0, + QList<QKeySequence>(), + false, + Category::Settings}, + {AboutApp, "AboutApp", QT_TRANSLATE_NOOP3("KStandardShortcut", "About Application", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, + {AboutKDE, "AboutKDE", QT_TRANSLATE_NOOP3("KStandardShortcut", "About KDE", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, // Both "Cut" and "Delete" use Shift+Delete, but this is okay; see // https://commits.kde.org/kxmlgui/8eabbf6725386e716b7536c71a9181dfe5d959f0 - { DeleteFile, "DeleteFile", QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete", "@action"), SHIFT(Delete), 0, QList<QKeySequence>(), false, Category::File }, - { RenameFile, "RenameFile", QT_TRANSLATE_NOOP3("KStandardShortcut", "Rename", "@action"), Qt::Key_F2, 0, QList<QKeySequence>(), false, Category::File }, - { MoveToTrash, "MoveToTrash", QT_TRANSLATE_NOOP3("KStandardShortcut", "Move to Trash", "@action"), Qt::Key_Delete, 0, QList<QKeySequence>(), false, Category::File }, - { Donate, "Donate", QT_TRANSLATE_NOOP3("KStandardShortcut", "Donate", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help }, - { ShowHideHiddenFiles, "ShowHideHiddenFiles", QT_TRANSLATE_NOOP3("KStandardShortcut", "Show/Hide Hidden Files", "@action"), CTRL(H), ALT(Period), QList<QKeySequence>(), false, Category::View }, - { CreateFolder, "CreateFolder", QT_TRANSLATE_NOOP3("KStandardShortcut", "Create Folder", "@action"), Qt::Key_F10, 0, QList<QKeySequence>(), false, Category::File }, - - //dummy entry to catch simple off-by-one errors. Insert new entries before this line. - { AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory } -}; + {DeleteFile, "DeleteFile", QT_TRANSLATE_NOOP3("KStandardShortcut", "Delete", "@action"), SHIFT(Delete), 0, QList<QKeySequence>(), false, Category::File}, + {RenameFile, "RenameFile", QT_TRANSLATE_NOOP3("KStandardShortcut", "Rename", "@action"), Qt::Key_F2, 0, QList<QKeySequence>(), false, Category::File}, + {MoveToTrash, + "MoveToTrash", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Move to Trash", "@action"), + Qt::Key_Delete, + 0, + QList<QKeySequence>(), + false, + Category::File}, + {Donate, "Donate", QT_TRANSLATE_NOOP3("KStandardShortcut", "Donate", "@action"), 0, 0, QList<QKeySequence>(), false, Category::Help}, + {ShowHideHiddenFiles, + "ShowHideHiddenFiles", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Show/Hide Hidden Files", "@action"), + CTRL(H), + ALT(Period), + QList<QKeySequence>(), + false, + Category::View}, + {CreateFolder, + "CreateFolder", + QT_TRANSLATE_NOOP3("KStandardShortcut", "Create Folder", "@action"), + Qt::Key_F10, + 0, + QList<QKeySequence>(), + false, + Category::File}, + + // dummy entry to catch simple off-by-one errors. Insert new entries before this line. + {AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false, Category::InvalidCategory}}; /** Search for the KStandardShortcutInfo object associated with the given @p id. Return a dummy entry with no name and an empty shortcut if @p id is invalid. */ static KStandardShortcutInfo *guardedStandardShortcutInfo(StandardShortcut id) { - if (id >= static_cast<int>(sizeof(g_infoStandardShortcut) / sizeof(KStandardShortcutInfo)) || - id < 0) { + if (id >= static_cast<int>(sizeof(g_infoStandardShortcut) / sizeof(KStandardShortcutInfo)) || id < 0) { qWarning() << "KStandardShortcut: id not found!"; return &g_infoStandardShortcut[AccelNone]; } else { @@ -190,7 +414,6 @@ static KStandardShortcutInfo *guardedStandardShortcutInfo(StandardShortcut id) } } - // Sanitize the list for duplicates. For some reason some // people have kdeglobals entries like // Close=Ctrl+W; Ctrl+Esc; Ctrl+W; Ctrl+Esc; @@ -278,18 +501,16 @@ QString name(StandardShortcut id) QString label(StandardShortcut id) { KStandardShortcutInfo *info = guardedStandardShortcutInfo(id); - return QCoreApplication::translate("KStandardShortcut", - info->description.text, - info->description.context); + return QCoreApplication::translate("KStandardShortcut", info->description.text, info->description.context); } // TODO: Add psWhatsThis entry to KStandardShortcutInfo QString whatsThis(StandardShortcut /*id*/) { -// KStandardShortcutInfo* info = guardedStandardShortcutInfo( id ); -// if( info && info->whatsThis ) -// return i18n(info->whatsThis); -// else + // KStandardShortcutInfo* info = guardedStandardShortcutInfo( id ); + // if( info && info->whatsThis ) + // return i18n(info->whatsThis); + // else return QString(); } @@ -326,7 +547,6 @@ StandardShortcut find(const QKeySequence &seq) return AccelNone; } - #if KCONFIGGUI_BUILD_DEPRECATED_SINCE(5, 71) StandardShortcut find(const char *keyName) { @@ -342,7 +562,6 @@ StandardShortcut find(const char *keyName) StandardShortcut findByName(const QString &name) { - for (const KStandardShortcutInfo &shortcutInfo : g_infoStandardShortcut) { if (QString::fromLatin1(shortcutInfo.name) == name) { return shortcutInfo.id; diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h index 3757a593..6ffbeed6 100644 --- a/src/gui/kstandardshortcut.h +++ b/src/gui/kstandardshortcut.h @@ -9,8 +9,8 @@ #ifndef KSTANDARDSHORTCUT_H #define KSTANDARDSHORTCUT_H -#include <QString> #include <QKeySequence> +#include <QString> #include <kconfiggui_export.h> @@ -42,8 +42,8 @@ namespace KStandardShortcut * Defines the identifier of all standard accelerators. */ enum StandardShortcut { - //C++ requires that the value of an enum symbol be one more than the previous one. - //This means that everything will be well-ordered from here on. + // C++ requires that the value of an enum symbol be one more than the previous one. + // This means that everything will be well-ordered from here on. AccelNone = 0, // File menu Open, ///< Open file. diff --git a/src/gui/kwindowconfig.cpp b/src/gui/kwindowconfig.cpp index 4f3ac73a..a7697782 100644 --- a/src/gui/kwindowconfig.cpp +++ b/src/gui/kwindowconfig.cpp @@ -37,7 +37,7 @@ static QString allConnectedScreens() static QString configFileString(const QRect &desk, const QString &key) { // We include resolution data to also save data on a per-resolution basis - const QString returnString = QStringLiteral("%1 %2 %3x%4").arg(allConnectedScreens()).arg(key).arg(desk.width()).arg(desk.height()); + const QString returnString = QStringLiteral("%1 %2 %3x%4").arg(allConnectedScreens()).arg(key).arg(desk.width()).arg(desk.height()); return returnString; } @@ -67,7 +67,6 @@ static QString windowYPositionString(const QRect &desk) return configFileString(desk, QStringLiteral("YPosition")); } - void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, KConfigGroup::WriteConfigFlags options) { // QWindow::screen() shouldn't return null, but it sometimes does due to bugs. @@ -97,7 +96,6 @@ void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, } else { config.writeEntry(screenMaximizedString(desk), isMaximized, options); } - } void KWindowConfig::restoreWindowSize(QWindow *window, const KConfigGroup &config) diff --git a/src/gui/kwindowconfig.h b/src/gui/kwindowconfig.h index 4bb56e12..3c18c0a7 100644 --- a/src/gui/kwindowconfig.h +++ b/src/gui/kwindowconfig.h @@ -54,7 +54,7 @@ KCONFIGGUI_EXPORT void saveWindowSize(const QWindow *window, KConfigGroup &confi * @param config The config group to read from. * @since 5.0. */ -KCONFIGGUI_EXPORT void restoreWindowSize(QWindow *window, const KConfigGroup &config); +KCONFIGGUI_EXPORT void restoreWindowSize(QWindow *window, const KConfigGroup &config); /** * Saves the window's position either to the global or application config file. @@ -81,6 +81,6 @@ KCONFIGGUI_EXPORT void saveWindowPosition(const QWindow *window, KConfigGroup &c * @param config The config group to read from. * @since 5.74 */ -KCONFIGGUI_EXPORT void restoreWindowPosition(QWindow *window, const KConfigGroup &config); +KCONFIGGUI_EXPORT void restoreWindowPosition(QWindow *window, const KConfigGroup &config); } #endif // KWINDOWCONFIG_H |