add previous screen shortcuts

REVIEW: 110521
BUG: 303083
FIXED-IN: 4.11
icc-effect-5.14.5
Thomas Lübking 2013-05-19 14:23:49 +02:00
parent b3d8ce9044
commit f2dd6d02b1
3 changed files with 18 additions and 1 deletions

View File

@ -151,6 +151,7 @@ for (int i = 0; i < 8; ++i) {
DEF3(I18N_NOOP("Window to Screen %1"), 0, slotWindowToScreen(), i);
}
DEF(I18N_NOOP("Window to Next Screen"), 0, slotWindowToNextScreen());
DEF(I18N_NOOP("Window to Previous Screen"), 0, slotWindowToPrevScreen());
DEF(I18N_NOOP("Show Desktop"), 0, slotToggleShowDesktop());
for (int i = 0; i < 8; ++i) {
@ -158,13 +159,14 @@ for (int i = 0; i < 8; ++i) {
}
DEF(I18N_NOOP("Switch to Next Screen"), 0, slotSwitchToNextScreen());
DEF(I18N_NOOP("Switch to Previous Screen"), 0, slotSwitchToPrevScreen());
a = actionCollection->addAction("Group:Miscellaneous");
a->setText(i18n("Miscellaneous"));
DEF(I18N_NOOP("Kill Window"), Qt::CTRL + Qt::ALT + Qt::Key_Escape, slotKillWindow());
DEF(I18N_NOOP("Block Global Shortcuts"), 0, slotDisableGlobalShortcuts());
DEF(I18N_NOOP("Suspend Compositing"), Qt::SHIFT + Qt::ALT + Qt::Key_F12, slotToggleCompositing());
DEF(I18N_NOOP("Invert Screen Colors"), 0, slotInvertScreen());
DEF(I18N_NOOP("Invert Screen Colors"), 0, slotInvertScreen());
#undef DEF
#undef DEF2

View File

@ -1415,6 +1415,13 @@ void Workspace::slotSwitchToNextScreen()
setCurrentScreen((screens()->current() + 1) % screens()->count());
}
void Workspace::slotSwitchToPrevScreen()
{
if (screenSwitchImpossible())
return;
setCurrentScreen((screens()->current() + screens()->count() - 1) % screens()->count());
}
void Workspace::slotWindowToScreen()
{
if (USABLE_ACTIVE_CLIENT) {
@ -1433,6 +1440,12 @@ void Workspace::slotWindowToNextScreen()
sendClientToScreen(active_client, (active_client->screen() + 1) % screens()->count());
}
void Workspace::slotWindowToPrevScreen()
{
if (USABLE_ACTIVE_CLIENT)
sendClientToScreen(active_client, (active_client->screen() + screens()->count() - 1) % screens()->count());
}
/*!
Maximizes the popup client
*/

View File

@ -305,6 +305,8 @@ public slots:
void slotWindowToScreen();
void slotSwitchToNextScreen();
void slotWindowToNextScreen();
void slotSwitchToPrevScreen();
void slotWindowToPrevScreen();
void slotToggleShowDesktop();
void slotWindowMaximize();