[PATCH 2/7] [WinHelp]: removed the main history button, and use the item in Options menu instead
Eric Pouech
eric.pouech at orange.fr
Sat Jun 21 04:00:16 CDT 2008
A+
---
programs/winhlp32/Bg.rc | 1 -
programs/winhlp32/Cs.rc | 1 -
programs/winhlp32/Da.rc | 1 -
programs/winhlp32/De.rc | 1 -
programs/winhlp32/En.rc | 1 -
programs/winhlp32/Eo.rc | 1 -
programs/winhlp32/Es.rc | 1 -
programs/winhlp32/Fi.rc | 1 -
programs/winhlp32/Fr.rc | 1 -
programs/winhlp32/Hu.rc | 1 -
programs/winhlp32/It.rc | 1 -
programs/winhlp32/Ko.rc | 1 -
programs/winhlp32/Nl.rc | 1 -
programs/winhlp32/No.rc | 1 -
programs/winhlp32/Pl.rc | 1 -
programs/winhlp32/Pt.rc | 2 --
programs/winhlp32/Rm.rc | 1 -
programs/winhlp32/Ru.rc | 1 -
programs/winhlp32/Si.rc | 1 -
programs/winhlp32/Sk.rc | 1 -
programs/winhlp32/Sv.rc | 1 -
programs/winhlp32/Tr.rc | 1 -
programs/winhlp32/Wa.rc | 1 -
programs/winhlp32/Zh.rc | 1 -
programs/winhlp32/winhelp.c | 3 +--
programs/winhlp32/winhelp_res.h | 1 -
26 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/programs/winhlp32/Bg.rc b/programs/winhlp32/Bg.rc
index f52c74d..920aec7 100644
--- a/programs/winhlp32/Bg.rc
+++ b/programs/winhlp32/Bg.rc
@@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, "Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'"
STID_CONTENTS, "&Ñúäúðæàíèå"
STID_SEARCH, "&Òúðñè"
STID_BACK, "&Íàçàä"
-STID_HISTORY, "&Èñòîðèÿ"
STID_TOPICS, "&Òåìè"
STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)"
STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.hlp)"
diff --git a/programs/winhlp32/Cs.rc b/programs/winhlp32/Cs.rc
index 9fb26e5..d457e3c 100644
--- a/programs/winhlp32/Cs.rc
+++ b/programs/winhlp32/Cs.rc
@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Nelze pøeèíst soubor nápovìdy `%s'"
STID_CONTENTS, "&Obsah"
STID_SEARCH, "&Hledat"
STID_BACK, "&Zpìt"
-STID_HISTORY, "&Historie"
STID_TOPICS, "&Témata"
STID_ALL_FILES, "Vechny soubory (*.*)"
STID_HELP_FILES_HLP, "Soubory nápovìdy (*.hlp)"
diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc
index 60319b2..3671d8b 100644
--- a/programs/winhlp32/Da.rc
+++ b/programs/winhlp32/Da.rc
@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "Fejl ved indlæsning af filen `%s'"
STID_CONTENTS, "&Indhold"
STID_SEARCH, "&Søg"
STID_BACK, "&Tilbage"
-STID_HISTORY, "&Oversigt"
STID_TOPICS, "&Emner"
STID_ALL_FILES, "Alle filer (*.*)"
STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)"
diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc
index 4683f79..11ca356 100644
--- a/programs/winhlp32/De.rc
+++ b/programs/winhlp32/De.rc
@@ -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_HISTORY, "&Chronik"
STID_TOPICS, "&Themen"
STID_ALL_FILES, "Alle Dateien (*.*)"
STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)"
diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc
index d3d62c8..0eb9269 100644
--- a/programs/winhlp32/En.rc
+++ b/programs/winhlp32/En.rc
@@ -88,7 +88,6 @@ STID_HLPFILE_ERROR_s, "Error while reading the help file `%s'"
STID_CONTENTS, "&Contents"
STID_SEARCH, "&Search"
STID_BACK, "&Back"
-STID_HISTORY, "&History"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "All files (*.*)"
STID_HELP_FILES_HLP, "Help files (*.hlp)"
diff --git a/programs/winhlp32/Eo.rc b/programs/winhlp32/Eo.rc
index 35abf43..a62634e 100644
--- a/programs/winhlp32/Eo.rc
+++ b/programs/winhlp32/Eo.rc
@@ -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_HISTORY, "Krono&logio"
STID_TOPICS, "&Temoj"
STID_ALL_FILES, "Tutaj dosieroj (*.*)"
STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)"
diff --git a/programs/winhlp32/Es.rc b/programs/winhlp32/Es.rc
index 002af56..06120a4 100644
--- a/programs/winhlp32/Es.rc
+++ b/programs/winhlp32/Es.rc
@@ -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_HISTORY, "&Historial"
STID_TOPICS, "&Temas"
STID_ALL_FILES, "Todos los archivos (*.*)"
STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)"
diff --git a/programs/winhlp32/Fi.rc b/programs/winhlp32/Fi.rc
index 343daed..860e5db 100644
--- a/programs/winhlp32/Fi.rc
+++ b/programs/winhlp32/Fi.rc
@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'"
STID_CONTENTS, "&Sisällys"
STID_SEARCH, "&Etsi"
STID_BACK, "&Takaisin"
-STID_HISTORY, "&Luetut"
STID_TOPICS, "T&opics"
STID_ALL_FILES, "Kaikki tiedostot (*.*)"
STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)"
diff --git a/programs/winhlp32/Fr.rc b/programs/winhlp32/Fr.rc
index 7271c76..a706d88 100644
--- a/programs/winhlp32/Fr.rc
+++ b/programs/winhlp32/Fr.rc
@@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide « %s
STID_CONTENTS, "&Index"
STID_SEARCH, "&Rechercher"
STID_BACK, "&Précédent"
-STID_HISTORY, "&Historique"
STID_TOPICS, "&Sujets"
STID_ALL_FILES, "Tous fichiers (*.*)"
STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)"
diff --git a/programs/winhlp32/Hu.rc b/programs/winhlp32/Hu.rc
index 0ddf742..eddafe3 100644
--- a/programs/winhlp32/Hu.rc
+++ b/programs/winhlp32/Hu.rc
@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, "Hiba a `%s' file olvasásakor"
STID_CONTENTS, "&Tartalom"
STID_SEARCH, "&Keresés"
STID_BACK, "&Vissza"
-STID_HISTORY, "&Elõzmény"
STID_TOPICS, "&Témakörök"
STID_ALL_FILES, "Minden fájl (*.*)"
STID_HELP_FILES_HLP, "Súgó fájlok (*.hlp)"
diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc
index d5610eb..a294fcc 100644
--- a/programs/winhlp32/It.rc
+++ b/programs/winhlp32/It.rc
@@ -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_HISTORY, "&Cronologia"
STID_TOPICS, "&Argomenti"
STID_ALL_FILES, "Tutti i file (*.*)"
STID_HELP_FILES_HLP, "File della Guida (*.hlp)"
diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc
index ab426bd..26c8352 100644
--- a/programs/winhlp32/Ko.rc
+++ b/programs/winhlp32/Ko.rc
@@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, "µµ¿ò¸» ÆÄÀÏ `%s'¸¦ Àд µµÁß ¿À·ù ¹ß»ý"
STID_CONTENTS, "¸ñÂ÷(&C)"
STID_SEARCH, "ã±â(&S)"
STID_BACK, "µÚ·Î(&B)"
-STID_HISTORY, "È÷½ºÅ丮(&H)"
STID_TOPICS, "¸ñÂ÷(&T)"
STID_ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)"
STID_HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)"
diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc
index b2f7083..b3fc34c 100644
--- a/programs/winhlp32/Nl.rc
+++ b/programs/winhlp32/Nl.rc
@@ -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_HISTORY, "&Geschiedenis"
STID_TOPICS, "&Onderwerpen"
STID_ALL_FILES, "Alle bestanden (*.*)"
STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)"
diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc
index f773e1b..2e76649 100644
--- a/programs/winhlp32/No.rc
+++ b/programs/winhlp32/No.rc
@@ -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_HISTORY, "&Historikk"
STID_TOPICS, "&Emner"
STID_ALL_FILES, "Alle filer (*.*)"
STID_HELP_FILES_HLP, "Hjelp-filer (*.hlp)"
diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc
index 43316cb..9d81f9c 100644
--- a/programs/winhlp32/Pl.rc
+++ b/programs/winhlp32/Pl.rc
@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, "B³¹d w trakcie odczytu pliku pomocy `%s'"
STID_CONTENTS, "&Zawartoæ"
STID_SEARCH, "&Szukaj"
STID_BACK, "&Wstecz"
-STID_HISTORY, "&Historia"
STID_TOPICS, "&Tematy"
STID_ALL_FILES, "Wszystkie pliki (*.*)"
STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)"
diff --git a/programs/winhlp32/Pt.rc b/programs/winhlp32/Pt.rc
index 285989a..6c6cdbb 100644
--- a/programs/winhlp32/Pt.rc
+++ b/programs/winhlp32/Pt.rc
@@ -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_HISTORY, "&Histórico"
STID_TOPICS, "&Tópicos"
STID_ALL_FILES, "Todos os arquivos (*.*)"
STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)"
@@ -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_HISTORY, "&Histórico"
STID_TOPICS, "&Tópicos"
STID_ALL_FILES, "Todos os ficheiros (*.*)"
STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)"
diff --git a/programs/winhlp32/Rm.rc b/programs/winhlp32/Rm.rc
index 858d868..cbcd16c 100644
--- a/programs/winhlp32/Rm.rc
+++ b/programs/winhlp32/Rm.rc
@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'ag�d `%s'"
STID_CONTENTS, "&Cuntgn�"
STID_SEARCH, "&Tscherchar"
STID_BACK, "&Inavo"
-STID_HISTORY, "&Fin qua"
STID_TOPICS, "T&opics"
STID_ALL_FILES, "Tuot las datotecas (*.*)"
STID_HELP_FILES_HLP, "Datotecas d'ag�d (*.hlp)"
diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc
index c9701da..0d32728 100644
--- a/programs/winhlp32/Ru.rc
+++ b/programs/winhlp32/Ru.rc
@@ -87,7 +87,6 @@ STID_HLPFILE_ERROR_s, "Îøèáêà ïðè ÷òåíèè ôàéëà ïîìîùè `%s'"
STID_CONTENTS, "&Ñîäåðæàíèå"
STID_SEARCH, "&Íàéòè"
STID_BACK, "&Íàçàä"
-STID_HISTORY, "&Èñòîðèÿ"
STID_TOPICS, "&Óêàçàòåëü"
STID_ALL_FILES, "Âñå ôàéëû (*.*)"
STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)"
diff --git a/programs/winhlp32/Si.rc b/programs/winhlp32/Si.rc
index b91ed2f..da9448b 100644
--- a/programs/winhlp32/Si.rc
+++ b/programs/winhlp32/Si.rc
@@ -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_HISTORY, "&Zgodovina"
STID_TOPICS, "&Vsebina"
STID_ALL_FILES, "Vse datoteke (*.*)"
STID_HELP_FILES_HLP, "Datoteke s pomoÄjo (*.hlp)"
diff --git a/programs/winhlp32/Sk.rc b/programs/winhlp32/Sk.rc
index 270c6b0..eeb766e 100644
--- a/programs/winhlp32/Sk.rc
+++ b/programs/winhlp32/Sk.rc
@@ -75,7 +75,6 @@ STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'"
STID_CONTENTS, "&Obsah"
STID_SEARCH, "&H¾ada"
STID_BACK, "&Spä"
-STID_HISTORY, "&História"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "Vetky súbory (*.*)"
STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)"
diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc
index e579e12..2991ad0 100644
--- a/programs/winhlp32/Sv.rc
+++ b/programs/winhlp32/Sv.rc
@@ -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_HISTORY, "&Historik"
STID_TOPICS, "&Ãmnen"
STID_ALL_FILES, "Alla filer (*.*)"
STID_HELP_FILES_HLP, "Hjälpfiler (*.hlp)"
diff --git a/programs/winhlp32/Tr.rc b/programs/winhlp32/Tr.rc
index aafa117..ce5501f 100644
--- a/programs/winhlp32/Tr.rc
+++ b/programs/winhlp32/Tr.rc
@@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, "'%s' yardým dosyasý açýlýrken hata"
STID_CONTENTS, "&Ýçindekiler"
STID_SEARCH, "&Ara"
STID_BACK, "&Geri"
-STID_HISTORY, "Ge&çmiþ"
STID_TOPICS, "&Konular"
STID_ALL_FILES, "Tüm dosyalar (*.*)"
STID_HELP_FILES_HLP, "Yardým dosyalarý (*.hlp)"
diff --git a/programs/winhlp32/Wa.rc b/programs/winhlp32/Wa.rc
index f982bda..1a47bc7 100644
--- a/programs/winhlp32/Wa.rc
+++ b/programs/winhlp32/Wa.rc
@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, "Yåk n' a nén stî å moumint di lere li fitchî d' aide `%s
STID_CONTENTS, "Å&dvins"
STID_SEARCH, "C&werî"
STID_BACK, "Èn &Erî"
-STID_HISTORY, "&Istwere"
STID_TOPICS, "&Topics"
STID_ALL_FILES, "Tos les fitchîs (*.*)"
STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)"
diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc
index cc963b4..ed9c8b4 100644
--- a/programs/winhlp32/Zh.rc
+++ b/programs/winhlp32/Zh.rc
@@ -78,7 +78,6 @@ STID_HLPFILE_ERROR_s, "¶ÁÈë°ïÖúÎļþ ¡®%s¡¯ ʱ·¢Éú´íÎó"
STID_CONTENTS, "ÄÚÈÝ£¨&C£©"
STID_SEARCH, "ËÑË÷£¨&S£©"
STID_BACK, "·µ»Ø£¨&B£©"
-STID_HISTORY, "ÀúÊ·£¨&H£©"
STID_TOPICS, "Ö÷Ì⣨&T£©"
STID_ALL_FILES, "ËùÓÐÎļþ (*.*)"
STID_HELP_FILES_HLP, "°ïÖúÎļþ (*.hlp)"
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 187b4f8..962a3a0 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -628,8 +628,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_HISTORY, buffer, sizeof(buffer));
- MACRO_CreateButton("BTN_HISTORY", buffer, "History()");
LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
}
@@ -878,6 +876,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
case MNID_CTXT_ANNOTATE:MACRO_Annotate(); break;
case MNID_CTXT_COPY: MACRO_CopyDialog(); break;
case MNID_CTXT_PRINT: MACRO_Print(); break;
+ case MNID_OPTS_HISTORY: MACRO_History(); break;
case MNID_OPTS_FONTS_SMALL:
case MNID_CTXT_FONTS_SMALL:
win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
diff --git a/programs/winhlp32/winhelp_res.h b/programs/winhlp32/winhelp_res.h
index 20b0859..3aa25a8 100644
--- a/programs/winhlp32/winhelp_res.h
+++ b/programs/winhlp32/winhelp_res.h
@@ -45,7 +45,6 @@
#define STID_CONTENTS 0x126
#define STID_SEARCH 0x127
#define STID_BACK 0x128
-#define STID_HISTORY 0x129
#define STID_TOPICS 0x12A
#define STID_ALL_FILES 0x12B
#define STID_HELP_FILES_HLP 0x12C
More information about the wine-patches
mailing list