[OSK] Initial implementation of a menu (#1301)

diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc
index c11d828..4feabe0 100644 (file)
--- a/base/applications/osk/lang/ar-DZ.rc
+++ b/base/applications/osk/lang/ar-DZ.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "On screen keyboard"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc
index 316efe7..21b68ec 100644 (file)
--- a/base/applications/osk/lang/cs-CZ.rc
+++ b/base/applications/osk/lang/cs-CZ.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Klávesnice na obrazovce"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc
index f3faa31..3fa0d40 100644 (file)
--- a/base/applications/osk/lang/de-DE.rc
+++ b/base/applications/osk/lang/de-DE.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Bildschirmtastatur"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc
index 01d02c5..fa849f3 100644 (file)
--- a/base/applications/osk/lang/en-GB.rc
+++ b/base/applications/osk/lang/en-GB.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "On screen keyboard"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc
index c9dacb2..644e32c 100644 (file)
--- a/base/applications/osk/lang/en-US.rc
+++ b/base/applications/osk/lang/en-US.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
 CAPTION "On screen keyboard"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc
index f7f138e..41d8a18 100644 (file)
--- a/base/applications/osk/lang/es-ES.rc
+++ b/base/applications/osk/lang/es-ES.rc
@@ -12,6 +12,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Teclado en pantalla"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -128,6 +129,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -140,4 +180,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc
index 4284c6b..139ecd9 100644 (file)
--- a/base/applications/osk/lang/et-EE.rc
+++ b/base/applications/osk/lang/et-EE.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
 CAPTION "Ekraaniklaviatuur"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc
index 008420f..429156c 100644 (file)
--- a/base/applications/osk/lang/fr-CA.rc
+++ b/base/applications/osk/lang/fr-CA.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Clavier visuel"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc
index 0b3dee5..5057fa3 100644 (file)
--- a/base/applications/osk/lang/fr-FR.rc
+++ b/base/applications/osk/lang/fr-FR.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Clavier visuel"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "Clavier visuel"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc
index 3b1d67e..c91405b 100644 (file)
--- a/base/applications/osk/lang/he-IL.rc
+++ b/base/applications/osk/lang/he-IL.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "לוח מקשים על התצוגה"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc
index 96c7334..6e2c792 100644 (file)
--- a/base/applications/osk/lang/it-IT.rc
+++ b/base/applications/osk/lang/it-IT.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
 CAPTION "Tastiera a schermo"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+    BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "Tastiera a schermo"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc
index c3b5707..89244f0 100644 (file)
--- a/base/applications/osk/lang/pl-PL.rc
+++ b/base/applications/osk/lang/pl-PL.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Klawiatura Ekranowa"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc
index 9b3d080..379e54e 100644 (file)
--- a/base/applications/osk/lang/ro-RO.rc
+++ b/base/applications/osk/lang/ro-RO.rc
@@ -12,6 +12,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
 CAPTION "Tastatură virtuală"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -127,6 +128,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "Tastatură virtuală"
@@ -139,4 +179,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc
index bf99916..d4cdd6f 100644 (file)
--- a/base/applications/osk/lang/ru-RU.rc
+++ b/base/applications/osk/lang/ru-RU.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
 CAPTION "Экранная клавиатура"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc
index 4c3ea73..c12958f 100644 (file)
--- a/base/applications/osk/lang/tr-TR.rc
+++ b/base/applications/osk/lang/tr-TR.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "Ekran Klavyesi"
 FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -126,6 +127,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -138,4 +178,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc
index 48f9e42..f8deff1 100644 (file)
--- a/base/applications/osk/lang/zh-CN.rc
+++ b/base/applications/osk/lang/zh-CN.rc
@@ -14,6 +14,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "屏幕键盘"
 FONT 9, "宋体"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -129,6 +130,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "屏幕键盘"
@@ -141,4 +181,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc
index d200a53..97e83a7 100644 (file)
--- a/base/applications/osk/lang/zh-TW.rc
+++ b/base/applications/osk/lang/zh-TW.rc
@@ -13,6 +13,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
 CAPTION "螢幕鍵盤"
 FONT 9, "新細明體"
+MENU IDR_OSK_MENU
 STYLE WS_SYSMENU | WS_MINIMIZEBOX
 EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
 BEGIN
@@ -128,6 +129,45 @@ BEGIN
     CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
 END
 
+IDR_OSK_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "&Exit", IDM_EXIT
+    END
+
+    POPUP "Keyboard"
+    BEGIN
+        MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
+        MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
+        MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "101 keys", IDM_101_KEYS, CHECKED, GRAYED
+        MENUITEM "102 keys", IDM_102_KEYS, GRAYED
+        MENUITEM "106 keys", IDM_106_KEYS, GRAYED
+    END
+
+    POPUP "Settings"
+    BEGIN
+        MENUITEM "Always on Top", IDM_ON_TOP, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Use Click Sound", IDM_CLICK_SOUND, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Font...", IDM_FONT, GRAYED
+    END
+
+    POPUP "Help"
+    BEGIN
+        MENUITEM "&Help Topics", IDM_HELP_TOPICS, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&About On-Screen Keyboard...", IDM_ABOUT
+    END
+END
+
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "On-Screen Keyboard"
@@ -140,4 +180,10 @@ BEGIN
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
+STRINGTABLE
+BEGIN
+    STRING_OSK "On-Screen Keyboard"
+    STRING_AUTHORS "Copyright Denis Robert"
+END
+
 /* EOF */

diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c
index 8e62366..ffb01a2 100644 (file)
--- a/base/applications/osk/main.c
+++ b/base/applications/osk/main.c
@@ -99,6 +99,32 @@ INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lPar
     return FALSE;
 }
 
