[PATCH 1/7] [WinHelp]: added the options menu

Eric Pouech eric.pouech at orange.fr
Sat Jun 21 04:00:07 CDT 2008 



A+
---

 programs/winhlp32/Bg.rc         |   16 ++++++++++++++++
 programs/winhlp32/Cs.rc         |   16 ++++++++++++++++
 programs/winhlp32/Da.rc         |   16 ++++++++++++++++
 programs/winhlp32/De.rc         |   16 ++++++++++++++++
 programs/winhlp32/En.rc         |   16 ++++++++++++++++
 programs/winhlp32/Eo.rc         |   16 ++++++++++++++++
 programs/winhlp32/Es.rc         |   16 ++++++++++++++++
 programs/winhlp32/Fi.rc         |   16 ++++++++++++++++
 programs/winhlp32/Fr.rc         |   16 ++++++++++++++++
 programs/winhlp32/Hu.rc         |   16 ++++++++++++++++
 programs/winhlp32/It.rc         |   16 ++++++++++++++++
 programs/winhlp32/Ko.rc         |   16 ++++++++++++++++
 programs/winhlp32/Nl.rc         |   16 ++++++++++++++++
 programs/winhlp32/No.rc         |   16 ++++++++++++++++
 programs/winhlp32/Pl.rc         |   16 ++++++++++++++++
 programs/winhlp32/Pt.rc         |   32 ++++++++++++++++++++++++++++++++
 programs/winhlp32/Rm.rc         |   16 ++++++++++++++++
 programs/winhlp32/Ru.rc         |   16 ++++++++++++++++
 programs/winhlp32/Si.rc         |   18 +++++++++++++++++-
 programs/winhlp32/Sk.rc         |   16 ++++++++++++++++
 programs/winhlp32/Sv.rc         |   16 ++++++++++++++++
 programs/winhlp32/Tr.rc         |   16 ++++++++++++++++
 programs/winhlp32/Wa.rc         |   16 ++++++++++++++++
 programs/winhlp32/Zh.rc         |   16 ++++++++++++++++
 programs/winhlp32/winhelp.c     |   17 +++++++++++++++++
 programs/winhlp32/winhelp_res.h |   17 +++++++++++++----
 26 files changed, 431 insertions(+), 5 deletions(-)


