winhlp32: Add support for accelerators in general and F1 in particular.
diff --git a/po/ar.po b/po/ar.po
index 099056f..9f988f1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10537,7 +10537,8 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&مساعدة المساعدة"
#: winhlp32.rc:55
diff --git a/po/bg.po b/po/bg.po
index 3f49483..3da53dd 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10763,7 +10763,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Помощ за помощта"
#: winhlp32.rc:55
diff --git a/po/ca.po b/po/ca.po
index a10e8e6..c4238f1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10429,7 +10429,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/cs.po b/po/cs.po
index 33bcc03..1192fa8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11200,7 +11200,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Pomoc k nápovědě"
#: winhlp32.rc:55
diff --git a/po/da.po b/po/da.po
index 77f1ba3..fec741a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11254,7 +11254,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Brug af Hjælp"
#: winhlp32.rc:55
diff --git a/po/de.po b/po/de.po
index e24f649..1be6475 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11212,7 +11212,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Hilfe benutzen"
#: winhlp32.rc:55
diff --git a/po/el.po b/po/el.po
index dd1be9c..7b83732 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10550,7 +10550,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/en.po b/po/en.po
index 4d7962e..2b10b1f 100644
--- a/po/en.po
+++ b/po/en.po
@@ -10775,8 +10775,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
-msgstr ""
+msgid "&Help on help\tF1"
+msgstr "&Help on help\tF1"
#: winhlp32.rc:55
msgid "Always on &top"
diff --git a/po/en_US.po b/po/en_US.po
index 9cfdbed..1076023 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -10935,8 +10935,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
-msgstr "&Help on help"
+msgid "&Help on help\tF1"
+msgstr "&Help on help\tF1"
#: winhlp32.rc:55
msgid "Always on &top"
diff --git a/po/eo.po b/po/eo.po
index d051b3d..0a53ab9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10739,7 +10739,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "Pri Helpanto"
#: winhlp32.rc:55
diff --git a/po/es.po b/po/es.po
index 95505df..9acac49 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11431,7 +11431,8 @@
msgstr "Grande"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "A&yuda sobre la ayuda"
#: winhlp32.rc:55
diff --git a/po/fa.po b/po/fa.po
index 9e5ac3d..9d5344e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10540,7 +10540,8 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&کمک برای کمک"
#: winhlp32.rc:55
diff --git a/po/fi.po b/po/fi.po
index d404714..3931820 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10857,7 +10857,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "Apua &Opastuksesta"
#: winhlp32.rc:55
diff --git a/po/fr.po b/po/fr.po
index 3c67a9f..0748c27 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11070,7 +11070,8 @@
msgstr "Grande"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Utiliser l'aide"
#: winhlp32.rc:55
diff --git a/po/he.po b/po/he.po
index c0d4764..806bc51 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11109,7 +11109,8 @@
msgstr "גדולים"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "ע&זרה לעזרה"
#: winhlp32.rc:55
diff --git a/po/hi.po b/po/hi.po
index a6a77c7..c1cbb33 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10412,7 +10412,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/hu.po b/po/hu.po
index c65b5ae..bff96af 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11099,7 +11099,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Használat"
#: winhlp32.rc:55
diff --git a/po/it.po b/po/it.po
index 761f859..b9f6cf9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11343,7 +11343,8 @@
msgstr "Grandi"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Aiuto sulla Guida"
#: winhlp32.rc:55
diff --git a/po/ja.po b/po/ja.po
index fe941d1..fc427ae 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10944,7 +10944,8 @@
msgstr "大"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "ヘルプの使い方(&H)"
#: winhlp32.rc:55
diff --git a/po/ko.po b/po/ko.po
index d239c05..13fb85b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10896,7 +10896,8 @@
msgstr "크게"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "도움말 사용법(&H)"
#: winhlp32.rc:55
diff --git a/po/lt.po b/po/lt.po
index aaa8a98..ff87277 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10971,7 +10971,8 @@
msgstr "&Didelis"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "Pa&galba apie žinyną"
#: winhlp32.rc:55
diff --git a/po/ml.po b/po/ml.po
index f893f21..045dab9 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10412,7 +10412,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/nb_NO.po b/po/nb_NO.po
index ffd9065..930dc70 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -11225,7 +11225,8 @@
msgstr "Stor"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Hjelp om hjelp"
#: winhlp32.rc:55
diff --git a/po/nl.po b/po/nl.po
index 3353792..df18b40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11100,7 +11100,8 @@
msgstr "Groot"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "H&ulp bij Help"
#: winhlp32.rc:55
diff --git a/po/or.po b/po/or.po
index b7d41f6..dda8e58 100644
--- a/po/or.po
+++ b/po/or.po
@@ -10412,7 +10412,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/pa.po b/po/pa.po
index 3e0109e..34fb834 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10412,7 +10412,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/pl.po b/po/pl.po
index 89d4ccf..e114585 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10983,7 +10983,8 @@
msgstr "Duże"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "Pomo&c"
#: winhlp32.rc:55
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 370131e..529dd91 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11292,7 +11292,8 @@
msgstr "Grande"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Ajuda na ajuda"
#: winhlp32.rc:55
diff --git a/po/pt_PT.po b/po/pt_PT.po
index a5f94ca..b99e04d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -11352,7 +11352,8 @@
msgstr "Grande"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Ajuda na ajuda"
#: winhlp32.rc:55
diff --git a/po/rm.po b/po/rm.po
index 841e921..d60cd28 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -10490,7 +10490,7 @@
#: winhlp32.rc:54
#, fuzzy
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr "&Douvrar l'ag�d"
#: winhlp32.rc:55
diff --git a/po/ro.po b/po/ro.po
index 9d2c7d3..3027816 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -11587,7 +11587,8 @@
msgstr "Mare"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Ajutor la ajutor"
#: winhlp32.rc:55
diff --git a/po/ru.po b/po/ru.po
index 536eb0f..1df236c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10960,7 +10960,8 @@
msgstr "Крупный"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Использование справки"
#: winhlp32.rc:55
diff --git a/po/sk.po b/po/sk.po
index 966c6df..27d032b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10718,7 +10718,7 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/sl.po b/po/sl.po
index e710437..2c89b6e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11387,7 +11387,8 @@
msgstr "Velika"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&O pomoči"
#: winhlp32.rc:55
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 002132b..f53f9bc 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -10910,7 +10910,8 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Помоћ за помоћ"
#: winhlp32.rc:55
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 765f434..f30dd24 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -10986,7 +10986,8 @@
msgstr "Veliki"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Pomoć za pomoć"
#: winhlp32.rc:55
diff --git a/po/sv.po b/po/sv.po
index eca572a..5e3711e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11038,7 +11038,8 @@
msgstr "Stort"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "Användning &av hjälp"
#: winhlp32.rc:55
diff --git a/po/te.po b/po/te.po
index 2b83768..51d8896 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10412,7 +10412,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/th.po b/po/th.po
index e0863f3..a5389cc 100644
--- a/po/th.po
+++ b/po/th.po
@@ -10581,7 +10581,8 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "เกี่ยวกับช่วยเหลีอ"
#: winhlp32.rc:55
diff --git a/po/tr.po b/po/tr.po
index 9e7070e..b780104 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11368,7 +11368,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Yardım kullanımı"
#: winhlp32.rc:55
diff --git a/po/uk.po b/po/uk.po
index 4e5500c..666f06e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10968,7 +10968,8 @@
msgstr "Великий"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Використання Довідки"
#: winhlp32.rc:55
diff --git a/po/wa.po b/po/wa.po
index 37760f8..2735aa8 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10557,7 +10557,8 @@
msgstr "Large"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "&Aide so l' Aide"
#: winhlp32.rc:55
diff --git a/po/wine.pot b/po/wine.pot
index 74e8484..cc98f85 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -10381,7 +10381,7 @@
msgstr ""
#: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
msgstr ""
#: winhlp32.rc:55
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e50da69..50fc779 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10887,7 +10887,8 @@
msgstr "大号"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "如何使用帮助(&H)"
#: winhlp32.rc:55
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 62abafc..87b7682 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10948,7 +10948,8 @@
msgstr "大號"
#: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
msgstr "如何使用幫助(&H)"
#: winhlp32.rc:55
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 685b55a..a43a784 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -1347,7 +1347,7 @@
case WM_COMMAND:
win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
- switch (wParam)
+ switch (LOWORD(wParam))
{
/* Menu FILE */
case MNID_FILE_OPEN: MACRO_FileOpen(); break;
@@ -1654,6 +1654,7 @@
static CHAR default_wndname[] = "main";
LPSTR wndname = default_wndname;
WINHELP_DLL* dll;
+ HACCEL hAccel;
Globals.hInstance = hInstance;
@@ -1725,10 +1726,15 @@
WINHELP_GetWindowInfo(hlpfile, wndname), show);
/* Message loop */
+ hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(MAIN_ACCEL));
while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0))
{
- TranslateMessage(&msg);
- DispatchMessage(&msg);
+ HWND hWnd = Globals.active_win ? Globals.active_win->hMainWnd : NULL;
+ if (!TranslateAcceleratorW(hWnd, hAccel, &msg))
+ {
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
+ }
}
for (dll = Globals.dlls; dll; dll = dll->next)
{
diff --git a/programs/winhlp32/winhelp_res.h b/programs/winhlp32/winhelp_res.h
index 92a4863..5bf97aa 100644
--- a/programs/winhlp32/winhelp_res.h
+++ b/programs/winhlp32/winhelp_res.h
@@ -29,6 +29,7 @@
#define MAIN_MENU 0xF000
#define CONTEXT_MENU 0xF001
+#define MAIN_ACCEL 0xF002
#define STID_WINE_HELP 0x120
#define STID_WHERROR 0x121
diff --git a/programs/winhlp32/winhlp32.rc b/programs/winhlp32/winhlp32.rc
index 8d3acaf..6f0ee8a 100644
--- a/programs/winhlp32/winhlp32.rc
+++ b/programs/winhlp32/winhlp32.rc
@@ -51,7 +51,7 @@
END
}
POPUP "&Help" {
- MENUITEM "&Help on help", MNID_HELP_HELPON
+ MENUITEM "&Help on help\tF1", MNID_HELP_HELPON
MENUITEM "Always on &top", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&About Wine Help", MNID_HELP_ABOUT
@@ -94,5 +94,11 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+MAIN_ACCEL ACCELERATORS
+{
+ VK_F1, MNID_HELP_HELPON, VIRTKEY
+}
+
/* @makedep: winhelp.ico */
IDI_WINHELP ICON winhelp.ico