+/***********************************************************************
+ *
+ *          OSK_About
+ *
+ *  Initializes the "About" dialog box
+ */
+VOID OSK_About(VOID)
+{
+    WCHAR szTitle[MAX_BUFF];
+    WCHAR szAuthors[MAX_BUFF];
+    HICON OSKIcon;
+
+    /* Load the icon */
+    OSKIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
+
+    /* Load the strings into the "About" dialog */
+    LoadStringW(Globals.hInstance, STRING_OSK, szTitle, countof(szTitle));
+    LoadStringW(Globals.hInstance, STRING_AUTHORS, szAuthors, countof(szAuthors));
+
+    /* Finally, execute the "About" dialog by using the Shell routine */
+    ShellAboutW(Globals.hMainWnd, szTitle, szAuthors, OSKIcon);
+
+    /* Once done, destroy the icon */
+    DestroyIcon(OSKIcon);
+}
+
 
 /***********************************************************************
  *
@@ -401,10 +427,30 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_COMMAND:
-            if (wParam == IDCANCEL)
-                EndDialog(hDlg, FALSE);
-            else if (wParam != IDC_STATIC)
-                OSK_DlgCommand(wParam, (HWND) lParam);
+            switch (LOWORD(wParam))
+            {
+                case IDCANCEL:
+                {
+                    EndDialog(hDlg, FALSE);
+                    break;
+                }
+
+                case IDM_EXIT:
+                {
+                    EndDialog(hDlg, FALSE);
+                    break;
+                }
+
+                case IDM_ABOUT:
+                {
+                    OSK_About();
+                    break;
+                }
+
+                default:
+                    OSK_DlgCommand(wParam, (HWND)lParam);
+                    break;
+            }
             break;
 
         case WM_CLOSE:

diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h
index ca7922d..67f08b2 100644 (file)
--- a/base/applications/osk/main.h
+++ b/base/applications/osk/main.h
@@ -31,6 +31,7 @@ typedef struct
 extern OSK_GLOBALS Globals;
 
 #define countof(x) (sizeof(x) / sizeof((x)[0]))
+#define MAX_BUFF 256
 
 #endif
 

diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h
index 120632d..d62777e 100644 (file)
--- a/base/applications/osk/osk_res.h
+++ b/base/applications/osk/osk_res.h
@@ -29,8 +29,27 @@
 #define IDI_RIGHT               213
 #define IDI_BOTTOM              214
 
+#define IDR_OSK_MENU            600
+#define IDM_EXIT                601
+#define IDM_STANDARD_KB         602
+#define IDM_ENCHANCED_KB        603
+#define IDM_REG_LAYOUT          604
+#define IDM_BLOCK_LAYOUT        605
+#define IDM_101_KEYS            606
+#define IDM_102_KEYS            607
+#define IDM_106_KEYS            608
+#define IDM_ON_TOP              609
+#define IDM_CLICK_SOUND         610
+#define IDM_TYPE_MODE           611
+#define IDM_FONT                612
+#define IDM_HELP_TOPICS         613
+#define IDM_ABOUT               614
+
 #define IDD_WARNINGDIALOG_OSK   215
 
+#define STRING_OSK              500
+#define STRING_AUTHORS          501
+
 #define IDC_STATIC              -1