programs: Standardize the Help menus.

Francois Gouget fgouget at free.fr
Wed Apr 13 02:39:17 CDT 2011


---

Standardize on a Contents menu entry with an F1 accelerator as 
discussed in:
http://www.winehq.org/pipermail/wine-devel/2011-April/089556.html

Note that I did not add the F1 accelerator in Task Manager because its 
main window is a dialog and it was unclear to me how to add it.

 programs/notepad/En.rc        |    1 +
 programs/notepad/notepad.rc   |    2 +-
 programs/progman/progman.rc   |    3 ++-
 programs/regedit/regedit.rc   |    2 +-
 programs/taskmgr/taskmgr.rc   |    2 +-
 programs/winefile/winefile.rc |    2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc
index 0ba0efb..7c6b789 100644
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -73,6 +73,7 @@ ID_ACCEL ACCELERATORS
     "^X", CMD_CUT
     "^Z", CMD_UNDO
     VK_BACK, CMD_UNDO, VIRTKEY, ALT
+    VK_F1, CMD_HELP_CONTENTS, VIRTKEY
     VK_F3, CMD_SEARCH_NEXT, VIRTKEY
     VK_F5, CMD_TIME_DATE, VIRTKEY
     VK_INSERT, CMD_COPY, VIRTKEY, CONTROL
diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc
index 975d4bf..c3fbddb 100644
--- a/programs/notepad/notepad.rc
+++ b/programs/notepad/notepad.rc
@@ -55,7 +55,7 @@ POPUP "&Search" {
   MENUITEM "&Replace...\tCtrl+H", CMD_REPLACE
  }
 POPUP "&Help" {
-  MENUITEM "&Contents",         CMD_HELP_CONTENTS
+  MENUITEM "&Contents\tF1",     CMD_HELP_CONTENTS
   MENUITEM "&About Notepad",    CMD_HELP_ABOUT_NOTEPAD
  }
 }
diff --git a/programs/progman/progman.rc b/programs/progman/progman.rc
index 20766ee..d268305 100644
--- a/programs/progman/progman.rc
+++ b/programs/progman/progman.rc
@@ -50,7 +50,7 @@ MAIN_MENU MENU
  }
  
 POPUP "&Help" {
-   MENUITEM "&Contents",         PM_CONTENTS
+   MENUITEM "&Contents\tF1",            PM_CONTENTS
    MENUITEM "&About Program Manager",   PM_ABOUT_WINE
  }
 }
@@ -85,5 +85,6 @@ IDS_SYMBOLS_ICO,		"Icons (*.ico)"
 
 ACCEL ACCELERATORS
 {
+VK_F1,     PM_CONTENTS, VIRTKEY
 VK_RETURN, PM_ATTRIBUTES, VIRTKEY, ALT
 }
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index 0fc97cc..fd28f88 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -75,7 +75,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help Topics\tF1",            ID_HELP_HELPTOPICS
+        MENUITEM "&Contents\tF1",               ID_HELP_HELPTOPICS
         MENUITEM "&About Registry Editor",      ID_HELP_ABOUT
     END
 END
diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc
index e18c2bc..4a0af68 100644
--- a/programs/taskmgr/taskmgr.rc
+++ b/programs/taskmgr/taskmgr.rc
@@ -85,7 +85,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "Task Manager &Help Topics",   ID_HELP_TOPICS
+        MENUITEM "&Contents",                   ID_HELP_TOPICS
         MENUITEM "&About Task Manager",         ID_HELP_ABOUT
     END
 END
diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc
index 72ca412..61d5da9 100644
--- a/programs/winefile/winefile.rc
+++ b/programs/winefile/winefile.rc
@@ -83,7 +83,7 @@ IDM_WINEFILE MENU
     }
 
     POPUP "&Help"  {
-        MENUITEM "&Help Topics\tF1",            ID_HELP
+        MENUITEM "&Contents\tF1",               ID_HELP
         MENUITEM "&About Wine File",            ID_ABOUT
     }
 }
-- 
1.7.4.1




More information about the wine-patches mailing list