diff --git a/programs/winhlp32/Bg.rc b/programs/winhlp32/Bg.rc
index c2d47e1..f52c74d 100644
--- a/programs/winhlp32/Bg.rc
+++ b/programs/winhlp32/Bg.rc
@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
  POPUP "&Îòìåòêè" {
    MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ïîìîù" {
    MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON
    MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Cs.rc b/programs/winhlp32/Cs.rc
index a3ca708..9fb26e5 100644
--- a/programs/winhlp32/Cs.rc
+++ b/programs/winhlp32/Cs.rc
@@ -43,6 +43,22 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
  POPUP "&Záložka" {
    MENUITEM "Pøi&dat...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Nápovìda" {
    MENUITEM "Náp&ovìda k nápovìdì", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc
index 77569cd..60319b2 100644
--- a/programs/winhlp32/Da.rc
+++ b/programs/winhlp32/Da.rc
@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
  POPUP "Bog&mærke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjælp" {
    MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
    MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc
index 846ef9b..4683f79 100644
--- a/programs/winhlp32/De.rc
+++ b/programs/winhlp32/De.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
  POPUP "&Lesezeichen" {
    MENUITEM "&Definieren...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hilfe" {
    MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON
    MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc
index 40d61a2..d3d62c8 100644
--- a/programs/winhlp32/En.rc
+++ b/programs/winhlp32/En.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
  POPUP "&Bookmark" {
    MENUITEM "&Define...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Help" {
    MENUITEM "Help &on help", MNID_HELP_HELPON
    MENUITEM "Always on &top", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Eo.rc b/programs/winhlp32/Eo.rc
index 7fd946c..35abf43 100644
--- a/programs/winhlp32/Eo.rc
+++ b/programs/winhlp32/Eo.rc
@@ -41,6 +41,22 @@ MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
  POPUP "&Legosigno" {
    MENUITEM "&Difinu...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Helpo" {
    MENUITEM "&Helpu pri helpo", MNID_HELP_HELPON
    MENUITEM "Æiam &supre", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Es.rc b/programs/winhlp32/Es.rc
index 7825c24..002af56 100644
--- a/programs/winhlp32/Es.rc
+++ b/programs/winhlp32/Es.rc
@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  POPUP "&Marcador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "A&yuda" {
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
    MENUITEM "&Siempre visible", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Fi.rc b/programs/winhlp32/Fi.rc
index cd5164c..343daed 100644
--- a/programs/winhlp32/Fi.rc
+++ b/programs/winhlp32/Fi.rc
@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
  POPUP "&Kirjanmerkki" {
    MENUITEM "&Aseta...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ohje" {
    MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON
    MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Fr.rc b/programs/winhlp32/Fr.rc
index 32c3efb..7271c76 100644
--- a/programs/winhlp32/Fr.rc
+++ b/programs/winhlp32/Fr.rc
@@ -42,6 +42,22 @@ MAIN_MENU MENU
  POPUP "&Signet" {
    MENUITEM "&Définir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Aide toujours visible"
+   BEGIN
+     MENUITEM "Par défaut",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "Historique",	MNID_OPTS_HISTORY
+  POPUP    "Polices"
+  BEGIN
+    MENUITEM "Petite",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normale",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS
+}
  POPUP "Aid&e" {
    MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
    MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Hu.rc b/programs/winhlp32/Hu.rc
index e502e6e..0ddf742 100644
--- a/programs/winhlp32/Hu.rc
+++ b/programs/winhlp32/Hu.rc
@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
  POPUP "&Könyvjelzõ" {
    MENUITEM "&Definiálás...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Súgó" {
    MENUITEM "&Használat", MNID_HELP_HELPON
    MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc
index 6d814e8..d5610eb 100644
--- a/programs/winhlp32/It.rc
+++ b/programs/winhlp32/It.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
  POPUP "&Segnalibro" {
    MENUITEM "&Definisci...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&?" {
    MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
    MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc
index b1152dc..ab426bd 100644
--- a/programs/winhlp32/Ko.rc
+++ b/programs/winhlp32/Ko.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
  POPUP "Ã¥°¥ÇÇ(&B)" {
    MENUITEM "Á¤ÀÇ(&D)...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "µµ¿ò¸»(&H)" {
    MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&O)", MNID_HELP_HELPON
    MENUITEM "Ç×»ó À§(&T)", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc
index ead97e7..b2f7083 100644
--- a/programs/winhlp32/Nl.rc
+++ b/programs/winhlp32/Nl.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
  POPUP "&Favorieten" {
    MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Help" {
    MENUITEM "Hulp &bij help", MNID_HELP_HELPON
    MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc
index b9a05e7..f773e1b 100644
--- a/programs/winhlp32/No.rc
+++ b/programs/winhlp32/No.rc
@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
  POPUP "&Bokmerke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjelp" {
    MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON
    MENUITEM "All&tid øverst", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc
index 2c20de4..43316cb 100644
--- a/programs/winhlp32/Pl.rc
+++ b/programs/winhlp32/Pl.rc
@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  POPUP "&Zak³adka" {
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Pomo&c" {
    MENUITEM "&Pomoc", MNID_HELP_HELPON
    MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Pt.rc b/programs/winhlp32/Pt.rc
index 114d502..285989a 100644
--- a/programs/winhlp32/Pt.rc
+++ b/programs/winhlp32/Pt.rc
@@ -45,6 +45,22 @@ MAIN_MENU MENU
  POPUP "In&dicador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Aj&uda" {
    MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
    MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
@@ -76,6 +92,22 @@ MAIN_MENU MENU
  POPUP "In&dicador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Aj&uda" {
    MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
    MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Rm.rc b/programs/winhlp32/Rm.rc
index 1694094..858d868 100644
--- a/programs/winhlp32/Rm.rc
+++ b/programs/winhlp32/Rm.rc
@@ -43,6 +43,22 @@ MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
  POPUP "&Marca" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ag�d" {
    MENUITEM "&Douvrar l'ag�d", MNID_HELP_HELPON
    MENUITEM "Ad�na da&vant", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc
index 4f760a7..c9701da 100644
--- a/programs/winhlp32/Ru.rc
+++ b/programs/winhlp32/Ru.rc
@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
  POPUP "&Çàêëàäêà" {
    MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ñïðàâêà" {
    MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON
    MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Si.rc b/programs/winhlp32/Si.rc
index 1975d97..b91ed2f 100644
--- a/programs/winhlp32/Si.rc
+++ b/programs/winhlp32/Si.rc
@@ -40,7 +40,23 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
  POPUP "&Zaznamki" {
    MENUITEM "Do&loči ...", MNID_BKMK_DEFINE
  }
- POPUP "&Pomoč" {
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+   END
+   MENUITEM "History",		MNID_OPTS_HISTORY
+   POPUP    "Fonts"
+   BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+   END
+   MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  }
+  POPUP "&Pomoč" {
    MENUITEM "&O pomoči", MNID_HELP_HELPON
    MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
diff --git a/programs/winhlp32/Sk.rc b/programs/winhlp32/Sk.rc
index 1439836..270c6b0 100644
--- a/programs/winhlp32/Sk.rc
+++ b/programs/winhlp32/Sk.rc
@@ -36,6 +36,22 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
  POPUP "&Záložka" {
    MENUITEM "&Definova...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Pomoc" {
    MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc
index 1c4c685..e579e12 100644
--- a/programs/winhlp32/Sv.rc
+++ b/programs/winhlp32/Sv.rc
@@ -41,6 +41,22 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
  POPUP "&Bokmärke" {
    MENUITEM "&Definiera...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjälp" {
    MENUITEM "Hjälp &för hjälp", MNID_HELP_HELPON
    MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Tr.rc b/programs/winhlp32/Tr.rc
index 9aa45f8..aafa117 100644
--- a/programs/winhlp32/Tr.rc
+++ b/programs/winhlp32/Tr.rc
@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
  POPUP "Yer Ý&mleri" {
    MENUITEM "&Tanýmla...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Yardým" {
    MENUITEM "&Yardým Kullanýmý", MNID_HELP_HELPON
    MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Wa.rc b/programs/winhlp32/Wa.rc
index 23e47cc..f982bda 100644
--- a/programs/winhlp32/Wa.rc
+++ b/programs/winhlp32/Wa.rc
@@ -42,6 +42,22 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
  POPUP "&Rimårkes" {
    MENUITEM "&Defini...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Aide" {
    MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON
    MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc
index dad37df..cc963b4 100644
--- a/programs/winhlp32/Zh.rc
+++ b/programs/winhlp32/Zh.rc
@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
  POPUP "ÊéÇ©£¨&B£©" {
    MENUITEM "¶¨Ò壨&D£©...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "°ïÖú£¨&H£©" {
    MENUITEM "ÈçºÎʹÓðïÖú£¨&O£©", MNID_HELP_HELPON
    MENUITEM "×ÜÊÇÔÚ×îÇ°Ã棨&T£©", MNID_HELP_HELPTOP
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index f5d512b..187b4f8 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -878,6 +878,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_FONTS_SMALL:
         case MNID_CTXT_FONTS_SMALL:
             win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
             if (win->font_scale != 0)
@@ -886,6 +887,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_FONTS_NORMAL:
         case MNID_CTXT_FONTS_NORMAL:
             win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
             if (win->font_scale != 1)
@@ -894,6 +896,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_FONTS_LARGE:
         case MNID_CTXT_FONTS_LARGE:
             win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
             if (win->font_scale != 2)
@@ -902,6 +905,10 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_HELP_DEFAULT:
+        case MNID_OPTS_HELP_VISIBLE:
+        case MNID_OPTS_HELP_NONVISIBLE:
+        case MNID_OPTS_SYSTEM_COLORS:
         case MNID_CTXT_HELP_DEFAULT:
         case MNID_CTXT_HELP_VISIBLE:
         case MNID_CTXT_HELP_NONVISIBLE:
@@ -1038,6 +1045,16 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         }
         break;
 
+    case WM_INITMENUPOPUP:
+        win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL,
+                      MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL,
+                      MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE,
+                      MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0);
+        break;
+
     case WM_NCDESTROY:
         {
             BOOL bExit;
diff --git a/programs/winhlp32/winhelp_res.h b/programs/winhlp32/winhelp_res.h
index 3450859..20b0859 100644
--- a/programs/winhlp32/winhelp_res.h
+++ b/programs/winhlp32/winhelp_res.h
@@ -8,10 +8,19 @@
 
 #define MNID_BKMK_DEFINE        0x121
 
-#define MNID_HELP_HELPON        0x131
-#define MNID_HELP_HELPTOP       0x132
-#define MNID_HELP_ABOUT         0x141
-#define MNID_HELP_WINE          0x142
+#define MNID_OPTS_HELP_DEFAULT  0x131
+#define MNID_OPTS_HELP_VISIBLE  0x132
+#define MNID_OPTS_HELP_NONVISIBLE 0x133
+#define MNID_OPTS_HISTORY       0x134
+#define MNID_OPTS_FONTS_SMALL   0x135
+#define MNID_OPTS_FONTS_NORMAL  0x136
+#define MNID_OPTS_FONTS_LARGE   0x137
+#define MNID_OPTS_SYSTEM_COLORS 0x138
+
+#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

More information about the wine-patches mailing list