* Moved some stuff in data/etc/ to data/system/data because that's where

they now end up in the image.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29936 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/HaikuImage

@@ -344,7 +344,7 @@ local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
 AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
 AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
 
-local cannaDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
+local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
 local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
 local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
 local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
@@ -484,7 +484,7 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF"
 
 # licenses
 CopyDirectoryToHaikuImage system data
-	: [ FDirName $(HAIKU_TOP) data etc licenses ]
+	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses : -x .svn ;
 
 

data/system/data/KeyboardLayouts/Generic 104-key

@@ -0,0 +1,20 @@
+name = Generic 104-key
+
+# Size shortcuts
+default-size = 10,10
+$b = 5,10
+$c = 20,10
+$d = 15,10
+$enter = d20,10
+$f = 10,20
+$g = 13,10
+
+# 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 ]
+[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]
+[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; d$f:+1 ]
+[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]
+[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ]
+[ 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 ]

data/system/data/KeyboardLayouts/Generic 105-key International

@@ -0,0 +1,22 @@
+name = Generic 105-key International
+
+# Size shortcuts
+default-size = 10,10
+$b = 5,10
+$c = 20,10
+$d = 15,10
+$e = l15,20,9
+$f = 10,20
+$g = 13,10
+
+# 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 ]
+[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]
+[ 0,30; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; 
+	d$f:+1 ]
+[ 0,40; d19,10:0x3b; :+11; :0x33; 51,10:-; :0x48-0x4a ]
+[ 0,50; d$g:0x4b; :0x69; :0x4c+9; d27,10:+1; 15,10:-; d:+1; 
+	15,10:-; :+3; d$f:+1 ]
+[ 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 ]

data/system/data/KeyboardLayouts/IBM Laptop International

@@ -0,0 +1,26 @@
+name = IBM Laptop International
+
+# Size shortcuts
+default-size = 18,18
+$s = 17,10
+$gap = 6,10
+$sgap = 5,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = l28,36,22
+$l-shift-ctrl = 23,18
+$r-shift = 51,18
+$option = 13,18
+$space = 95,18
+
+# Key rows
+[ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ]
+[ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ]
+[ 0,20; :0x11+12; $backspace:+1 ]
+[ 0,38; $tab:0x26; :+12; $enter:0x47; ]
+[ 0,56; $caps:0x3b; :+11; :0x33 ]
+[ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ]
+[ 0,92; :0x99; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+	:+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]
+[ 221,102; $s:0x61+2; ]