Commit graph

114 commits

Author SHA1 Message Date
Luboš Luňák
532449c852 svn merge r568236,r568494,r568780,r599652,r599655 from trunk
(global shortcuts fixes)


svn path=/branches/work/kwin_composite/; revision=600169
2006-10-29 19:40:24 +00:00
Luboš Luňák
9cfa570153 merge in r568494 from trunk
svn path=/branches/work/kwin_composite/; revision=590656
2006-09-30 15:47:41 +00:00
Luboš Luňák
1da60d2ecd Be explicit about the screenshots being in clipboard
CCBUG: 131789


svn path=/trunk/KDE/kdebase/workspace/; revision=569382
2006-08-03 17:32:36 +00:00
Luboš Luňák
1d97935a44 Hardcode only 3-modifiers shortcuts in the code, the rest should
be in kcontrol/keys schemes.
(http://lists.kde.org/?l=kde-core-devel&m=115445034006353&w=2)


svn path=/trunk/KDE/kdebase/workspace/; revision=568780
2006-08-02 09:20:29 +00:00
Luboš Luňák
1bb6e17c54 KGlobalAccel has no longer the hack that maps numbered
keys to a slot with int argument.


svn path=/trunk/KDE/kdebase/workspace/; revision=568494
2006-08-01 11:50:10 +00:00
Luboš Luňák
bffa0d7909 setGlobalShortcut() for global shortcuts
svn path=/trunk/KDE/kdebase/workspace/; revision=568236
2006-07-31 15:16:07 +00:00
Hamish Rodda
77bc9cd63d Merging in from bleeding edge kdebase branch
- i18n ported
- KAccel removed
- Some fixes for OS X

svn path=/trunk/KDE/kdebase/workspace/; revision=528190
2006-04-10 11:57:13 +00:00
Laurent Montel
a48328e5bc QString::null->QString()
.clear()
etc

svn path=/trunk/KDE/kdebase/workspace/; revision=493536
2006-01-02 16:27:55 +00:00
Frank Osterfeld
776dc6395e make it compile
CCMAIL: ben@meyerhome.net

svn path=/trunk/KDE/kdebase/workspace/; revision=473125
2005-10-22 18:13:37 +00:00
Frank Osterfeld
120e3625fd remove second KShortcut argument where it was empty or just duplicated
svn path=/trunk/KDE/kdebase/workspace/; revision=473045
2005-10-22 13:16:46 +00:00
Luboš Luňák
e01631784e Don't use Ctrl+Tab by default, apps use it for tabs, and I don't
think many people use this action anyway.


svn path=/trunk/KDE/kdebase/workspace/; revision=459875
2005-09-12 09:36:20 +00:00
Caleb Tennis
c2a652657a Prefer using Qt::META over KKey::QtWIN
svn path=/trunk/KDE/kdebase/workspace/; revision=457843
2005-09-06 19:10:22 +00:00
Luboš Luňák
512fb17a95 Forward port of .
svn path=/trunk/KDE/kdebase/kwin/; revision=442363
2005-08-02 13:25:20 +00:00
Stephan Kulow
b464518b3c svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057
svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase
          .

I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts

svn path=/trunk/KDE/kdebase/kwin/; revision=439627
2005-07-28 14:59:42 +00:00
Luboš Luňák
a062f627ed Change the order of the shortcuts to Right,Left right with the other actions.
BUG: 104618

svn path=/trunk/kdebase/kwin/; revision=408150
2005-04-27 11:39:52 +00:00
Luboš Luňák
65c3b55e05 Revert last revert, dynamic keybidings are back in.
svn path=/trunk/kdebase/kwin/; revision=377118
2005-01-10 09:56:21 +00:00
Luboš Luňák
c7d0776f01 Revert last changes because of temporary freeze.
svn path=/trunk/kdebase/kwin/; revision=375467
2005-01-04 14:57:42 +00:00
Luboš Luňák
d04ce83410 Custom shortcuts for windows (). It still needs some testing, window
rules for them to be assigned automatically, and some way to indicate
every window's shortcut, but it more or less works.

svn path=/trunk/kdebase/kwin/; revision=375458
2005-01-04 14:24:55 +00:00
Luboš Luňák
43e7580cf0 Shortcuts for moving a window to left/right/up/down.
CCMAIL: 87411-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=348524
2004-09-22 16:49:41 +00:00
Luboš Luňák
9ef40c1845 Lift number of maximum virtual desktops to 20 ().
svn path=/trunk/kdebase/kwin/; revision=328696
2004-07-13 13:38:15 +00:00
Luboš Luňák
2e1bd0e762 I forgot to #undef one #define.
svn path=/trunk/kdebase/kwin/; revision=270837
2003-12-02 18:14:56 +00:00
Stephan Binner
c07ab48f67 CVS_SILENT style guide fixes
svn path=/trunk/kdebase/kwin/; revision=262402
2003-10-27 09:51:27 +00:00
Luboš Luňák
b9323cd4b2 Don't use Tarzan-like speech for the shortcut descriptions.
CCMAIL: Malcolm Hunter <malcolm.hunter@gmx.co.uk>
Could somebody please proofread it? Thanks

svn path=/trunk/kdebase/kwin/; revision=261529
2003-10-24 09:07:27 +00:00
Luboš Luňák
423d9c1066 *sigh*, ok, reverting r1.39.
svn path=/trunk/kdebase/kwin/; revision=254861
2003-09-29 13:40:25 +00:00
Luboš Luňák
703ea3989f Let's have keyboard shortcut for activating windows demanding attention
by default - Ctrl+Alt+A.

svn path=/trunk/kdebase/kwin/; revision=254819
2003-09-29 11:24:23 +00:00
Luboš Luňák
937c7ae491 Let's add some default shortcuts for window moving.
svn path=/trunk/kdebase/kwin/; revision=254807
2003-09-29 11:18:45 +00:00
Luboš Luňák
affe6e19cc Keyboard shortcut for turning off the border.
svn path=/trunk/kdebase/kwin/; revision=251809
2003-09-17 10:57:28 +00:00
Luboš Luňák
10f405c73d Merging kwin core from kwin_iii back to HEAD.
svn path=/trunk/kdebase/kwin/; revision=251608
2003-09-16 19:28:03 +00:00
Luboš Luňák
336667733e keyboard shortcuts for always-on-top & on-all-desktops
().

svn path=/trunk/kdebase/kwin/; revision=194462
2002-12-17 16:09:08 +00:00
Ellis Whitehead
de6b166a8e Use qt keycodes instead of strings when constructing the global shortcuts.
This way they get compile-time checked and the relatively expensive string to key conversion is skipped.

svn path=/trunk/kdebase/kwin/; revision=139253
2002-02-27 21:35:22 +00:00
Ellis Whitehead
710fa4df1b Use "Win" instead of "Meta"
Convert a few more strings to Qt key codes

svn path=/trunk/kdebase/kwin/; revision=135620
2002-02-09 17:01:03 +00:00
Malcolm Hunter
53a8540917 CVS_SILENT Corrected typographical errors
svn path=/trunk/kdebase/kwin/; revision=133463
2002-01-24 00:11:03 +00:00
Ellis Whitehead
67dd67ea61 insertAction() => insert()
svn path=/trunk/kdebase/kwin/; revision=132460
2002-01-19 04:42:35 +00:00
Lukáš Tinkl
7b78ea9f05 unbreak the bindings translation
translators will love you, Ellis :)

