From a6354157caa55102e6d8320fc278b9f7beea99f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 5 Apr 2009 14:55:59 +0000 Subject: [PATCH] * 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 | 4 +-- .../data/Canna}/default/.canna | 0 .../data/Canna}/default/1.2.canna | 0 .../data/Canna}/default/default.canna | 0 .../data/Canna}/default/fixer.canna | 0 .../data/Canna}/default/jdemon.canna.gz | Bin .../data/Canna}/default/just.canna | 0 .../data/Canna}/default/lan5.canna.gz | Bin .../data/Canna}/default/matsu.canna.gz | Bin .../data/Canna}/default/modes.canna | 0 .../data/Canna}/default/sample.canna.gz | Bin .../data/Canna}/default/skk.canna.gz | Bin .../data/Canna}/default/tut.canna | 0 .../data/Canna}/default/unix.canna.gz | Bin .../data/Canna}/default/vje.canna.gz | Bin .../data/Canna}/default/wx2+.canna.gz | Bin .../data/Canna}/dic/canna/#dics.dir | 0 .../data/Canna}/dic/canna/bushu.cld | Bin .../data/Canna}/dic/canna/chimei.ctd | 0 .../data/Canna}/dic/canna/dics.dir | 0 .../data/Canna}/dic/canna/fuzokugo.cbd | Bin .../data/Canna}/dic/canna/fuzokugo.cld | Bin .../data/Canna}/dic/canna/hojomwd.ctd | 0 .../data/Canna}/dic/canna/hojoswd.ctd | 0 .../data/Canna}/dic/canna/iroha.cbd | Bin .../data/Canna}/dic/canna/iroha.cld | Bin .../data/Canna}/dic/canna/kanasmpl.ctd | 0 .../data/Canna}/dic/canna/katakana.ctd | 0 .../data/Canna}/dic/canna/keishiki.ctd | 0 .../data/Canna}/dic/canna/necgaiji.ctd | 0 .../data/Canna}/dic/canna/number.ctd | 0 .../data/Canna}/dic/canna/software.ctd | 0 .../data/Canna}/dic/canna/suffix.ctd | 0 .../data/Canna}/dic/default.cbp | Bin .../data/Canna}/dic/english.cbp | Bin .../data/Canna}/dic/jdaemon.cbp | Bin .../KanBe => system/data/Canna}/dic/just.cbp | Bin .../data/Canna}/dic/kaisoku.cbp | Bin .../KanBe => system/data/Canna}/dic/kana.cbp | Bin .../KanBe => system/data/Canna}/dic/lan5.cbp | Bin .../KanBe => system/data/Canna}/dic/matsu.cbp | Bin .../data/Canna}/dic/newjis.cbp | Bin .../data/Canna}/dic/romaji.cbp | Bin .../data/Canna}/dic/sokuon.cbp | Bin .../KanBe => system/data/Canna}/dic/tut.cbp | Bin .../KanBe => system/data/Canna}/dic/vje.cbp | Bin .../KanBe => system/data/Canna}/dic/wx2+.cbp | Bin .../data/KeyboardLayouts/Generic 104-key | 20 ++++++++++++++ .../Generic 105-key International | 22 +++++++++++++++ .../KeyboardLayouts/IBM Laptop International | 26 ++++++++++++++++++ .../data}/joysticks/Analog_2_Axes | 0 .../data}/joysticks/Analog_3_Axes | 0 .../data}/joysticks/Analog_4_Axes | 0 .../data}/joysticks/Analog_Dual_2_Axes | 0 .../data}/joysticks/Generic_USB_Joystick | 0 .../data}/joysticks/Gravis_GamePad_Pro | 0 .../data}/joysticks/Gravis_Xterminator | 0 .../data}/joysticks/Logitech_CyberMan_2 | 0 .../joysticks/Logitech_Precision_GamePad | 0 .../joysticks/Logitech_ThunderPad_Digital | 0 .../Logitech_WingMan_Extreme_Digital | 0 .../joysticks/Logitech_WingMan_Interceptor | 0 .../joysticks/Microsoft_SideWinder_GamePad | 0 .../Microsoft_SideWinder_PrecisionPro | 0 ...hrustMaster_Inceptor_Millennium_3D_Digital | 0 .../joysticks/ThrustMaster_Rage_3D_Digital | 0 data/{etc => system/data}/licenses/Artistic | 0 .../data}/licenses/Artistic (Perl) | 0 .../data}/licenses/Artistic v2.0 | 0 .../data}/licenses/BSD (2-clause) | 0 .../data}/licenses/BSD (3-clause) | 0 .../data}/licenses/BSD (4-clause) | 0 data/{etc => system/data}/licenses/GNU GPL v1 | 0 data/{etc => system/data}/licenses/GNU GPL v2 | 0 data/{etc => system/data}/licenses/GNU GPL v3 | 0 .../{etc => system/data}/licenses/GNU LGPL v2 | 0 .../data}/licenses/GNU LGPL v2.1 | 0 data/{etc => system/data}/licenses/LibHTTPd | 0 data/{etc => system/data}/licenses/MIT | 0 79 files changed, 70 insertions(+), 2 deletions(-) rename data/{etc/KanBe => system/data/Canna}/default/.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/1.2.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/default.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/fixer.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/jdemon.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/just.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/lan5.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/matsu.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/modes.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/sample.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/skk.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/tut.canna (100%) rename data/{etc/KanBe => system/data/Canna}/default/unix.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/vje.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/default/wx2+.canna.gz (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/#dics.dir (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/bushu.cld (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/chimei.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/dics.dir (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/fuzokugo.cbd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/fuzokugo.cld (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/hojomwd.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/hojoswd.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/iroha.cbd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/iroha.cld (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/kanasmpl.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/katakana.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/keishiki.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/necgaiji.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/number.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/software.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/canna/suffix.ctd (100%) rename data/{etc/KanBe => system/data/Canna}/dic/default.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/english.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/jdaemon.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/just.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/kaisoku.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/kana.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/lan5.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/matsu.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/newjis.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/romaji.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/sokuon.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/tut.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/vje.cbp (100%) rename data/{etc/KanBe => system/data/Canna}/dic/wx2+.cbp (100%) create mode 100644 data/system/data/KeyboardLayouts/Generic 104-key create mode 100644 data/system/data/KeyboardLayouts/Generic 105-key International create mode 100644 data/system/data/KeyboardLayouts/IBM Laptop International rename data/{etc => system/data}/joysticks/Analog_2_Axes (100%) rename data/{etc => system/data}/joysticks/Analog_3_Axes (100%) rename data/{etc => system/data}/joysticks/Analog_4_Axes (100%) rename data/{etc => system/data}/joysticks/Analog_Dual_2_Axes (100%) rename data/{etc => system/data}/joysticks/Generic_USB_Joystick (100%) rename data/{etc => system/data}/joysticks/Gravis_GamePad_Pro (100%) rename data/{etc => system/data}/joysticks/Gravis_Xterminator (100%) rename data/{etc => system/data}/joysticks/Logitech_CyberMan_2 (100%) rename data/{etc => system/data}/joysticks/Logitech_Precision_GamePad (100%) rename data/{etc => system/data}/joysticks/Logitech_ThunderPad_Digital (100%) rename data/{etc => system/data}/joysticks/Logitech_WingMan_Extreme_Digital (100%) rename data/{etc => system/data}/joysticks/Logitech_WingMan_Interceptor (100%) rename data/{etc => system/data}/joysticks/Microsoft_SideWinder_GamePad (100%) rename data/{etc => system/data}/joysticks/Microsoft_SideWinder_PrecisionPro (100%) rename data/{etc => system/data}/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital (100%) rename data/{etc => system/data}/joysticks/ThrustMaster_Rage_3D_Digital (100%) rename data/{etc => system/data}/licenses/Artistic (100%) rename data/{etc => system/data}/licenses/Artistic (Perl) (100%) rename data/{etc => system/data}/licenses/Artistic v2.0 (100%) rename data/{etc => system/data}/licenses/BSD (2-clause) (100%) rename data/{etc => system/data}/licenses/BSD (3-clause) (100%) rename data/{etc => system/data}/licenses/BSD (4-clause) (100%) rename data/{etc => system/data}/licenses/GNU GPL v1 (100%) rename data/{etc => system/data}/licenses/GNU GPL v2 (100%) rename data/{etc => system/data}/licenses/GNU GPL v3 (100%) rename data/{etc => system/data}/licenses/GNU LGPL v2 (100%) rename data/{etc => system/data}/licenses/GNU LGPL v2.1 (100%) rename data/{etc => system/data}/licenses/LibHTTPd (100%) rename data/{etc => system/data}/licenses/MIT (100%) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index d1153be5c6..a90caf3672 100644 --- a/build/jam/HaikuImage +++ b/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 ; diff --git a/data/etc/KanBe/default/.canna b/data/system/data/Canna/default/.canna similarity index 100% rename from data/etc/KanBe/default/.canna rename to data/system/data/Canna/default/.canna diff --git a/data/etc/KanBe/default/1.2.canna b/data/system/data/Canna/default/1.2.canna similarity index 100% rename from data/etc/KanBe/default/1.2.canna rename to data/system/data/Canna/default/1.2.canna diff --git a/data/etc/KanBe/default/default.canna b/data/system/data/Canna/default/default.canna similarity index 100% rename from data/etc/KanBe/default/default.canna rename to data/system/data/Canna/default/default.canna diff --git a/data/etc/KanBe/default/fixer.canna b/data/system/data/Canna/default/fixer.canna similarity index 100% rename from data/etc/KanBe/default/fixer.canna rename to data/system/data/Canna/default/fixer.canna diff --git a/data/etc/KanBe/default/jdemon.canna.gz b/data/system/data/Canna/default/jdemon.canna.gz similarity index 100% rename from data/etc/KanBe/default/jdemon.canna.gz rename to data/system/data/Canna/default/jdemon.canna.gz diff --git a/data/etc/KanBe/default/just.canna b/data/system/data/Canna/default/just.canna similarity index 100% rename from data/etc/KanBe/default/just.canna rename to data/system/data/Canna/default/just.canna diff --git a/data/etc/KanBe/default/lan5.canna.gz b/data/system/data/Canna/default/lan5.canna.gz similarity index 100% rename from data/etc/KanBe/default/lan5.canna.gz rename to data/system/data/Canna/default/lan5.canna.gz diff --git a/data/etc/KanBe/default/matsu.canna.gz b/data/system/data/Canna/default/matsu.canna.gz similarity index 100% rename from data/etc/KanBe/default/matsu.canna.gz rename to data/system/data/Canna/default/matsu.canna.gz diff --git a/data/etc/KanBe/default/modes.canna b/data/system/data/Canna/default/modes.canna similarity index 100% rename from data/etc/KanBe/default/modes.canna rename to data/system/data/Canna/default/modes.canna diff --git a/data/etc/KanBe/default/sample.canna.gz b/data/system/data/Canna/default/sample.canna.gz similarity index 100% rename from data/etc/KanBe/default/sample.canna.gz rename to data/system/data/Canna/default/sample.canna.gz diff --git a/data/etc/KanBe/default/skk.canna.gz b/data/system/data/Canna/default/skk.canna.gz similarity index 100% rename from data/etc/KanBe/default/skk.canna.gz rename to data/system/data/Canna/default/skk.canna.gz diff --git a/data/etc/KanBe/default/tut.canna b/data/system/data/Canna/default/tut.canna similarity index 100% rename from data/etc/KanBe/default/tut.canna rename to data/system/data/Canna/default/tut.canna diff --git a/data/etc/KanBe/default/unix.canna.gz b/data/system/data/Canna/default/unix.canna.gz similarity index 100% rename from data/etc/KanBe/default/unix.canna.gz rename to data/system/data/Canna/default/unix.canna.gz diff --git a/data/etc/KanBe/default/vje.canna.gz b/data/system/data/Canna/default/vje.canna.gz similarity index 100% rename from data/etc/KanBe/default/vje.canna.gz rename to data/system/data/Canna/default/vje.canna.gz diff --git a/data/etc/KanBe/default/wx2+.canna.gz b/data/system/data/Canna/default/wx2+.canna.gz similarity index 100% rename from data/etc/KanBe/default/wx2+.canna.gz rename to data/system/data/Canna/default/wx2+.canna.gz diff --git a/data/etc/KanBe/dic/canna/#dics.dir b/data/system/data/Canna/dic/canna/#dics.dir similarity index 100% rename from data/etc/KanBe/dic/canna/#dics.dir rename to data/system/data/Canna/dic/canna/#dics.dir diff --git a/data/etc/KanBe/dic/canna/bushu.cld b/data/system/data/Canna/dic/canna/bushu.cld similarity index 100% rename from data/etc/KanBe/dic/canna/bushu.cld rename to data/system/data/Canna/dic/canna/bushu.cld diff --git a/data/etc/KanBe/dic/canna/chimei.ctd b/data/system/data/Canna/dic/canna/chimei.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/chimei.ctd rename to data/system/data/Canna/dic/canna/chimei.ctd diff --git a/data/etc/KanBe/dic/canna/dics.dir b/data/system/data/Canna/dic/canna/dics.dir similarity index 100% rename from data/etc/KanBe/dic/canna/dics.dir rename to data/system/data/Canna/dic/canna/dics.dir diff --git a/data/etc/KanBe/dic/canna/fuzokugo.cbd b/data/system/data/Canna/dic/canna/fuzokugo.cbd similarity index 100% rename from data/etc/KanBe/dic/canna/fuzokugo.cbd rename to data/system/data/Canna/dic/canna/fuzokugo.cbd diff --git a/data/etc/KanBe/dic/canna/fuzokugo.cld b/data/system/data/Canna/dic/canna/fuzokugo.cld similarity index 100% rename from data/etc/KanBe/dic/canna/fuzokugo.cld rename to data/system/data/Canna/dic/canna/fuzokugo.cld diff --git a/data/etc/KanBe/dic/canna/hojomwd.ctd b/data/system/data/Canna/dic/canna/hojomwd.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/hojomwd.ctd rename to data/system/data/Canna/dic/canna/hojomwd.ctd diff --git a/data/etc/KanBe/dic/canna/hojoswd.ctd b/data/system/data/Canna/dic/canna/hojoswd.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/hojoswd.ctd rename to data/system/data/Canna/dic/canna/hojoswd.ctd diff --git a/data/etc/KanBe/dic/canna/iroha.cbd b/data/system/data/Canna/dic/canna/iroha.cbd similarity index 100% rename from data/etc/KanBe/dic/canna/iroha.cbd rename to data/system/data/Canna/dic/canna/iroha.cbd diff --git a/data/etc/KanBe/dic/canna/iroha.cld b/data/system/data/Canna/dic/canna/iroha.cld similarity index 100% rename from data/etc/KanBe/dic/canna/iroha.cld rename to data/system/data/Canna/dic/canna/iroha.cld diff --git a/data/etc/KanBe/dic/canna/kanasmpl.ctd b/data/system/data/Canna/dic/canna/kanasmpl.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/kanasmpl.ctd rename to data/system/data/Canna/dic/canna/kanasmpl.ctd diff --git a/data/etc/KanBe/dic/canna/katakana.ctd b/data/system/data/Canna/dic/canna/katakana.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/katakana.ctd rename to data/system/data/Canna/dic/canna/katakana.ctd diff --git a/data/etc/KanBe/dic/canna/keishiki.ctd b/data/system/data/Canna/dic/canna/keishiki.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/keishiki.ctd rename to data/system/data/Canna/dic/canna/keishiki.ctd diff --git a/data/etc/KanBe/dic/canna/necgaiji.ctd b/data/system/data/Canna/dic/canna/necgaiji.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/necgaiji.ctd rename to data/system/data/Canna/dic/canna/necgaiji.ctd diff --git a/data/etc/KanBe/dic/canna/number.ctd b/data/system/data/Canna/dic/canna/number.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/number.ctd rename to data/system/data/Canna/dic/canna/number.ctd diff --git a/data/etc/KanBe/dic/canna/software.ctd b/data/system/data/Canna/dic/canna/software.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/software.ctd rename to data/system/data/Canna/dic/canna/software.ctd diff --git a/data/etc/KanBe/dic/canna/suffix.ctd b/data/system/data/Canna/dic/canna/suffix.ctd similarity index 100% rename from data/etc/KanBe/dic/canna/suffix.ctd rename to data/system/data/Canna/dic/canna/suffix.ctd diff --git a/data/etc/KanBe/dic/default.cbp b/data/system/data/Canna/dic/default.cbp similarity index 100% rename from data/etc/KanBe/dic/default.cbp rename to data/system/data/Canna/dic/default.cbp diff --git a/data/etc/KanBe/dic/english.cbp b/data/system/data/Canna/dic/english.cbp similarity index 100% rename from data/etc/KanBe/dic/english.cbp rename to data/system/data/Canna/dic/english.cbp diff --git a/data/etc/KanBe/dic/jdaemon.cbp b/data/system/data/Canna/dic/jdaemon.cbp similarity index 100% rename from data/etc/KanBe/dic/jdaemon.cbp rename to data/system/data/Canna/dic/jdaemon.cbp diff --git a/data/etc/KanBe/dic/just.cbp b/data/system/data/Canna/dic/just.cbp similarity index 100% rename from data/etc/KanBe/dic/just.cbp rename to data/system/data/Canna/dic/just.cbp diff --git a/data/etc/KanBe/dic/kaisoku.cbp b/data/system/data/Canna/dic/kaisoku.cbp similarity index 100% rename from data/etc/KanBe/dic/kaisoku.cbp rename to data/system/data/Canna/dic/kaisoku.cbp diff --git a/data/etc/KanBe/dic/kana.cbp b/data/system/data/Canna/dic/kana.cbp similarity index 100% rename from data/etc/KanBe/dic/kana.cbp rename to data/system/data/Canna/dic/kana.cbp diff --git a/data/etc/KanBe/dic/lan5.cbp b/data/system/data/Canna/dic/lan5.cbp similarity index 100% rename from data/etc/KanBe/dic/lan5.cbp rename to data/system/data/Canna/dic/lan5.cbp diff --git a/data/etc/KanBe/dic/matsu.cbp b/data/system/data/Canna/dic/matsu.cbp similarity index 100% rename from data/etc/KanBe/dic/matsu.cbp rename to data/system/data/Canna/dic/matsu.cbp diff --git a/data/etc/KanBe/dic/newjis.cbp b/data/system/data/Canna/dic/newjis.cbp similarity index 100% rename from data/etc/KanBe/dic/newjis.cbp rename to data/system/data/Canna/dic/newjis.cbp diff --git a/data/etc/KanBe/dic/romaji.cbp b/data/system/data/Canna/dic/romaji.cbp similarity index 100% rename from data/etc/KanBe/dic/romaji.cbp rename to data/system/data/Canna/dic/romaji.cbp diff --git a/data/etc/KanBe/dic/sokuon.cbp b/data/system/data/Canna/dic/sokuon.cbp similarity index 100% rename from data/etc/KanBe/dic/sokuon.cbp rename to data/system/data/Canna/dic/sokuon.cbp diff --git a/data/etc/KanBe/dic/tut.cbp b/data/system/data/Canna/dic/tut.cbp similarity index 100% rename from data/etc/KanBe/dic/tut.cbp rename to data/system/data/Canna/dic/tut.cbp diff --git a/data/etc/KanBe/dic/vje.cbp b/data/system/data/Canna/dic/vje.cbp similarity index 100% rename from data/etc/KanBe/dic/vje.cbp rename to data/system/data/Canna/dic/vje.cbp diff --git a/data/etc/KanBe/dic/wx2+.cbp b/data/system/data/Canna/dic/wx2+.cbp similarity index 100% rename from data/etc/KanBe/dic/wx2+.cbp rename to data/system/data/Canna/dic/wx2+.cbp diff --git a/data/system/data/KeyboardLayouts/Generic 104-key b/data/system/data/KeyboardLayouts/Generic 104-key new file mode 100644 index 0000000000..c494f7ffe9 --- /dev/null +++ b/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 ] diff --git a/data/system/data/KeyboardLayouts/Generic 105-key International b/data/system/data/KeyboardLayouts/Generic 105-key International new file mode 100644 index 0000000000..089f688fb3 --- /dev/null +++ b/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 ] diff --git a/data/system/data/KeyboardLayouts/IBM Laptop International b/data/system/data/KeyboardLayouts/IBM Laptop International new file mode 100644 index 0000000000..cfaa48e95e --- /dev/null +++ b/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; ] diff --git a/data/etc/joysticks/Analog_2_Axes b/data/system/data/joysticks/Analog_2_Axes similarity index 100% rename from data/etc/joysticks/Analog_2_Axes rename to data/system/data/joysticks/Analog_2_Axes diff --git a/data/etc/joysticks/Analog_3_Axes b/data/system/data/joysticks/Analog_3_Axes similarity index 100% rename from data/etc/joysticks/Analog_3_Axes rename to data/system/data/joysticks/Analog_3_Axes diff --git a/data/etc/joysticks/Analog_4_Axes b/data/system/data/joysticks/Analog_4_Axes similarity index 100% rename from data/etc/joysticks/Analog_4_Axes rename to data/system/data/joysticks/Analog_4_Axes diff --git a/data/etc/joysticks/Analog_Dual_2_Axes b/data/system/data/joysticks/Analog_Dual_2_Axes similarity index 100% rename from data/etc/joysticks/Analog_Dual_2_Axes rename to data/system/data/joysticks/Analog_Dual_2_Axes diff --git a/data/etc/joysticks/Generic_USB_Joystick b/data/system/data/joysticks/Generic_USB_Joystick similarity index 100% rename from data/etc/joysticks/Generic_USB_Joystick rename to data/system/data/joysticks/Generic_USB_Joystick diff --git a/data/etc/joysticks/Gravis_GamePad_Pro b/data/system/data/joysticks/Gravis_GamePad_Pro similarity index 100% rename from data/etc/joysticks/Gravis_GamePad_Pro rename to data/system/data/joysticks/Gravis_GamePad_Pro diff --git a/data/etc/joysticks/Gravis_Xterminator b/data/system/data/joysticks/Gravis_Xterminator similarity index 100% rename from data/etc/joysticks/Gravis_Xterminator rename to data/system/data/joysticks/Gravis_Xterminator diff --git a/data/etc/joysticks/Logitech_CyberMan_2 b/data/system/data/joysticks/Logitech_CyberMan_2 similarity index 100% rename from data/etc/joysticks/Logitech_CyberMan_2 rename to data/system/data/joysticks/Logitech_CyberMan_2 diff --git a/data/etc/joysticks/Logitech_Precision_GamePad b/data/system/data/joysticks/Logitech_Precision_GamePad similarity index 100% rename from data/etc/joysticks/Logitech_Precision_GamePad rename to data/system/data/joysticks/Logitech_Precision_GamePad diff --git a/data/etc/joysticks/Logitech_ThunderPad_Digital b/data/system/data/joysticks/Logitech_ThunderPad_Digital similarity index 100% rename from data/etc/joysticks/Logitech_ThunderPad_Digital rename to data/system/data/joysticks/Logitech_ThunderPad_Digital diff --git a/data/etc/joysticks/Logitech_WingMan_Extreme_Digital b/data/system/data/joysticks/Logitech_WingMan_Extreme_Digital similarity index 100% rename from data/etc/joysticks/Logitech_WingMan_Extreme_Digital rename to data/system/data/joysticks/Logitech_WingMan_Extreme_Digital diff --git a/data/etc/joysticks/Logitech_WingMan_Interceptor b/data/system/data/joysticks/Logitech_WingMan_Interceptor similarity index 100% rename from data/etc/joysticks/Logitech_WingMan_Interceptor rename to data/system/data/joysticks/Logitech_WingMan_Interceptor diff --git a/data/etc/joysticks/Microsoft_SideWinder_GamePad b/data/system/data/joysticks/Microsoft_SideWinder_GamePad similarity index 100% rename from data/etc/joysticks/Microsoft_SideWinder_GamePad rename to data/system/data/joysticks/Microsoft_SideWinder_GamePad diff --git a/data/etc/joysticks/Microsoft_SideWinder_PrecisionPro b/data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro similarity index 100% rename from data/etc/joysticks/Microsoft_SideWinder_PrecisionPro rename to data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro diff --git a/data/etc/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital b/data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital similarity index 100% rename from data/etc/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital rename to data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital diff --git a/data/etc/joysticks/ThrustMaster_Rage_3D_Digital b/data/system/data/joysticks/ThrustMaster_Rage_3D_Digital similarity index 100% rename from data/etc/joysticks/ThrustMaster_Rage_3D_Digital rename to data/system/data/joysticks/ThrustMaster_Rage_3D_Digital diff --git a/data/etc/licenses/Artistic b/data/system/data/licenses/Artistic similarity index 100% rename from data/etc/licenses/Artistic rename to data/system/data/licenses/Artistic diff --git a/data/etc/licenses/Artistic (Perl) b/data/system/data/licenses/Artistic (Perl) similarity index 100% rename from data/etc/licenses/Artistic (Perl) rename to data/system/data/licenses/Artistic (Perl) diff --git a/data/etc/licenses/Artistic v2.0 b/data/system/data/licenses/Artistic v2.0 similarity index 100% rename from data/etc/licenses/Artistic v2.0 rename to data/system/data/licenses/Artistic v2.0 diff --git a/data/etc/licenses/BSD (2-clause) b/data/system/data/licenses/BSD (2-clause) similarity index 100% rename from data/etc/licenses/BSD (2-clause) rename to data/system/data/licenses/BSD (2-clause) diff --git a/data/etc/licenses/BSD (3-clause) b/data/system/data/licenses/BSD (3-clause) similarity index 100% rename from data/etc/licenses/BSD (3-clause) rename to data/system/data/licenses/BSD (3-clause) diff --git a/data/etc/licenses/BSD (4-clause) b/data/system/data/licenses/BSD (4-clause) similarity index 100% rename from data/etc/licenses/BSD (4-clause) rename to data/system/data/licenses/BSD (4-clause) diff --git a/data/etc/licenses/GNU GPL v1 b/data/system/data/licenses/GNU GPL v1 similarity index 100% rename from data/etc/licenses/GNU GPL v1 rename to data/system/data/licenses/GNU GPL v1 diff --git a/data/etc/licenses/GNU GPL v2 b/data/system/data/licenses/GNU GPL v2 similarity index 100% rename from data/etc/licenses/GNU GPL v2 rename to data/system/data/licenses/GNU GPL v2 diff --git a/data/etc/licenses/GNU GPL v3 b/data/system/data/licenses/GNU GPL v3 similarity index 100% rename from data/etc/licenses/GNU GPL v3 rename to data/system/data/licenses/GNU GPL v3 diff --git a/data/etc/licenses/GNU LGPL v2 b/data/system/data/licenses/GNU LGPL v2 similarity index 100% rename from data/etc/licenses/GNU LGPL v2 rename to data/system/data/licenses/GNU LGPL v2 diff --git a/data/etc/licenses/GNU LGPL v2.1 b/data/system/data/licenses/GNU LGPL v2.1 similarity index 100% rename from data/etc/licenses/GNU LGPL v2.1 rename to data/system/data/licenses/GNU LGPL v2.1 diff --git a/data/etc/licenses/LibHTTPd b/data/system/data/licenses/LibHTTPd similarity index 100% rename from data/etc/licenses/LibHTTPd rename to data/system/data/licenses/LibHTTPd diff --git a/data/etc/licenses/MIT b/data/system/data/licenses/MIT similarity index 100% rename from data/etc/licenses/MIT rename to data/system/data/licenses/MIT