ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhlp32: Add support for accelerators in general and F1 in particular.

This commit is contained in:
Francois Gouget 2011-04-08 12:03:25 +02:00 committed by Alexandre Julliard
parent 4cb9c16143
commit d30316568a
48 changed files with 97 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/ar.po
View File

@ -10537,7 +10537,8 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&مساعدة المساعدة" msgstr "&مساعدة المساعدة"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/bg.po
View File

@ -10763,7 +10763,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Помощ за помощта" msgstr "&Помощ за помощта"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/ca.po
View File

@ -10429,7 +10429,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/cs.po
View File

@ -11200,7 +11200,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Pomoc k nápovědě" msgstr "&Pomoc k nápovědě"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/da.po
View File

@ -11254,7 +11254,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Brug af Hjælp" msgstr "&Brug af Hjælp"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/de.po
View File

@ -11212,7 +11212,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Hilfe benutzen" msgstr "&Hilfe benutzen"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/el.po
View File

@ -10550,7 +10550,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

4
po/en.po
View File

@ -10775,8 +10775,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr "&Help on help\tF1"
#: winhlp32.rc:55 #: winhlp32.rc:55
msgid "Always on &top" msgid "Always on &top"

4
po/en_US.po
View File

@ -10935,8 +10935,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "&Help on help" msgstr "&Help on help\tF1"
#: winhlp32.rc:55 #: winhlp32.rc:55
msgid "Always on &top" msgid "Always on &top"

3
po/eo.po
View File

@ -10739,7 +10739,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "Pri Helpanto" msgstr "Pri Helpanto"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/es.po
View File

@ -11431,7 +11431,8 @@ msgid "Large"
msgstr "Grande" msgstr "Grande"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "A&yuda sobre la ayuda" msgstr "A&yuda sobre la ayuda"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/fa.po
View File

@ -10540,7 +10540,8 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&کمک برای کمک" msgstr "&کمک برای کمک"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/fi.po
View File

@ -10857,7 +10857,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "Apua &Opastuksesta" msgstr "Apua &Opastuksesta"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/fr.po
View File

@ -11070,7 +11070,8 @@ msgid "Large"
msgstr "Grande" msgstr "Grande"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Utiliser l'aide" msgstr "&Utiliser l'aide"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/he.po
View File

@ -11109,7 +11109,8 @@ msgid "Large"
msgstr "גדולים" msgstr "גדולים"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "ע&זרה לעזרה" msgstr "ע&זרה לעזרה"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/hi.po
View File

@ -10412,7 +10412,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/hu.po
View File

@ -11099,7 +11099,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Használat" msgstr "&Használat"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/it.po
View File

@ -11343,7 +11343,8 @@ msgid "Large"
msgstr "Grandi" msgstr "Grandi"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Aiuto sulla Guida" msgstr "&Aiuto sulla Guida"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/ja.po
View File

@ -10944,7 +10944,8 @@ msgid "Large"
msgstr "大" msgstr "大"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "ヘルプの使い方(&H)" msgstr "ヘルプの使い方(&H)"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/ko.po
View File

@ -10896,7 +10896,8 @@ msgid "Large"
msgstr "크게" msgstr "크게"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "도움말 사용법(&H)" msgstr "도움말 사용법(&H)"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/lt.po
View File

@ -10971,7 +10971,8 @@ msgid "Large"
msgstr "&Didelis" msgstr "&Didelis"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "Pa&galba apie žinyną" msgstr "Pa&galba apie žinyną"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/ml.po
View File

@ -10412,7 +10412,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/nb_NO.po
View File

@ -11225,7 +11225,8 @@ msgid "Large"
msgstr "Stor" msgstr "Stor"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Hjelp om hjelp" msgstr "&Hjelp om hjelp"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/nl.po
View File

@ -11100,7 +11100,8 @@ msgid "Large"
msgstr "Groot" msgstr "Groot"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "H&ulp bij Help" msgstr "H&ulp bij Help"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/or.po
View File

@ -10412,7 +10412,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/pa.po
View File

@ -10412,7 +10412,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/pl.po
View File

@ -10983,7 +10983,8 @@ msgid "Large"
msgstr "Duże" msgstr "Duże"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "Pomo&c" msgstr "Pomo&c"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/pt_BR.po
View File

@ -11292,7 +11292,8 @@ msgid "Large"
msgstr "Grande" msgstr "Grande"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Ajuda na ajuda" msgstr "&Ajuda na ajuda"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/pt_PT.po
View File

@ -11352,7 +11352,8 @@ msgid "Large"
msgstr "Grande" msgstr "Grande"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Ajuda na ajuda" msgstr "&Ajuda na ajuda"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/rm.po
View File

@ -10490,7 +10490,7 @@ msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
#, fuzzy #, fuzzy
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "&Douvrar l'ag<61>d" msgstr "&Douvrar l'ag<61>d"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/ro.po
View File

@ -11587,7 +11587,8 @@ msgid "Large"
msgstr "Mare" msgstr "Mare"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Ajutor la ajutor" msgstr "&Ajutor la ajutor"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/ru.po
View File

@ -10960,7 +10960,8 @@ msgid "Large"
msgstr "Крупный" msgstr "Крупный"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Использование справки" msgstr "&Использование справки"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/sk.po
View File

