diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-26 20:28:13 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-04-26 20:28:13 +0000 |
| commit | aec22304b3293d7b1f9f554c74b735fc1593479f (patch) | |
| tree | 000980219f9a306fe447a5e5dcc0f22d2e4679c8 | |
| parent | e76365263cfea56e02e17e31f555abb918a1b177 (diff) | |
| download | qmmp-aec22304b3293d7b1f9f554c74b735fc1593479f.tar.gz qmmp-aec22304b3293d7b1f9f554c74b735fc1593479f.tar.bz2 qmmp-aec22304b3293d7b1f9f554c74b735fc1593479f.zip | |
show shortcuts in context menus (QTBUG-69452)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8794 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Ui/qsui/actionmanager.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/actionmanager.cpp | 3 | ||||
| -rw-r--r-- | src/qmmpui/uihelper.cpp | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 5e7eb8977..51399d1ca 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -147,6 +147,9 @@ ActionManager* ActionManager::instance() QAction *ActionManager::createAction(QString name, QString confKey, QString key, QString iconName) { QAction *action = new QAction(name, this); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + action->setShortcutVisibleInContextMenu(true); +#endif action->setShortcut(m_settings->value(confKey, key).toString()); action->setObjectName(confKey); action->setProperty("defaultShortcut", key); @@ -219,6 +222,9 @@ void ActionManager::registerAction(int id, QAction *action, QString confKey, QSt action->setShortcut(settings.value(confKey, key).toString()); action->setProperty("defaultShortcut", key); action->setObjectName(confKey); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + action->setShortcutVisibleInContextMenu(true); +#endif m_actions[id] = action; settings.endGroup(); } diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp index 02158089c..8ee1fb667 100644 --- a/src/plugins/Ui/skinned/actionmanager.cpp +++ b/src/plugins/Ui/skinned/actionmanager.cpp @@ -139,6 +139,9 @@ ActionManager* ActionManager::instance() QAction *ActionManager::createAction(QString name, QString confKey, QString key, QString iconName) { QAction *action = new QAction(name, this); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + action->setShortcutVisibleInContextMenu(true); +#endif action->setShortcut(m_settings->value(confKey, key).toString()); action->setProperty("defaultShortcut", key); action->setObjectName(confKey); diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp index 5ae9e9184..0aadd0b24 100644 --- a/src/qmmpui/uihelper.cpp +++ b/src/qmmpui/uihelper.cpp @@ -71,7 +71,12 @@ void UiHelper::addAction(QAction *action, MenuType type) connect(action, SIGNAL(destroyed (QObject *)), SLOT(removeAction(QObject*))); if(!m_menus[type].actions.contains(action)) + { m_menus[type].actions.append(action); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + action->setShortcutVisibleInContextMenu(true); +#endif + } if(m_menus[type].menu && !m_menus[type].menu->actions().contains(action)) { if(m_menus[type].before) |