svn path=/trunk/kdebase/kwin/; revision=131767
2002-01-15 09:35:26 +00:00
Ellis Whitehead
6f7dcd107b Pass null help string to insertAction()
svn path=/trunk/kdebase/kwin/; revision=126544
2001-12-11 04:42:24 +00:00
Ellis Whitehead
f8cf0c3b7d Fractionally reduce overhead when creating global shortcuts.
svn path=/trunk/kdebase/kwin/; revision=125309
2001-12-03 07:10:27 +00:00
Andreas Beckermann
148b88256e - DEF( "Switch to Previous Desktop", "", "", slotSwitchDesktopPrev() );
+	DEF( "Switch to Previous Desktop", "", "", slotSwitchDesktopPrevious() );

svn path=/trunk/kdebase/kwin/; revision=123848
2001-11-23 17:35:53 +00:00
Ellis Whitehead
e2997d6bc4 Lots and lots and lots of changes all over the place for shortcut changes. Including new KAccel and KGlobalAccel classes.
svn path=/trunk/kdebase/kcontrol/; revision=122759
2001-11-16 23:21:43 +00:00
Ellis Whitehead
d06f2faa12 Index: kwinbindings.cpp
===================================================================
- keys->insertItem(i18n("Window Close (All)"), "Window close all", KKey("ALT+Ctrl+F4"), KKey("Alt+Ctrl+Escape"));
+ keys->insertItem(i18n("Window Close (All)"), "Window close all", KKey("ALT+Shift+F4"), KKey("Alt+Shift+Escape"));
- keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey("Alt+Print"));
+ keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Alt+Print"), KKey("Alt+Print"));
Index: kdesktop/kdesktopbindings.cpp
===================================================================
- keys->insertItem(i18n("Show Taskmanager"), "Show taskmanager", KKey("CTRL+Escape"), KKey("Meta+Backspace"));
+ keys->insertItem(i18n("Show Taskmanager"), "Show taskmanager", KKey("CTRL+Escape"), KKey("Meta+Ctrl+Pause"));

