From 433deca87e44087997aa55e98faf631295da8446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 5 Apr 2009 13:30:27 +0000 Subject: [PATCH] * Made the 105 key international keyboard the default, since this is probably more helpful to most people than the 104 key one. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29934 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/keymap/KeyboardLayout.cpp | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/preferences/keymap/KeyboardLayout.cpp b/src/preferences/keymap/KeyboardLayout.cpp index 7516d3694e..e867e1d40c 100644 --- a/src/preferences/keymap/KeyboardLayout.cpp +++ b/src/preferences/keymap/KeyboardLayout.cpp @@ -199,30 +199,6 @@ KeyboardLayout::SetDefault() // See for examples in the default layout below. #if 1 - static const char* kDefaultLayout104 = "name = Generic 104-key\n" - // Size shortcuts - "default-size = 10,10\n" - "$b = 5,10\n" - "$c = 20,10\n" - "$d = 15,10\n" - "$enter = d20,10\n" - "$f = 10,20\n" - "$g = 13,10\n" - // Key rows - "[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-; " - "$g:led-num; $g:led-caps; $g:led-scroll ]\n" - "[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]\n" - "[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; " - "d$f:+1 ]\n" - "[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]\n" - "[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; " - " 15,10:-; :+3; d$f:+1 ]\n" - "[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1; " - "d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]\n"; - - _InitFrom(kDefaultLayout104); -#endif -#if 0 static const char* kDefaultLayout105 = "name = Generic 105-key International\n" // Size shortcuts @@ -247,6 +223,30 @@ KeyboardLayout::SetDefault() _InitFrom(kDefaultLayout105); #endif +#if 0 + static const char* kDefaultLayout104 = "name = Generic 104-key\n" + // Size shortcuts + "default-size = 10,10\n" + "$b = 5,10\n" + "$c = 20,10\n" + "$d = 15,10\n" + "$enter = d20,10\n" + "$f = 10,20\n" + "$g = 13,10\n" + // Key rows + "[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-; " + "$g:led-num; $g:led-caps; $g:led-scroll ]\n" + "[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]\n" + "[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; " + "d$f:+1 ]\n" + "[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]\n" + "[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; " + " 15,10:-; :+3; d$f:+1 ]\n" + "[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1; " + "d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]\n"; + + _InitFrom(kDefaultLayout104); +#endif #if 0 static const char* kIBMLaptop = "name = IBM Laptop International\n" // Size shortcuts