[OSK]

- Add german resource file.
- Convert all others to UTF-8.
- Add manifest file and modify DOIALOG to DIALOGEX + changing default font to MS Shell Dlg. Hello themed keyboard ^^
TBD: Sizes are WAY too small IMO...

svn path=/trunk/; revision=65572

diff --git a/reactos/base/applications/osk/lang/ar-DZ.rc b/reactos/base/applications/osk/lang/ar-DZ.rc
index f027799..f6bee19 100644 (file)
--- a/reactos/base/applications/osk/lang/ar-DZ.rc
+++ b/reactos/base/applications/osk/lang/ar-DZ.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "On screen keyboard"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/de-DE.rc b/reactos/base/applications/osk/lang/de-DE.rc
new file mode 100644 (file)
index 0000000..9f2a49e
--- /dev/null
+++ b/reactos/base/applications/osk/lang/de-DE.rc
@@ -0,0 +1,128 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            base/applications/osk/lang/en-US.rc
+ * PURPOSE:         On screen keyboard (German resources).
+ * PROGRAMMERS:     Denis ROBERT
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
+CAPTION "Bildschirmtastatur"
+FONT 8, "MS Shell Dlg"
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
+BEGIN
+    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13
+    PUSHBUTTON      "F1",SCAN_CODE_112,39,3,14,13
+    PUSHBUTTON      "F2",SCAN_CODE_113,56,3,14,13
+    PUSHBUTTON      "F3",SCAN_CODE_114,74,3,14,13
+    PUSHBUTTON      "F4",SCAN_CODE_115,92,3,14,13
+    PUSHBUTTON      "F5",SCAN_CODE_116,117,3,14,13
+    PUSHBUTTON      "F6",SCAN_CODE_117,135,3,14,13
+    PUSHBUTTON      "F7",SCAN_CODE_118,152,3,14,13
+    PUSHBUTTON      "F8",SCAN_CODE_119,170,3,14,13
+    PUSHBUTTON      "F9",SCAN_CODE_120,195,3,14,13
+    PUSHBUTTON      "F10",SCAN_CODE_121,213,3,14,13
+    PUSHBUTTON      "F11",SCAN_CODE_122,231,3,14,13
+    PUSHBUTTON      "F12",SCAN_CODE_123,248,3,14,13
+    PUSHBUTTON      "Druck",SCAN_CODE_124,273,3,14,13
+    PUSHBUTTON      "Rollen",SCAN_CODE_125,291,3,14,13
+    PUSHBUTTON      "Pause",SCAN_CODE_126,309,3,14,13
+    PUSHBUTTON      "^",SCAN_CODE_1,3,26,14,13
+    PUSHBUTTON      "1",SCAN_CODE_2,21,26,14,13
+    PUSHBUTTON      "2",SCAN_CODE_3,39,26,14,13
+    PUSHBUTTON      "3",SCAN_CODE_4,56,26,14,13
+    PUSHBUTTON      "4",SCAN_CODE_5,74,26,14,13
+    PUSHBUTTON      "5",SCAN_CODE_6,92,26,14,13
+    PUSHBUTTON      "6",SCAN_CODE_7,110,26,14,13
+    PUSHBUTTON      "7",SCAN_CODE_8,128,26,14,13
+    PUSHBUTTON      "8",SCAN_CODE_9,145,26,14,13
+    PUSHBUTTON      "9",SCAN_CODE_10,163,26,14,13
+    PUSHBUTTON      "0",SCAN_CODE_11,181,26,14,13
+    PUSHBUTTON      "ß",SCAN_CODE_12,199,26,14,13
+    PUSHBUTTON      "´",SCAN_CODE_13,216,26,14,13
+    PUSHBUTTON      "<--",SCAN_CODE_15,234,26,28,13,BS_ICON
+    PUSHBUTTON      "Tab",SCAN_CODE_16,3,43,21,13,BS_ICON
+    PUSHBUTTON      "Q",SCAN_CODE_17,28,43,14,13
+    PUSHBUTTON      "W",SCAN_CODE_18,46,43,14,13
+    PUSHBUTTON      "E",SCAN_CODE_19,64,43,14,13
+    PUSHBUTTON      "R",SCAN_CODE_20,81,43,14,13
+    PUSHBUTTON      "T",SCAN_CODE_21,99,43,14,13
+    PUSHBUTTON      "Z",SCAN_CODE_22,117,43,14,13
+    PUSHBUTTON      "U",SCAN_CODE_23,135,43,14,13
+    PUSHBUTTON      "I",SCAN_CODE_24,152,43,14,13
+    PUSHBUTTON      "O",SCAN_CODE_25,170,43,14,13
+    PUSHBUTTON      "P",SCAN_CODE_26,188,43,14,13
+    PUSHBUTTON      "Ü",SCAN_CODE_27,206,43,14,13
+    PUSHBUTTON      "+",SCAN_CODE_28,224,43,14,13
+    PUSHBUTTON      "#",SCAN_CODE_29,242,43,20,13
+    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,60,28,13,BS_ICON
+    PUSHBUTTON      "A",SCAN_CODE_31,35,60,14,13
+    PUSHBUTTON      "S",SCAN_CODE_32,53,60,14,13
+    PUSHBUTTON      "D",SCAN_CODE_33,71,60,14,13
+    PUSHBUTTON      "F",SCAN_CODE_34,88,60,14,13
+    PUSHBUTTON      "G",SCAN_CODE_35,106,60,14,13
+    PUSHBUTTON      "H",SCAN_CODE_36,124,60,14,13
+    PUSHBUTTON      "J",SCAN_CODE_37,142,60,14,13
+    PUSHBUTTON      "K",SCAN_CODE_38,160,60,14,13
+    PUSHBUTTON      "L",SCAN_CODE_39,177,60,14,13
+    PUSHBUTTON      "Ö",SCAN_CODE_40,195,60,14,13
+    PUSHBUTTON      "Ä",SCAN_CODE_41,213,60,14,13
+    PUSHBUTTON      "Ret",SCAN_CODE_43,231,60,31,13,BS_ICON
+    PUSHBUTTON      "Shift",SCAN_CODE_44,3,77,35,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "Y",SCAN_CODE_46,42,77,14,13
+    PUSHBUTTON      "X",SCAN_CODE_47,60,77,14,13
+    PUSHBUTTON      "C",SCAN_CODE_48,78,77,14,13
+    PUSHBUTTON      "V",SCAN_CODE_49,96,77,14,13
+    PUSHBUTTON      "B",SCAN_CODE_50,113,77,14,13
+    PUSHBUTTON      "N",SCAN_CODE_51,131,77,14,13
+    PUSHBUTTON      "M",SCAN_CODE_52,149,77,14,13
+    PUSHBUTTON      ",",SCAN_CODE_53,167,77,14,13
+    PUSHBUTTON      ".",SCAN_CODE_54,184,77,14,13
+    PUSHBUTTON      "-",SCAN_CODE_55,202,77,14,13
+    PUSHBUTTON      "Shift",SCAN_CODE_57,220,77,43,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "Strg",SCAN_CODE_58,3,94,25,13,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ROS",SCAN_CODE_127,32,94,18,13,BS_ICON
+    PUSHBUTTON      "Alt",SCAN_CODE_60,53,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "",SCAN_CODE_61,74,94,100,13
+    PUSHBUTTON      "Alt Gr",SCAN_CODE_62,177,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ROS",SCAN_CODE_128,199,94,18,13,BS_ICON
+    PUSHBUTTON      "Menü",SCAN_CODE_129,220,94,18,13,BS_ICON
+    PUSHBUTTON      "Strg",SCAN_CODE_64,241,94,21,13,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "Einfg",SCAN_CODE_75,273,26,14,13
+    PUSHBUTTON      "Entf",SCAN_CODE_76,273,43,14,13
+    PUSHBUTTON      "Pos1",SCAN_CODE_80,291,26,14,13,BS_ICON
+    PUSHBUTTON      "Ende",SCAN_CODE_81,291,43,14,13
+    PUSHBUTTON      "pg auf",SCAN_CODE_85,309,26,14,13,BS_ICON
+    PUSHBUTTON      "pg ab",SCAN_CODE_86,309,43,14,13,BS_ICON
+    PUSHBUTTON      "<-",SCAN_CODE_79,273,94,14,13,BS_ICON
+    PUSHBUTTON      "^",SCAN_CODE_83,291,77,14,13,BS_ICON
+    PUSHBUTTON      "v",SCAN_CODE_84,291,94,14,13,BS_ICON
+    PUSHBUTTON      "->",SCAN_CODE_89,309,94,14,13,BS_ICON
+    PUSHBUTTON      "Num",SCAN_CODE_90,334,26,14,13
+    PUSHBUTTON      "7",SCAN_CODE_91,334,43,14,13
+    PUSHBUTTON      "4",SCAN_CODE_92,334,60,14,13
+    PUSHBUTTON      "1",SCAN_CODE_93,334,77,14,13
+    PUSHBUTTON      "/",SCAN_CODE_95,352,26,14,13
+    PUSHBUTTON      "8",SCAN_CODE_96,352,43,14,13
+    PUSHBUTTON      "5",SCAN_CODE_97,352,60,14,13
+    PUSHBUTTON      "2",SCAN_CODE_98,352,77,14,13
+    PUSHBUTTON      "0",SCAN_CODE_99,334,94,32,13
+    PUSHBUTTON      "*",SCAN_CODE_100,369,26,14,13
+    PUSHBUTTON      "9",SCAN_CODE_101,369,43,14,13
+    PUSHBUTTON      "6",SCAN_CODE_102,369,60,14,13
+    PUSHBUTTON      "3",SCAN_CODE_103,369,77,14,13
+    PUSHBUTTON      ",",SCAN_CODE_104,369,94,14,13
+    PUSHBUTTON      "-",SCAN_CODE_105,387,26,14,13
+    PUSHBUTTON      "+",SCAN_CODE_106,387,43,14,30
+    PUSHBUTTON      "Ent",SCAN_CODE_108,387,77,14,30
+    CTEXT           "Num",IDC_STATIC,334,4,18,8
+    CONTROL         "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,341,16,4,3
+    CTEXT           "Caps",IDC_STATIC,359,4,18,8
+    CONTROL         "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,366,16,4,3
+    CTEXT           "Rollen",IDC_STATIC,384,4,18,8
+    CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,391,16,4,3
+END
+
+/* EOF */