svn path=/trunk/kdebase/kwin/; revision=104883
2001-07-03 20:43:53 +00:00
Ellis Whitehead
3e604d14b0 Remove "Window iconify all" since we now how "Toggle Show Desktop".
Index: kwinbindings.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/kwinbindings.cpp,v
retrieving revision 1.24
diff -u -3 -d -p -r1.24 kwinbindings.cpp
--- kwinbindings.cpp	2001/06/26 23:30:52	1.24
+++ kwinbindings.cpp	2001/06/29 04:29:14
@@ -22,7 +22,7 @@
  keys->insertItem(i18n("Window Maximize Vertical"), "Window maximize vertical", KKey(), KKey("Meta+Bar"));
  keys->insertItem(i18n("Window Maximize Horizontal"), "Window maximize horizontal", KKey(), KKey("Meta+Equal"));
  keys->insertItem(i18n("Window Iconify"), "Window iconify", KKey(), KKey("Meta+Minus"));
- keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus"));
+ //keys->insertItem(i18n("Window Iconify (All)"), "Window iconify all", KKey(), KKey("Meta+Ctrl+Minus"));
  keys->insertItem(i18n("Window Shade"), "Window shade", KKey(), KKey("Meta+Underscore"));
  keys->insertItem(i18n("Window Move"), "Window move", 0);
  keys->insertItem(i18n("Window Resize"), "Window resize", 0);
@@ -113,6 +113,6 @@ This belongs in taskbar rather than here
 #endif
  keys->insertItem(i18n("Mouse Emulation"), "Mouse emulation", KKey("ALT+F12"), KKey());
  keys->insertItem(i18n("Kill Window"), "Kill Window", KKey("CTRL+ALT+Escape"), KKey("Meta+Ctrl+Delete"));
- keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey());
- keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+PrtSc"), KKey());
+ keys->insertItem(i18n("Window Screenshot"), "Screenshot of active window", KKey("Print"), KKey("Alt+Print"));
+ keys->insertItem(i18n("Desktop Screenshot"), "Screenshot of desktop", KKey("CTRL+Print"), KKey("Meta+Print"));

Index: workspace.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/workspace.cpp,v
retrieving revision 1.263
diff -u -3 -d -p -r1.263 workspace.cpp
--- workspace.cpp	2001/06/29 00:16:26	1.263
+++ workspace.cpp	2001/06/29 04:29:24
@@ -2553,7 +2553,7 @@ void Workspace::createKeybindings(){
     keys->connectItem( "Window maximize horizontal", this, SLOT( slotWindowMaximizeHorizontal() ) );
     keys->connectItem( "Window maximize vertical", this, SLOT( slotWindowMaximizeVertical() ) );
     keys->connectItem( "Window iconify", this, SLOT( slotWindowIconify() ) );
-    keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) );
+    //keys->connectItem( "Window iconify all", this, SLOT( slotWindowIconifyAll() ) );
     keys->connectItem( "Window shade", this, SLOT( slotWindowShade() ) );
     keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) );
     keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) );
@@ -2744,6 +2744,7 @@ void Workspace::slotWindowIconify()
     performWindowOperation( popup_client, Options::IconifyOp );
 }

