Unify help menus across top level windows.

This commit is contained in:
Simon Wells 2015-09-23 16:34:48 -04:00 committed by Wayne Stambaugh
commit 49cad0de95
9 changed files with 50 additions and 30 deletions

View File

@ -121,14 +121,20 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
AddHelpVersionInfoMenuEntry( helpMenu );
// Manual Contents
AddMenuItem( helpMenu, wxID_HELP, _( "&CvPcb Manual" ),
_( "Open CvPcb manual" ),
AddMenuItem( helpMenu, wxID_HELP, _( "CvPcb &Manual" ),
_( "Open CvPcb Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open \"Getting Started in KiCad\" guide for beginners" ),
KiBitmap( help_xpm ) );
// About CvPcb
AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About CvPcb" ),
_( "About CvPcb footprint selector" ),
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Create the menubar and append all submenus

View File

@ -485,8 +485,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( helpMenu,
wxID_HELP,
_( "Eesc&hema Manual" ),
_( "Open Eeschema manual" ),
_( "Eeschema &Manual" ),
_( "Open Eeschema Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
@ -498,8 +498,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
helpMenu->AppendSeparator();
AddMenuItem( helpMenu,
wxID_ABOUT,
_( "&About Eeschema" ),
_( "About Eeschema schematic designer" ),
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Create the menubar and append all submenus

View File

@ -260,8 +260,8 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Contents
AddMenuItem( helpMenu,
wxID_HELP,
_( "&Contents" ),
_( "Open the Eeschema manual" ),
_( "Eeschema &Manual" ),
_( "Open the Eeschema Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
@ -275,8 +275,8 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( helpMenu,
wxID_ABOUT,
_( "&About Eeschema" ),
_( "About Eeschema schematic designer" ),
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Create the menubar and append all submenus

View File

@ -88,6 +88,7 @@ BEGIN_EVENT_TABLE( GERBVIEW_FRAME, EDA_DRAW_FRAME )
// Menu Help
EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )
EVT_MENU( wxID_INDEX, EDA_DRAW_FRAME::GetKicadHelp )
EVT_MENU( wxID_ABOUT, EDA_DRAW_FRAME::GetKicadAbout )
EVT_TOOL( wxID_UNDO, GERBVIEW_FRAME::Process_Special_Functions )

View File

@ -221,16 +221,22 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
// Contents
AddMenuItem( helpMenu,
wxID_HELP,
_( "&Contents" ),
_( "Open the GerbView handbook" ),
_( "Gerbview &Manual" ),
_( "Open the GerbView Manual" ),
KiBitmap( help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open \"Getting Started in KiCad\" guide for beginners" ),
KiBitmap( online_help_xpm ) );
// About GerbView
AddMenuItem( helpMenu,
wxID_ABOUT,
_( "&About GerbView" ),
_( "About GerbView gerber and drill viewer" ),
KiBitmap( online_help_xpm ) );
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Append menus to the menubar
menuBar->Append( fileMenu, _( "&File" ) );

View File

@ -78,6 +78,7 @@ BEGIN_EVENT_TABLE( PL_EDITOR_FRAME, EDA_DRAW_FRAME )
// Menu Help
EVT_MENU( wxID_HELP, EDA_DRAW_FRAME::GetKicadHelp )
EVT_MENU( wxID_INDEX, EDA_DRAW_FRAME::GetKicadHelp )
EVT_MENU( wxID_ABOUT, EDA_DRAW_FRAME::GetKicadAbout )
EVT_TOOL( wxID_CUT, PL_EDITOR_FRAME::Process_Special_Functions )

View File

@ -148,16 +148,22 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
// Contents
AddMenuItem( helpMenu,
wxID_HELP,
_( "&Contents" ),
_( "Open the GerbView handbook" ),
_( "Page Layout Editor &Manual" ),
_( "Open the Page Layout Editor Manual" ),
KiBitmap( help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open \"Getting Started in KiCad\" guide for beginners" ),
KiBitmap( online_help_xpm ) );
// About GerbView
AddMenuItem( helpMenu,
wxID_ABOUT,
_( "&About Page Layout Editor" ),
_( "About page layout description editor" ),
KiBitmap( online_help_xpm ) );
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Append menus to the menubar
menuBar->Append( fileMenu, _( "&File" ) );

View File

@ -338,8 +338,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Contents
AddMenuItem( helpMenu, wxID_HELP,
_( "P&cbnew Manual" ),
_( "Open the Pcbnew manual" ),
_( "Pcbnew &Manual" ),
_( "Open the Pcbnew Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, wxID_INDEX,
@ -350,8 +350,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// About Pcbnew
helpMenu->AppendSeparator();
AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About Pcbnew" ),
_( "About Pcbnew PCB designer" ),
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Append menus to the menubar

View File

@ -643,8 +643,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddHelpVersionInfoMenuEntry( helpMenu );
AddMenuItem( helpMenu, wxID_HELP,
_( "&Contents" ),
_( "Open the Pcbnew handbook" ),
_( "Pcbnew &Manual" ),
_( "Open the Pcbnew Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, wxID_INDEX,
@ -654,8 +654,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
helpMenu->AppendSeparator();
AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About Pcbnew" ),
_( "About Pcbnew printed circuit board designer" ),
_( "&About Kicad" ),
_( "About Kicad" ),
KiBitmap( info_xpm ) );
// Append all menus to the menuBar