diff --git a/reactos/base/applications/osk/lang/en-GB.rc b/reactos/base/applications/osk/lang/en-GB.rc
index 4bd3c5d..bf8b4f4 100644 (file)
--- a/reactos/base/applications/osk/lang/en-GB.rc
+++ b/reactos/base/applications/osk/lang/en-GB.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Clavier visuel"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Ech",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/en-US.rc b/reactos/base/applications/osk/lang/en-US.rc
index 7c5a95c..118786a 100644 (file)
--- a/reactos/base/applications/osk/lang/en-US.rc
+++ b/reactos/base/applications/osk/lang/en-US.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "On screen keyboard"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/es-ES.rc b/reactos/base/applications/osk/lang/es-ES.rc
index a2d6fcf..4194edc 100644 (file)
--- a/reactos/base/applications/osk/lang/es-ES.rc
+++ b/reactos/base/applications/osk/lang/es-ES.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Teclado visual"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "ech",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/fr-CA.rc b/reactos/base/applications/osk/lang/fr-CA.rc
index d3f1762..4c58257 100644 (file)
--- a/reactos/base/applications/osk/lang/fr-CA.rc
+++ b/reactos/base/applications/osk/lang/fr-CA.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Clavier visuel"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "ech",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/fr-FR.rc b/reactos/base/applications/osk/lang/fr-FR.rc
index ca6832a..dc53536 100644 (file)
--- a/reactos/base/applications/osk/lang/fr-FR.rc
+++ b/reactos/base/applications/osk/lang/fr-FR.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Clavier visuel"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "ech",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/it-IT.rc b/reactos/base/applications/osk/lang/it-IT.rc
index 5755e6c..e5b3b3b 100644 (file)
--- a/reactos/base/applications/osk/lang/it-IT.rc
+++ b/reactos/base/applications/osk/lang/it-IT.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Tastiera visivo"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13
@@ -39,7 +39,7 @@ BEGIN
     PUSHBUTTON      "7",SCAN_CODE_8,128,26,14,13
     PUSHBUTTON      "8",SCAN_CODE_9,145,26,14,13
     PUSHBUTTON      "9",SCAN_CODE_10,163,26,14,13