+// This should probably be removed now that there is a "Show Desktop" binding.
 void Workspace::slotWindowIconifyAll()
 {
     int iDesktop = currentDesktop();

svn path=/trunk/kdebase/kwin/; revision=104351
2001-06-29 04:30:25 +00:00
Richard J. Moore
2cd059894a Window grabbing stuff for linuxtag
svn path=/trunk/kdebase/kwin/; revision=104070
2001-06-26 23:30:52 +00:00
Malcolm Hunter
975139aaa5 Changed E-mail / e-mail to Email / email
svn path=/trunk/kdebase/kwin/; revision=103699
2001-06-24 19:29:57 +00:00
Ellis Whitehead
6036b918cb Index: kwinbindings.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/kwinbindings.cpp,v
retrieving revision 1.21
diff -u -3 -d -p -r1.21 kwinbindings.cpp
--- kwinbindings.cpp	2001/06/10 04:10:41	1.21
+++ kwinbindings.cpp	2001/06/19 19:06:22
@@ -7,10 +7,10 @@
 #endif
  keys->insertItem(i18n("Walk through Windows"), "Walk through windows", KKey("ALT+Tab"), KKey("Alt+Tab"));
  keys->insertItem(i18n("Walk through Windows (Reverse)"), "Walk back through windows", KKey("SHIFT+ALT+Tab"), KKey("Alt+Shift+Tab"));
- keys->insertItem(i18n("Walk through Desktops"), "Walk through desktops", KKey("CTRL+Tab"), KKey("Meta+Tab"));
- keys->insertItem(i18n("Walk through Desktops (Reverse)"), "Walk back through desktops", KKey("SHIFT+CTRL+Tab"), KKey("Meta+Shift+Tab"));
- keys->insertItem(i18n("Walk through Desktop List"), "Walk through desktop list", KKey(), KKey());
- keys->insertItem(i18n("Walk through Desktop List (Reverse)"), "Walk back through desktop list", KKey(), KKey());
+ keys->insertItem(i18n("Walk through Desktops"), "Walk through desktops", KKey(), KKey("Meta+Tab"));
+ keys->insertItem(i18n("Walk through Desktops (Reverse)"), "Walk back through desktops", KKey(), KKey("Meta+Shift+Tab"));
+ keys->insertItem(i18n("Walk through Desktop List"), "Walk through desktop list", KKey("CTRL+Tab"), KKey());
+ keys->insertItem(i18n("Walk through Desktop List (Reverse)"), "Walk back through desktop list", KKey("SHIFT+CTRL+Tab"), KKey());

 #ifdef WITH_LABELS
  keys->insertItem(i18n("Windows"), "Group:Windows", 0);

svn path=/trunk/kdebase/kwin/; revision=103068
2001-06-19 19:07:32 +00:00
Ellis Whitehead
9e0653455e kdebase/kcontrol/keys/: add ability to separate between 'normal' shortcuts and a shortcut series
kdebase/kwin/tabbox: allow for choosing between switching between desktops in focus order versus numeric order.

kdebase/kwin/workspace: add key bindings for focus-order-desktop-walking and sending a window to a specific desktop.

*bindings.cpp: add labels for kcontrol

svn path=/trunk/kdebase/kwin/; revision=101281
2001-06-10 04:10:42 +00:00
Ellis Whitehead
a9c55776ae KAccel: allow for 4-modifier setup defaults, check whether Qt supports the
Meta key.

KGlobalAccel: improve X key ungrabbing for key map changes.

KKeyDialog: Allow caller to specify whether normal keys (i.e., 'A', 'B') can
be used as shortcuts and whether the Meta key can be used in a shortcut.

KeyConfog: Add support for a second default configuration. Add support for a
user with a Meta key not to default to 4-modifier setup (not yet working
completely).

Workspace: Added 'Window iconify all'.  Still speed work -- best might be to
merge this with 'Show Desktop'

kcontrol/keys/main.cpp: a bit of capitalization

kcontrol/kwm/mouse, kwin/client, kwin/options: Let user use Meta key for
window resizing/moving/etc

*bindings.cpp: add 4-modifier setup defaults

svn path=/trunk/kdebase/kcontrol/; revision=100877
2001-06-07 18:17:24 +00:00
Ellis Whitehead
a8fb7ecd4a Default shortcuts for maximize, minimize & shade using the Meta key
svn path=/trunk/kdebase/kwin/; revision=100315
2001-06-04 05:32:18 +00:00
Luboš Luňák
0603cb240d 'Logout' and 'Lock screen' keybindings don't really belong to kwin, they
belong to kdesktop.

svn path=/trunk/kdebase/kwin/; revision=99466
2001-05-30 13:23:53 +00:00
Helge Deller
6536d083a0 added global "Lock Screen" key-binding (CTRL-ALT-L)
svn path=/trunk/kdebase/kwin/; revision=99436
2001-05-30 10:31:03 +00:00
Malcolm Hunter
7187b01f9d Spelling and grammar corrections
svn path=/trunk/kdebase/kcontrol/; revision=98188
2001-05-22 01:15:09 +00:00
Henrik Johnson
10baa96bc7 Add key bindings to move current window to next/previous desktop
svn path=/trunk/kdebase/kwin/; revision=96538
2001-05-11 21:38:00 +00:00
Adriaan de Groot
2b0e89325f Added window raise-or-lower
svn path=/trunk/kdebase/kwin/; revision=89959
2001-04-02 16:17:06 +00:00
Luboš Luňák
944967a8e1 Made Alt+Tab , Ctrl+Tab configurable. Also added in kcontrol module missing option
to make Alt+Tab to go either through all windows or only the ones on the current
desktop. If you get keyboard lock-ups because of this, yell.
I wonder how many bugreports I will be able to close because of this :).

