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

winhelp: Removed the topics button, and forward search and topics to the same prop sheet.

This commit is contained in:
Eric Pouech 2008-07-05 21:33:19 +02:00 committed by Alexandre Julliard
parent 53782ca47a
commit 841720e491
28 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/winhlp32/Bg.rc
View File

@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, "
STID_CONTENTS, "&Ñúäúðæàíèå"
STID_SEARCH, "&Òúðñè"
STID_BACK, "&Íàçàä"
STID_TOPICS, "&Òåìè"
STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)"
STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Cs.rc
View File

@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Nelze p
STID_CONTENTS, "&Obsah"
STID_SEARCH, "&Hledat"
STID_BACK, "&Zpìt"
STID_TOPICS, "&Témata"
STID_ALL_FILES, "Všechny soubory (*.*)"
STID_HELP_FILES_HLP, "Soubory nápovìdy (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Da.rc
View File

@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "Fejl ved indl
STID_CONTENTS, "&Indhold"
STID_SEARCH, "&Søg"
STID_BACK, "&Tilbage"
STID_TOPICS, "&Emner"
STID_ALL_FILES, "Alle filer (*.*)"
STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)"
STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?"

1
programs/winhlp32/De.rc
View File

@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'"
STID_CONTENTS, "&Inhalt"
STID_SEARCH, "&Suchen"
STID_BACK, "&Zurück"
STID_TOPICS, "&Themen"
STID_ALL_FILES, "Alle Dateien (*.*)"
STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)"
STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?"

9
programs/winhlp32/En.rc
View File

@ -76,6 +76,14 @@ CAPTION "Index"
PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12
}
IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg"
CAPTION "Search"
{
LTEXT "Not implemented yet", -1, 10, 10, 180, 150
}
/* Strings */
STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
{
@ -88,7 +96,6 @@ STID_HLPFILE_ERROR_s, "Error while reading the help file `%s'"
STID_CONTENTS, "&Contents"
STID_SEARCH, "&Search"
STID_BACK, "&Back"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "All files (*.*)"
STID_HELP_FILES_HLP, "Help files (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Eo.rc
View File

@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Eraro dum la legado de helpdosiero `%s'"
STID_CONTENTS, "&Enhavo"
STID_SEARCH, "&Seræu"
STID_BACK, "&Retro"
STID_TOPICS, "&Temoj"
STID_ALL_FILES, "Tutaj dosieroj (*.*)"
STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Es.rc
View File

@ -79,7 +79,6 @@ STID_HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'"
STID_CONTENTS, "&Índice"
STID_SEARCH, "&Buscar"
STID_BACK, "&Anterior"
STID_TOPICS, "&Temas"
STID_ALL_FILES, "Todos los archivos (*.*)"
STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Fi.rc
View File

@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'"
STID_CONTENTS, "&Sisällys"
STID_SEARCH, "&Etsi"
STID_BACK, "&Takaisin"
STID_TOPICS, "T&opics"
STID_ALL_FILES, "Kaikki tiedostot (*.*)"
STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Fr.rc
View File

@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide
STID_CONTENTS, "&Index"
STID_SEARCH, "&Rechercher"
STID_BACK, "&Précédent"
STID_TOPICS, "&Sujets"
STID_ALL_FILES, "Tous fichiers (*.*)"
STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)"
STID_FILE_NOT_FOUND_s "Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?"

1
programs/winhlp32/Hu.rc
View File

@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Hiba a `%s' file olvas
STID_CONTENTS, "&Tartalom"
STID_SEARCH, "&Keresés"
STID_BACK, "&Vissza"
STID_TOPICS, "&Témakörök"
STID_ALL_FILES, "Minden fájl (*.*)"
STID_HELP_FILES_HLP, "Súgó fájlok (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/It.rc
View File

@ -79,7 +79,6 @@ STID_HLPFILE_ERROR_s, "Errore di lettura del file della Guida `%s'"
STID_CONTENTS, "&Sommario"
STID_SEARCH, "&Trova"
STID_BACK, "&Precedente"
STID_TOPICS, "&Argomenti"
STID_ALL_FILES, "Tutti i file (*.*)"
STID_HELP_FILES_HLP, "File della Guida (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Ko.rc
View File

@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, "
STID_CONTENTS, "목차(&C)"
STID_SEARCH, "찾기(&S)"
STID_BACK, "뒤로(&B)"
STID_TOPICS, "¸ñÂ÷(&T)"
STID_ALL_FILES, "모든 파일 (*.*)"
STID_HELP_FILES_HLP, "도움말 파일 (*.hlp)"
STID_FILE_NOT_FOUND_s "%s을 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?"

1
programs/winhlp32/Nl.rc
View File

@ -88,7 +88,6 @@ STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand `%s'"
STID_CONTENTS, "&Inhoud"
STID_SEARCH, "&Zoeken"
STID_BACK, "&Terug"
STID_TOPICS, "&Onderwerpen"
STID_ALL_FILES, "Alle bestanden (*.*)"
STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)"
STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"

1
programs/winhlp32/No.rc
View File

@ -87,7 +87,6 @@ STID_HLPFILE_ERROR_s, "Feil ved lesing av hjelpefilen '%s'"
STID_CONTENTS, "&Innhold"
STID_SEARCH, "&Søk"
STID_BACK, "Til&bake"
STID_TOPICS, "&Emner"
STID_ALL_FILES, "Alle filer (*.*)"
STID_HELP_FILES_HLP, "Hjelp-filer (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Pl.rc
View File

@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "B
STID_CONTENTS, "&Zawartość"
STID_SEARCH, "&Szukaj"
STID_BACK, "&Wstecz"
STID_TOPICS, "&Tematy"
STID_ALL_FILES, "Wszystkie pliki (*.*)"
STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)"
STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszukać tego pliku samodzielnie?"

2
programs/winhlp32/Pt.rc
View File

@ -134,7 +134,6 @@ STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'"
STID_CONTENTS, "&Conteúdo"
STID_SEARCH, "&Procurar"
STID_BACK, "&Voltar"
STID_TOPICS, "&Tópicos"
STID_ALL_FILES, "Todos os arquivos (*.*)"
STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"
@ -155,7 +154,6 @@ STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'"
STID_CONTENTS, "&Conteúdo"
STID_SEARCH, "&Procurar"
STID_BACK, "&Voltar"
STID_TOPICS, "&Tópicos"
STID_ALL_FILES, "Todos os ficheiros (*.*)"
STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)"
STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?"

1
programs/winhlp32/Rm.rc
View File

@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'ag<61>d `%s'"
STID_CONTENTS, "&Cuntgn<67>"
STID_SEARCH, "&Tscherchar"
STID_BACK, "&Inavo"
STID_TOPICS, "T&opics"
STID_ALL_FILES, "Tuot las datotecas (*.*)"
STID_HELP_FILES_HLP, "Datotecas d'ag<61>d (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Ru.rc
View File

@ -87,7 +87,6 @@ STID_HLPFILE_ERROR_s, "
STID_CONTENTS, "&Ñîäåðæàíèå"
STID_SEARCH, "&Íàéòè"
STID_BACK, "&Íàçàä"
STID_TOPICS, "&Óêàçàòåëü"
STID_ALL_FILES, "Âñå ôàéëû (*.*)"
STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)"
STID_FILE_NOT_FOUND_s "Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?"

