Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: setup conflict detection in KShortcutsEditor

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-24 22:00:07 +03:00
parent f9fdbc6a7e
commit e7abdd765f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kdeui/dialogs/kshortcutseditor.cpp
View file

@ -159,16 +159,25 @@ void KShortcutsEditor::addCollection(KActionCollection *collection, const QStrin
actionitem->setText(0, action->iconText());
if (d->actionTypes & KShortcutsEditor::LocalAction) {
KKeySequenceWidget* localkswidget = new KKeySequenceWidget(d->treewidget);
localkswidget->setKeySequence(action->shortcut());
localkswidget->setModifierlessAllowed(d->allowLetterShortcuts);
localkswidget->setCheckForConflictsAgainst(
KKeySequenceWidget::LocalShortcuts | KKeySequenceWidget::StandardShortcuts
);
localkswidget->setCheckActionCollections(d->actionCollections);
localkswidget->setKeySequence(action->shortcut());
d->treewidget->setItemWidget(actionitem, 1, localkswidget);
}
if (d->actionTypes & KShortcutsEditor::GlobalAction) {
KAction* kaction = qobject_cast<KAction*>(action);
if (kaction) {
KKeySequenceWidget* globalkswidget = new KKeySequenceWidget(d->treewidget);
globalkswidget->setKeySequence(kaction->globalShortcut());
globalkswidget->setModifierlessAllowed(d->allowLetterShortcuts);
globalkswidget->setCheckForConflictsAgainst(
KKeySequenceWidget::LocalShortcuts | KKeySequenceWidget::GlobalShortcuts
| KKeySequenceWidget::StandardShortcuts
);
globalkswidget->setCheckActionCollections(d->actionCollections);
globalkswidget->setKeySequence(kaction->globalShortcut());
d->treewidget->setItemWidget(actionitem, 2, globalkswidget);
} else {
kWarning() << "action is not KAction" << action;