svn path=/trunk/kdebase/kwin/; revision=87801
2001-03-19 20:05:36 +00:00
Dirk Mueller
9a4a9c99bd GUI: Mouse emulation F12 -> ALT+F12.
does anybody remember another place that needs this fix ?

svn path=/trunk/kdebase/kwin/; revision=82825
2001-02-14 13:35:02 +00:00
Matthias Ettrich
33f78a855b some more keybindings
less race conditions with map/unmap thanks to BlackboxTechnology(tm)

svn path=/trunk/kdebase/kwin/; revision=77544
2001-01-11 23:41:07 +00:00
Kalle Dalheimer
87931a071a Added hotkeys for workspaces 9-16
Patch approved by Matthias Ettrich

svn path=/trunk/kdebase/kwin/; revision=62067
2000-08-28 06:16:34 +00:00
Matthias Ettrich
5d7ca8f2ee adding missing raise and lower keybindings
svn path=/trunk/kdebase/kwin/; revision=59304
2000-07-30 16:15:17 +00:00
Jesper Pedersen
797a25747c Added the following two functions:
- Switch one desktop to the left
  - Switch one desktop to the right

svn path=/trunk/kdebase/kwin/; revision=55397
2000-07-04 17:07:58 +00:00
Kurt Granroth
7853d20753 Added support for Ctrl+Alt+Esc to kill a window. I basically just cut-n-
pasted everything from kwm.  It works.

However, I don't know if this fits the new design or not.  Maybe some
of the functions are accomplished elsewhere?  I think Matthias needs
to take a look at this...

But like I said, it does work :-)

svn path=/trunk/kdebase/kwin/; revision=49849
2000-05-17 23:02:42 +00:00
Kurt Granroth
3396c20935 Added new action: Ctrl+Alt+Del will start the logout/shutdown sequence.
Since this uses kaccel, it is (of course) configurable.

svn path=/trunk/kdebase/kwin/; revision=49834
2000-05-17 20:15:17 +00:00
Matthias Ettrich
935c0a4478 More keyboard commands such as "Window move" and "Window resize".
"Mouse emulation" (defaults to F12 currently) provides mouse emulation with
[Ctrl|Alt]-ArrowKeys.  Unfortunatly, dragging isn't (technically) possible with
X, but at least normal clicks work with Space or Return.

svn path=/trunk/kdebase/kwin/; revision=35919
1999-12-06 00:43:55 +00:00
Matthias Ettrich
91d73bedca animated shading works again. Shortcut for shading possible
"Window shade"

svn path=/trunk/kdebase/kwin/; revision=35392
1999-11-29 02:49:20 +00:00
Matthias Ettrich
ddaa516ba4 more keybindings:
Window maximize,Window maximize vertical,Window maximize horizontal
 Window iconify

Try for example in kdeglobals:

	[Global Keys]
	Window maximize vertical=F5

svn path=/trunk/kdebase/kwin/; revision=35389
1999-11-29 02:18:29 +00:00
Matthias Ettrich
367d4fd0d7 some bugfixes, added a window operations menu, some simple shading animation
svn path=/trunk/kdebase/kwin/; revision=34662
1999-11-22 01:57:51 +00:00
Matthias Ettrich
eb472b9ed5 Ctrl-Fx desktop switching to make David happy
svn path=/trunk/kdebase/kwin/; revision=33636
1999-11-13 01:51:22 +00:00