-    PUSHBUTTON      "0 ",SCAN_CODE_11,181,26,14,13
+    PUSHBUTTON      "0Â ",SCAN_CODE_11,181,26,14,13
     PUSHBUTTON      "'",SCAN_CODE_12,199,26,14,13
     PUSHBUTTON      "|",SCAN_CODE_13,216,26,14,13
     PUSHBUTTON      "<--",SCAN_CODE_15,234,26,28,13,BS_ICON
@@ -54,7 +54,7 @@ BEGIN
     PUSHBUTTON      "I",SCAN_CODE_24,152,43,14,13
     PUSHBUTTON      "O",SCAN_CODE_25,170,43,14,13
     PUSHBUTTON      "P",SCAN_CODE_26,188,43,14,13
-    PUSHBUTTON      "è",SCAN_CODE_27,206,43,14,13
+    PUSHBUTTON      "Ã\83¨",SCAN_CODE_27,206,43,14,13
     PUSHBUTTON      "+",SCAN_CODE_28,224,43,14,13
     PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,60,28,13,BS_ICON
     PUSHBUTTON      "A",SCAN_CODE_31,35,60,14,13
@@ -66,9 +66,9 @@ BEGIN
     PUSHBUTTON      "J",SCAN_CODE_37,142,60,14,13
     PUSHBUTTON      "K",SCAN_CODE_38,160,60,14,13
     PUSHBUTTON      "L",SCAN_CODE_39,177,60,14,13
