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

winhlp32: Use a standard About dialog, with the proper icon.

This commit is contained in:
Alexandre Julliard 2010-10-15 12:13:13 +02:00
parent 9e0f26cdd6
commit 5d69141014
34 changed files with 8 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/winhlp32/Bg.rc
View File

@ -63,9 +63,6 @@ MAIN_MENU MENU
MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Îòíîñíî Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Cs.rc
View File

@ -68,9 +68,6 @@ MAIN_MENU MENU
MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informace...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "O &Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Da.rc
View File

@ -68,9 +68,6 @@ MAIN_MENU MENU
MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Information...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Om &Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/De.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Über Wine", MNID_HELP_WINE
#endif
}
}

10
programs/winhlp32/En.rc
View File

@ -63,10 +63,7 @@ MAIN_MENU MENU
MENUITEM "Help &on help", MNID_HELP_HELPON
MENUITEM "Always on &top", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&About Wine", MNID_HELP_WINE
#endif
MENUITEM "&About Wine Help", MNID_HELP_ABOUT
}
}
@ -110,10 +107,7 @@ MAIN_MENU MENU
MENUITEM "Help &on help", MNID_HELP_HELPON
MENUITEM "Always on &top", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&About Wine", MNID_HELP_WINE
#endif
MENUITEM "&About Wine Help", MNID_HELP_ABOUT
}
}

3
programs/winhlp32/Eo.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "Æiam &supre", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Pri...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Pri Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Es.rc
View File

@ -65,9 +65,6 @@ MAIN_MENU MENU
MENUITEM "&Siempre visible", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Acerca de Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Fi.rc
View File

@ -65,9 +65,6 @@ MAIN_MENU MENU
MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "T&ietoja...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Tietoja Winestä", MNID_HELP_WINE
#endif
}
}

5
programs/winhlp32/Fr.rc
View File

@ -69,10 +69,7 @@ MAIN_MENU MENU
MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "À &propos de Wine", MNID_HELP_WINE
#endif
MENUITEM "&A propos de l'Aide de Wine", MNID_HELP_ABOUT
}
}

3
programs/winhlp32/He.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "תמיד &עליון", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&מידע...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "על &אודות Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Hu.rc
View File

@ -65,9 +65,6 @@ MAIN_MENU MENU
MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Információ...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&&A Wine-ról", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/It.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informazioni su...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Informazioni su Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Ja.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "常に手前に表示(&T)", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "情報(&I)...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Wine について(&A)", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Ko.rc
View File

@ -64,9 +64,6 @@ MAIN_MENU MENU
MENUITEM "항상 위(&T)", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "정보(&I)...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Wine에 관하여(&A)", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Lt.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "&Visada viršuje", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informacija...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Apie Wine", MNID_HELP_WINE
#endif
}
}

2
programs/winhlp32/Makefile.in
View File

@ -12,8 +12,6 @@ C_SRCS = \
LEX_SRCS = macro.lex.l
EXTRARCFLAGS = -DWINELIB
RC_SRCS = \
Bg.rc \
Cs.rc \

3
programs/winhlp32/Nl.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Over Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/No.rc
View File

@ -63,9 +63,6 @@ MAIN_MENU MENU
MENUITEM "All&tid øverst", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informasjon...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Om Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Pl.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&O programie...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&O programie Wine", MNID_HELP_WINE
#endif
}
}

6
programs/winhlp32/Pt.rc
View File

@ -72,9 +72,6 @@ MAIN_MENU MENU
MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informações...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Sobre o Wine", MNID_HELP_WINE
#endif
}
}
@ -119,9 +116,6 @@ MAIN_MENU MENU
MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informações...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Acerca do Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Rm.rc
View File

@ -70,9 +70,6 @@ MAIN_MENU MENU
MENUITEM "Ad<41>na da&vant", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Davart &Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Ro.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "În&totdeauna deasupra", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informații...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Despre Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Ru.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "Всегда &сверху", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Информация...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&О Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Si.rc
View File

@ -65,9 +65,6 @@ MAIN_MENU MENU
MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informacije ...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&O Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Sk.rc
View File

@ -61,9 +61,6 @@ MAIN_MENU MENU
MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "O& Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Sr.rc
View File

@ -66,9 +66,6 @@ MAIN_MENU MENU
MENUITEM "Uvek na &vrhu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&O Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Sv.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Om Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Tr.rc
View File

@ -63,9 +63,6 @@ MAIN_MENU MENU
MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Bilgi...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Wine &Hakkýnda", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Uk.rc
View File

@ -71,9 +71,6 @@ MAIN_MENU MENU
MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Інформація...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "&Про Wine", MNID_HELP_WINE
#endif
}
}

3
programs/winhlp32/Wa.rc
View File

@ -67,9 +67,6 @@ MAIN_MENU MENU
MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "&Informåcion...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "Å &dfait di Wine", MNID_HELP_WINE
#endif
}
}

6
programs/winhlp32/Zh.rc
View File

@ -68,9 +68,6 @@ MAIN_MENU MENU
MENUITEM "总是在最前面(&T)", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "资料信息(&I)...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "关于 Wine(&A)", MNID_HELP_WINE
#endif
}
}
@ -136,9 +133,6 @@ MAIN_MENU MENU
MENUITEM "總是在最上面(&T)", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
MENUITEM "資訊(&I)...", MNID_HELP_ABOUT
#ifdef WINELIB
MENUITEM "關於 Wine(&A)", MNID_HELP_WINE
#endif
}
}

6
programs/winhlp32/macro.c
View File

@ -151,7 +151,11 @@ void CALLBACK MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow)
void CALLBACK MACRO_About(void)
{
WINE_FIXME("()\n");
WCHAR name[256];
HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINHELP),
IMAGE_ICON, 48, 48, LR_SHARED );
LoadStringW( Globals.hInstance, STID_WINE_HELP, name, sizeof(name)/sizeof(WCHAR) );
ShellAboutW( MACRO_CurrentWindow()->hMainWnd, name, NULL, icon );
}
static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str)

1
programs/winhlp32/winhelp.c
View File

@ -1368,7 +1368,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
case MNID_HELP_HELPON: MACRO_HelpOn(); break;
case MNID_HELP_HELPTOP: MACRO_HelpOnTop(); break;
case MNID_HELP_ABOUT: MACRO_About(); break;
case MNID_HELP_WINE: ShellAbout(hWnd, "Wine", "Help", 0); break;
/* Context help */
case MNID_CTXT_ANNOTATE:MACRO_Annotate(); break;

1
programs/winhlp32/winhelp_res.h
View File

@ -23,7 +23,6 @@
#define MNID_HELP_HELPON 0x141
#define MNID_HELP_HELPTOP 0x142
#define MNID_HELP_ABOUT 0x143
#define MNID_HELP_WINE 0x144
#define MNID_CTXT_ANNOTATE 0x200
#define MNID_CTXT_COPY 0x201