1
programs/winhlp32/Si.rc
View File

@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "Napaka pri branju datoteke s pomočjo `%s'"
STID_CONTENTS, "&Teme pomoči"
STID_SEARCH, "&Iskanje"
STID_BACK, "&Nazaj"
STID_TOPICS, "&Vsebina"
STID_ALL_FILES, "Vse datoteke (*.*)"
STID_HELP_FILES_HLP, "Datoteke s pomočjo (*.hlp)"
STID_FILE_NOT_FOUND_s "Ne najdem datoteke '%s'. Ali jo želite poiskati sami?"

1
programs/winhlp32/Sk.rc
View File

@ -75,7 +75,6 @@ STID_HLPFILE_ERROR_s, "Chyba po
STID_CONTENTS, "&Obsah"
STID_SEARCH, "&H¾ada<64>"
STID_BACK, "&Spä<70>"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "Všetky súbory (*.*)"
STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Sv.rc
View File

@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Fel vid läsning av hjälpfilen `%s'"
STID_CONTENTS, "&Innehåll"
STID_SEARCH, "&Sök"
STID_BACK, "&Bakåt"
STID_TOPICS, "&Ämnen"
STID_ALL_FILES, "Alla filer (*.*)"
STID_HELP_FILES_HLP, "Hjälpfiler (*.hlp)"
STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du söka efter denna fil?"

1
programs/winhlp32/Tr.rc
View File

@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, "'%s' yard
STID_CONTENTS, "&Ýçindekiler"
STID_SEARCH, "&Ara"
STID_BACK, "&Geri"
STID_TOPICS, "&Konular"
STID_ALL_FILES, "Tüm dosyalar (*.*)"
STID_HELP_FILES_HLP, "Yardým dosyalarý (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Wa.rc
View File

@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Y
STID_CONTENTS, "Å&dvins"
STID_SEARCH, "C&werî"
STID_BACK, "Èn &Erî"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "Tos les fitchîs (*.*)"
STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

1
programs/winhlp32/Zh.rc
View File

@ -78,7 +78,6 @@ STID_HLPFILE_ERROR_s, "
STID_CONTENTS, "内容（&C）"
STID_SEARCH, "搜索（&S）"
STID_BACK, "返回（&B）"
STID_TOPICS, "Ö÷Ì⣨&T£©"
STID_ALL_FILES, "所有文件 (*.*)"
STID_HELP_FILES_HLP, "帮助文件 (*.hlp)"
STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?"

4
programs/winhlp32/macro.c
View File

@ -517,7 +517,7 @@ void CALLBACK MACRO_Find(void)
void CALLBACK MACRO_Finder(void)
{
WINHELP_CreateIndexWindow();
WINHELP_CreateIndexWindow(FALSE);
}
void CALLBACK MACRO_FloatingMenu(void)
@ -880,7 +880,7 @@ void CALLBACK MACRO_SaveMark(LPCSTR str)
void CALLBACK MACRO_Search(void)
{
WINE_FIXME("()\n");
WINHELP_CreateIndexWindow(TRUE);
}
void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)

41
programs/winhlp32/winhelp.c
View File

@ -632,8 +632,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
MACRO_CreateButton("BTN_BACK", buffer, "Back()");
if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK");
LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
}
if (!bReUsed)
@ -1622,13 +1620,42 @@ INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
return FALSE;
}
/**************************************************************************
* WINHELP_SearchDlgProc
*
*/
INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
static struct index_data* id;
switch (msg)
{
case WM_INITDIALOG:
id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam;
return TRUE;
case WM_NOTIFY:
switch (((NMHDR*)lParam)->code)
{
case PSN_APPLY:
SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR);
return TRUE;
default:
return FALSE;
}
break;
default:
break;
}
return FALSE;
}
/**************************************************************************
* WINHELP_CreateIndexWindow
*
* Displays a dialog with keywords of current help file.
*
*/
BOOL WINHELP_CreateIndexWindow(void)
BOOL WINHELP_CreateIndexWindow(BOOL is_search)
{
HPROPSHEETPAGE psPage[3];
PROPSHEETPAGE psp;
@ -1660,6 +1687,11 @@ BOOL WINHELP_CreateIndexWindow(void)
psp.pfnDlgProc = WINHELP_IndexDlgProc;
psPage[0] = CreatePropertySheetPage(&psp);
psp.u.pszTemplate = MAKEINTRESOURCE(IDD_SEARCH);
psp.lParam = (LPARAM)&id;
psp.pfnDlgProc = WINHELP_SearchDlgProc;
psPage[1] = CreatePropertySheetPage(&psp);
memset(&psHead, 0, sizeof(psHead));
psHead.dwSize = sizeof(psHead);
@ -1667,7 +1699,8 @@ BOOL WINHELP_CreateIndexWindow(void)
strcat(buf, Globals.active_win->info->caption);
psHead.pszCaption = buf;
psHead.nPages = 1;
psHead.nPages = 2;
psHead.u2.nStartPage = is_search ? 1 : 0;
psHead.hwndParent = Globals.active_win->hMainWnd;
psHead.u3.phpage = psPage;
psHead.dwFlags = PSH_NOAPPLYNOW;

2
programs/winhlp32/winhelp.h
View File

@ -146,7 +146,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL);
BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),
HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
BOOL WINHELP_GetOpenFileName(LPSTR, int);
BOOL WINHELP_CreateIndexWindow(void);
BOOL WINHELP_CreateIndexWindow(BOOL);
void WINHELP_DeleteBackSet(WINHELP_WINDOW*);
INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);
HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);

2
programs/winhlp32/winhelp_res.h
View File

@ -45,7 +45,6 @@
#define STID_CONTENTS 0x126
#define STID_SEARCH 0x127
#define STID_BACK 0x128
#define STID_TOPICS 0x12A
#define STID_ALL_FILES 0x12B
#define STID_HELP_FILES_HLP 0x12C
#define STID_DIALOG_TEST 0x12D
@ -55,5 +54,6 @@
#define IDD_INDEX 0x150
#define IDC_INDEXLIST 0x151
#define IDD_SEARCH 0x152
#define IDI_WINHELP 0xF00