-    PUSHBUTTON      "ò",SCAN_CODE_40,195,60,14,13
-    PUSHBUTTON      "à",SCAN_CODE_41,213,60,14,13
-    PUSHBUTTON      "ù",SCAN_CODE_42,231,60,14,13
+    PUSHBUTTON      "Ã\83²",SCAN_CODE_40,195,60,14,13
+    PUSHBUTTON      "Ã\83Â ",SCAN_CODE_41,213,60,14,13
+    PUSHBUTTON      "Ã\83¹",SCAN_CODE_42,231,60,14,13
     PUSHBUTTON      "ret",SCAN_CODE_43,248,43,14,30,BS_ICON
     PUSHBUTTON      "Shift",SCAN_CODE_44,3,77,18,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
     PUSHBUTTON      "<",SCAN_CODE_45,24,77,14,13

diff --git a/reactos/base/applications/osk/lang/pl-PL.rc b/reactos/base/applications/osk/lang/pl-PL.rc
index df540bd..f7bf85f 100644 (file)
--- a/reactos/base/applications/osk/lang/pl-PL.rc
+++ b/reactos/base/applications/osk/lang/pl-PL.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Klawiatura Ekranowa"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/lang/ru-RU.rc b/reactos/base/applications/osk/lang/ru-RU.rc
index bf108fc..fd270eb 100644 (file)
--- a/reactos/base/applications/osk/lang/ru-RU.rc
+++ b/reactos/base/applications/osk/lang/ru-RU.rc
@@ -8,9 +8,9 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 
-MAIN_DIALOG DIALOG DISCARDABLE 0, 0, 404, 108
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108
 CAPTION "Клавиатура визуальный"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
 BEGIN
     PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,14,13

diff --git a/reactos/base/applications/osk/rsrc.rc b/reactos/base/applications/osk/rsrc.rc
index 14daffc..6cd47be 100644 (file)
--- a/reactos/base/applications/osk/rsrc.rc
+++ b/reactos/base/applications/osk/rsrc.rc
@@ -39,12 +39,16 @@ IDI_TOP       ICON "res/top.ico"
 IDI_RIGHT     ICON "res/right.ico"
 IDI_BOTTOM    ICON "res/bottom.ico"
 
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_AR_DZ
     #include "lang/ar-DZ.rc"
 #endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif