yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix shortcut extrapolation

Browse source 
NativeText is translated (ie. matching
ctrl against eg. strg) and the shortcut
must be added to KGlobalAccel to feed
further extrapolations

BUG: 338579
REVIEW: 119949
This commit is contained in:
Thomas Lübking 2014-08-26 23:39:26 +02:00
parent 32dbb57618
commit c8abd56a2f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kcmkwin/kwindesktop/main.cpp
View file

@ -431,7 +431,7 @@ QString KWinDesktopConfig::extrapolatedShortcut(int desktop) const
}
QString before;
if (!shortcuts.isEmpty()) {
before = shortcuts.first().toString(QKeySequence::NativeText);
before = shortcuts.first().toString(QKeySequence::PortableText);
}
QString seq;
@ -494,8 +494,8 @@ void KWinDesktopConfig::slotChangeShortcuts(int number)
m_ui->messageLabel->show();
} else {
QKeySequence shortcut(shortcutString);
if (!shortcut.isEmpty() || KGlobalAccel::self()->isGlobalShortcutAvailable(shortcut)) {
KGlobalAccel::self()->setShortcut(action, QList<QKeySequence>(), KGlobalAccel::NoAutoloading);
if (!shortcut.isEmpty() && KGlobalAccel::self()->isGlobalShortcutAvailable(shortcut)) {
KGlobalAccel::self()->setShortcut(action, QList<QKeySequence>() << shortcut, KGlobalAccel::NoAutoloading);
m_ui->messageLabel->setText(i18n("Assigned global Shortcut \"%1\" to Desktop %2", shortcutString, desktop));
m_ui->messageLabel->show();
} else {