removed uneeded per machine key setups and merge in single kbdconfig file

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@737 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 8 insertions, 127 deletions

diff --git a/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
deleted file mode 100644
index d56625f39..000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This is an example keyboard config file for matchbox
-#
-# You can edit this file or change per user by copying to 
-#  ~/.matchbox/kbdconfig
-#
-# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
-
-### Window operation short cuts 
-
-<Alt>n=next
-<Alt>p=prev
-<Alt>c=close
-<Alt>d=desktop
-<Alt>m=!matchbox-remote -mbmenu
-
-### App launching.
-
-<ctrl><alt>x=!xterm
-<ctrl><alt>r=!rxvt
-
-### App launching with startup notify
-
-<ctrl><alt>e=!!gpe-calender
-
-### windows style key shortcuts
-
-<alt>Tab=next
-<alt><shift>Tab=prev
-
-<alt>space=taskmenu
-<alt>escape=!matchbox-remote -mbmenu
-<alt>f4=close
-
-f11=fullscreen
-
-### super should be a 'window' key, uncomment '#' if you have one.
-
-#<super>d=desktop
-#<super>r=!xterm
-#<super>e=!!nautilus
-
-### Special keys, likely probably only available on extended keyboards. 
-
-#App=!matchbox-remote -mbmenu
-#Menu=!matchbox-remote -mbmenu
-
-# Shortcut keys for collie
-XF86Calendar=!$gpe-calendar
-telephone=!$gpe-contacts
-XF86Start=!matchbox-remote -desktop
-F2=!matchbox-remote -mbmenu
-XF86Mail=!$gpe-taskmanager
-Escape=close
diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
index 633d3672a..239da8f57 100644
--- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
+++ b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig
@@ -19,9 +19,15 @@
 <ctrl><alt>x=!xterm
 <ctrl><alt>r=!rxvt
 
-### App launching with startup notify
+### poky additions
 
-<ctrl><alt>e=!!gpe-calender
+XF86Calendar=!$contacts
+telephone=!$dates
+XF86Start=!matchbox-remote -desktop
+F2=!matchbox-remote -mbmenu
+
+#XF86Mail=!$tasks
+#Escape=close
 
 ### windows style key shortcuts
 
@@ -34,14 +40,3 @@
 
 f11=fullscreen
 
-### super should be a 'window' key, uncomment '#' if you have one.
-
-#<super>d=desktop
-#<super>r=!xterm
-#<super>e=!!nautilus
-
-### Special keys, likely probably only available on extended keyboards. 
-
-#App=!matchbox-remote -mbmenu
-#Menu=!matchbox-remote -mbmenu
-
diff --git a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch b/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch
deleted file mode 100644
index 8fd1dc3f4..000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/kbdconfig_keylaunch_simpad.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- data/kbdconfig~	2004-07-11 00:59:25.000000000 +0200
-+++ data/kbdconfig	2004-07-11 00:59:25.000000000 +0200
-@@ -28,7 +28,8 @@
- <alt>escape=!mbcontrol -mbmenu
- <alt>f4=close
- 
--f11=fullscreen
-+#Please don't do this, it breaks suspending on SimPad
-+#f11=fullscreen
- 
- ### super should be windows keys 
- 
diff --git a/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig b/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
deleted file mode 100644
index 4c2d949e4..000000000
--- a/meta/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This is an example keyboard config file for matchbox
-#
-# You can edit this file or change per user by copying to 
-#  ~/.matchbox/kbdconfig
-#
-# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox )
-
-### Window operation short cuts 
-
-<Alt>n=next
-<Alt>p=prev
-<Alt>c=close
-<Alt>d=desktop
-<Alt>m=!matchbox-remote -mbmenu
-
-### App launching.
-
-<ctrl><alt>x=!xterm
-<ctrl><alt>r=!rxvt
-
-### App launching with startup notify
-
-<ctrl><alt>e=!!gpe-calender
-
-### windows style key shortcuts
-
-<alt>Tab=next
-<alt><shift>Tab=prev
-
-<alt>space=taskmenu
-<alt>escape=!matchbox-remote -mbmenu
-<alt>f4=close
-
-#Please don't do this, it breaks suspending on SimPad
-#f11=fullscreen
-
-### super should be a 'window' key, uncomment '#' if you have one.
-
-#<super>d=desktop
-#<super>r=!xterm
-#<super>e=!!nautilus
-
-### Special keys, likely probably only available on extended keyboards. 
-
-#App=!matchbox-remote -mbmenu
-#Menu=!matchbox-remote -mbmenu
-