@ -10718,7 +10718,7 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/sl.po
View File

@ -11387,7 +11387,8 @@ msgid "Large"
msgstr "Velika" msgstr "Velika"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&O pomoči" msgstr "&O pomoči"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/sr_RS@cyrillic.po
View File

@ -10910,7 +10910,8 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Помоћ за помоћ" msgstr "&Помоћ за помоћ"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/sr_RS@latin.po
View File

@ -10986,7 +10986,8 @@ msgid "Large"
msgstr "Veliki" msgstr "Veliki"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Pomoć za pomoć" msgstr "&Pomoć za pomoć"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/sv.po
View File

@ -11038,7 +11038,8 @@ msgid "Large"
msgstr "Stort" msgstr "Stort"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "Användning &av hjälp" msgstr "Användning &av hjälp"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/te.po
View File

@ -10412,7 +10412,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/th.po
View File

@ -10581,7 +10581,8 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "เกี่ยวกับช่วยเหลีอ" msgstr "เกี่ยวกับช่วยเหลีอ"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/tr.po
View File

@ -11368,7 +11368,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Yardım kullanımı" msgstr "&Yardım kullanımı"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/uk.po
View File

@ -10968,7 +10968,8 @@ msgid "Large"
msgstr "Великий" msgstr "Великий"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Використання Довідки" msgstr "&Використання Довідки"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/wa.po
View File

@ -10557,7 +10557,8 @@ msgid "Large"
msgstr "Large" msgstr "Large"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "&Aide so l' Aide" msgstr "&Aide so l' Aide"
#: winhlp32.rc:55 #: winhlp32.rc:55

2
po/wine.pot
View File

@ -10381,7 +10381,7 @@ msgid "Large"
msgstr "" msgstr ""
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" msgid "&Help on help\tF1"
msgstr "" msgstr ""
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/zh_CN.po
View File

@ -10887,7 +10887,8 @@ msgid "Large"
msgstr "大号" msgstr "大号"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "如何使用帮助(&H)" msgstr "如何使用帮助(&H)"
#: winhlp32.rc:55 #: winhlp32.rc:55

3
po/zh_TW.po
View File

@ -10948,7 +10948,8 @@ msgid "Large"
msgstr "大號" msgstr "大號"
#: winhlp32.rc:54 #: winhlp32.rc:54
msgid "&Help on help" #, fuzzy
msgid "&Help on help\tF1"
msgstr "如何使用幫助(&H)" msgstr "如何使用幫助(&H)"
#: winhlp32.rc:55 #: winhlp32.rc:55

12
programs/winhlp32/winhelp.c
View File

@ -1347,7 +1347,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
case WM_COMMAND: case WM_COMMAND:
win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
switch (wParam) switch (LOWORD(wParam))
{ {
/* Menu FILE */ /* Menu FILE */
case MNID_FILE_OPEN: MACRO_FileOpen(); break; case MNID_FILE_OPEN: MACRO_FileOpen(); break;
@ -1654,6 +1654,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
static CHAR default_wndname[] = "main"; static CHAR default_wndname[] = "main";
LPSTR wndname = default_wndname; LPSTR wndname = default_wndname;
WINHELP_DLL* dll; WINHELP_DLL* dll;
HACCEL hAccel;
Globals.hInstance = hInstance; Globals.hInstance = hInstance;
@ -1725,10 +1726,15 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
WINHELP_GetWindowInfo(hlpfile, wndname), show); WINHELP_GetWindowInfo(hlpfile, wndname), show);
/* Message loop */ /* Message loop */
hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(MAIN_ACCEL));
while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0)) while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0))
{ {
TranslateMessage(&msg); HWND hWnd = Globals.active_win ? Globals.active_win->hMainWnd : NULL;
DispatchMessage(&msg); if (!TranslateAcceleratorW(hWnd, hAccel, &msg))
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
} }
for (dll = Globals.dlls; dll; dll = dll->next) for (dll = Globals.dlls; dll; dll = dll->next)
{ {

1
programs/winhlp32/winhelp_res.h
View File

@ -29,6 +29,7 @@
#define MAIN_MENU 0xF000 #define MAIN_MENU 0xF000
#define CONTEXT_MENU 0xF001 #define CONTEXT_MENU 0xF001
#define MAIN_ACCEL 0xF002
#define STID_WINE_HELP 0x120 #define STID_WINE_HELP 0x120
#define STID_WHERROR 0x121 #define STID_WHERROR 0x121

8
programs/winhlp32/winhlp32.rc
View File

@ -51,7 +51,7 @@ MAIN_MENU MENU
END END
} }
POPUP "&Help" { 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 "Always on &top", MNID_HELP_HELPTOP
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&About Wine Help", MNID_HELP_ABOUT MENUITEM "&About Wine Help", MNID_HELP_ABOUT
@ -94,5 +94,11 @@ STID_PSH_INDEX, "Help topics: "
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
MAIN_ACCEL ACCELERATORS
{
VK_F1, MNID_HELP_HELPON, VIRTKEY
}
/* @makedep: winhelp.ico */ /* @makedep: winhelp.ico */
IDI_WINHELP ICON winhelp.ico IDI_WINHELP ICON winhelp.ico