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

KWin/VirtualDesktops ported to new global shortcut system

Browse source 
No more Kaction, no more KShortcut.
This commit is contained in:
Martin Gräßlin 2013-09-06 10:52:47 +02:00
parent f4a96da547
commit 2e1f028210
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
virtualdesktops.cpp
View file

@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KAction> #include <KDE/KAction>
#include <KDE/KActionCollection> #include <KDE/KActionCollection>
#include <KDE/KConfigGroup> #include <KDE/KConfigGroup>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString> #include <KDE/KLocalizedString>
#include <KDE/KShortcut>
#include <KDE/NETRootInfo> #include <KDE/NETRootInfo>
namespace KWin { namespace KWin {
@ -437,33 +437,29 @@ void VirtualDesktopManager::initSwitchToShortcuts(KActionCollection *keys)
{ {
const QString toDesktop = QStringLiteral("Switch to Desktop %1"); const QString toDesktop = QStringLiteral("Switch to Desktop %1");
const KLocalizedString toDesktopLabel = ki18n("Switch to Desktop %1"); const KLocalizedString toDesktopLabel = ki18n("Switch to Desktop %1");
addAction(keys, toDesktop, toDesktopLabel, 1, KShortcut(Qt::CTRL + Qt::Key_F1), SLOT(slotSwitchTo())); addAction(keys, toDesktop, toDesktopLabel, 1, QKeySequence(Qt::CTRL + Qt::Key_F1), SLOT(slotSwitchTo()));
addAction(keys, toDesktop, toDesktopLabel, 2, KShortcut(Qt::CTRL + Qt::Key_F2), SLOT(slotSwitchTo())); addAction(keys, toDesktop, toDesktopLabel, 2, QKeySequence(Qt::CTRL + Qt::Key_F2), SLOT(slotSwitchTo()));
addAction(keys, toDesktop, toDesktopLabel, 3, KShortcut(Qt::CTRL + Qt::Key_F3), SLOT(slotSwitchTo())); addAction(keys, toDesktop, toDesktopLabel, 3, QKeySequence(Qt::CTRL + Qt::Key_F3), SLOT(slotSwitchTo()));
addAction(keys, toDesktop, toDesktopLabel, 4, KShortcut(Qt::CTRL + Qt::Key_F4), SLOT(slotSwitchTo())); addAction(keys, toDesktop, toDesktopLabel, 4, QKeySequence(Qt::CTRL + Qt::Key_F4), SLOT(slotSwitchTo()));
for (uint i = 5; i <= maximum(); ++i) { for (uint i = 5; i <= maximum(); ++i) {
addAction(keys, toDesktop, toDesktopLabel, i, KShortcut(), SLOT(slotSwitchTo())); addAction(keys, toDesktop, toDesktopLabel, i, QKeySequence(), SLOT(slotSwitchTo()));
} }
} }
void VirtualDesktopManager::addAction(KActionCollection *keys, const QString &name, const KLocalizedString &label, uint value, const KShortcut &key, const char *slot) void VirtualDesktopManager::addAction(KActionCollection *keys, const QString &name, const KLocalizedString &label, uint value, const QKeySequence &key, const char *slot)
{ {
QAction *a = keys->addAction(name.arg(value), this, slot); QAction *a = keys->addAction(name.arg(value), this, slot);
a->setText(label.subs(value).toString()); a->setText(label.subs(value).toString());
#if KWIN_QT5_PORTING
a->setGlobalShortcut(key);
#endif
a->setData(value); a->setData(value);
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << key);
} }
void VirtualDesktopManager::addAction(KActionCollection *keys, const QString &name, const QString &label, const char *slot) void VirtualDesktopManager::addAction(KActionCollection *keys, const QString &name, const QString &label, const char *slot)
{ {
QAction *a = keys->addAction(name, this, slot); QAction *a = keys->addAction(name, this, slot);
#if KWIN_QT5_PORTING
a->setGlobalShortcut(KShortcut());
#endif
a->setText(label); a->setText(label);
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>());
} }
void VirtualDesktopManager::slotSwitchTo() void VirtualDesktopManager::slotSwitchTo()

3
virtualdesktops.h
View file

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
class KActionCollection; class KActionCollection;
class KLocalizedString; class KLocalizedString;
class KShortcut;
class NETRootInfo; class NETRootInfo;
namespace KWin { namespace KWin {
@ -341,7 +340,7 @@ private:
* @param key The global shortcut for the action * @param key The global shortcut for the action
* @param slot The slot to invoke when the action is triggered * @param slot The slot to invoke when the action is triggered
**/ **/
void addAction(KActionCollection *keys, const QString &name, const KLocalizedString &label, uint value, const KShortcut &key, const char *slot); void addAction(KActionCollection *keys, const QString &name, const KLocalizedString &label, uint value, const QKeySequence &key, const char *slot);
/** /**
* Creates an action and connects it to the @p slot in this Manager. * Creates an action and connects it to the @p slot in this Manager.
* Overloaded method for the case that no additional value needs to be passed to the action and * Overloaded method for the case that no additional value needs to be passed to the action and