Skip to content

K
kicad-source-mirror
Commit 1bd7fc8a authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files
Options

Minor menu bar fixes. 

* Fixed bug on Windows that prevented the menu short cuts from working
  properly.
* Fix duplicate menu short cut keys in KiCad, Pcbnew, and Eeschema.
* Add menu short cuts for all possible menu entries.
parent 1fde4ca8
Show whitespace changes
Inline Side-by-side
Showing with 592 additions and 415 deletions
common/drawpanel.cpp
View file @ 1bd7fc8a
......@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2007-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
......@@ -1161,8 +1161,8 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
GetParent()->GeneralControl( &DC, pos, localkey );
#if 0
event.Skip(); // Allow menu shortcut processing
#ifdef __WINDOWS__
event.Skip(); // Allow menu shortcut processing on Windows.
#endif
}
......
common/hotkeys_basic.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2010-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file hotkeys_basic.cpp
* @brief Some functions to handle hotkeys in KiCad
......@@ -708,13 +733,13 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
/* List existing hotkey menu*/
AddMenuItem( HotkeySubmenu,
ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
_( "List Current Keys" ),
_( "&List Current Keys" ),
_( "Displays the current hotkeys list and corresponding commands" ),
KiBitmap( info_xpm ) );
/* Call hotkeys editor*/
AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_EDITOR,
_( "Edit Hotkeys" ),
_( "&Edit Hotkeys" ),
_( "Call the hotkeys editor" ),
KiBitmap( editor_xpm ) );
......@@ -722,19 +747,19 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
/* create hotkey file to export current hotkeys config */
AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,
_( "Export Hotkeys Config" ),
_( "Create a hotkey configuration file to export the current hotkey config" ),
_( "E&xport Hotkeys" ),
_( "Create a hotkey configuration file to export the current hotkeys" ),
KiBitmap( save_setup_xpm ) );
/* Reload hotkey file */
AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,
_( "Import Hotkeys Config" ),
_( "&Import Hotkeys" ),
_( "Load an existing hotkey configuration file" ),
KiBitmap( reload_xpm ) );
/* Append HotkeySubmenu to menu */
AddMenuItem( aMenu, HotkeySubmenu,
ID_PREFERENCES_HOTKEY_SUBMENU, _( "Hotkeys" ),
ID_PREFERENCES_HOTKEY_SUBMENU, _( "&Hotkeys" ),
_( "Hotkeys configuration and preferences" ),
KiBitmap( hotkeys_xpm ) );
}
eeschema/menubar.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file eeschema/menubar.cpp
* @brief (Re)Create the main menubar for the schematic frame
......@@ -32,6 +57,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Delete all existing menus so they can be rebuilt.
// This allows language changes of the menu text on the fly.
menuBar->Freeze();
while( menuBar->GetMenuCount() )
delete menuBar->Remove( 0 );
......@@ -90,7 +116,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Save current sheet as
AddMenuItem( fileMenu,
ID_SAVE_ONE_SHEET_AS,
_( "Save Current Sheet &as" ),
_( "Save Current Sheet &As" ),
_( "Save current schematic sheet as..." ),
KiBitmap( save_as_xpm ) );
......@@ -100,14 +126,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Page settings
AddMenuItem( fileMenu,
ID_SHEET_SET,
_( "P&age Settings" ),
_( "Pa&ge Settings" ),
_( "Settigns for page size and information" ),
KiBitmap( sheetset_xpm ) );
// Print
AddMenuItem( fileMenu,
wxID_PRINT,
_( "P&rint" ),
_( "Pri&nt" ),
_( "Print schematic" ),
KiBitmap( print_button_xpm ) );
......@@ -116,28 +142,28 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Plot PostScript
AddMenuItem( choice_plot_fmt, ID_GEN_PLOT_PS,
_( "Plot PostScript" ),
_( "Plot &PostScript" ),
_( "Plot schematic sheet in PostScript format" ),
KiBitmap( plot_ps_xpm ) );
// Plot HPGL
AddMenuItem( choice_plot_fmt,
ID_GEN_PLOT_HPGL,
_( "Plot HPGL" ),
_( "Plot &HPGL" ),
_( "Plot schematic sheet in HPGL format" ),
KiBitmap( plot_hpg_xpm ) );
// Plot SVG
AddMenuItem( choice_plot_fmt,
ID_GEN_PLOT_SVG,
_( "Plot SVG" ),
_( "Plot &SVG" ),
_( "Plot schematic sheet in SVG format" ),
KiBitmap( plot_xpm ) );
// Plot DXF
AddMenuItem( choice_plot_fmt,
ID_GEN_PLOT_DXF,
_( "Plot DXF" ),
_( "Plot &DXF" ),
_( "Plot schematic sheet in DXF format" ),
KiBitmap( plot_xpm ) );
......@@ -145,7 +171,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
#ifdef __WINDOWS__
AddMenuItem( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD,
_( "Plot to Clipboard" ),
_( "Plot to &Clipboard" ),
_( "Export drawings to clipboard" ),
KiBitmap( copy_button_xpm ) );
......@@ -171,19 +197,19 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
wxMenu* editMenu = new wxMenu;
// Undo
text = AddHotkeyName( _( "Undo" ), s_Schematic_Hokeys_Descr, HK_UNDO );
text = AddHotkeyName( _( "&Undo" ), s_Schematic_Hokeys_Descr, HK_UNDO );
AddMenuItem( editMenu, wxID_UNDO, text, HELP_UNDO, KiBitmap( undo_xpm ) );
// Redo
text = AddHotkeyName( _( "Redo" ), s_Schematic_Hokeys_Descr, HK_REDO );
text = AddHotkeyName( _( "&Redo" ), s_Schematic_Hokeys_Descr, HK_REDO );
AddMenuItem( editMenu, wxID_REDO, text, HELP_REDO, KiBitmap( redo_xpm ) );
// Delete
editMenu->AppendSeparator();
AddMenuItem( editMenu, ID_SCHEMATIC_DELETE_ITEM_BUTT,
_( "Delete" ), HELP_DELETE_ITEMS,
_( "&Delete" ), HELP_DELETE_ITEMS,
KiBitmap( delete_body_xpm ) );
// Find
......@@ -218,17 +244,17 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
*/
// Zoom in
text = AddHotkeyName( _( "Zoom In" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "Zoom &In" ), s_Schematic_Hokeys_Descr,
HK_ZOOM_IN, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) );
// Zoom out
text = AddHotkeyName( _( "Zoom Out" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "Zoom &Out" ), s_Schematic_Hokeys_Descr,
HK_ZOOM_OUT, IS_ACCELERATOR ); // add accelerator, not a shortcut
AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );
// Fit on screen
text = AddHotkeyName( _( "Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
text = AddHotkeyName( _( "&Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, KiBitmap( zoom_fit_in_page_xpm ) );
......@@ -238,12 +264,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Hierarchy
AddMenuItem( viewMenu,
ID_HIERARCHY,
_( "H&ierarchy" ),
_( "&Hierarchy" ),
_( "Navigate schematic hierarchy" ),
KiBitmap( hierarchy_nav_xpm ) );
// Redraw
text = AddHotkeyName( _( "Redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
text = AddHotkeyName( _( "&Redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) );
// Menu place:
......@@ -251,68 +277,68 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
wxMenu* placeMenu = new wxMenu;
// Component
text = AddHotkeyName( _( "Component" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Component" ), s_Schematic_Hokeys_Descr,
HK_ADD_NEW_COMPONENT, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_SCH_PLACE_COMPONENT, text,
HELP_PLACE_COMPONENTS,
KiBitmap( add_component_xpm ) );
// Power port
text = AddHotkeyName( _( "Power Port" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Power Port" ), s_Schematic_Hokeys_Descr,
HK_ADD_NEW_POWER, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_PLACE_POWER_BUTT, text,
HELP_PLACE_POWERPORT,
KiBitmap( add_power_xpm ) );
// Wire
text = AddHotkeyName( _( "Wire" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Wire" ), s_Schematic_Hokeys_Descr,
HK_BEGIN_WIRE, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_WIRE_BUTT, text,
HELP_PLACE_WIRE,
KiBitmap( add_line_xpm ) );
// Bus
text = AddHotkeyName( _( "Bus" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Bus" ), s_Schematic_Hokeys_Descr,
HK_BEGIN_BUS, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_BUS_BUTT, text,
HELP_PLACE_BUS,
KiBitmap( add_bus_xpm ) );
// Wire to Bus entry
text = AddHotkeyName( _( "Wire to Bus Entry" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "Wire to Bus &Entry" ), s_Schematic_Hokeys_Descr,
HK_ADD_WIRE_ENTRY, IS_ACCELERATOR ); // addan accelerator, not a shortcut
AddMenuItem( placeMenu, ID_WIRETOBUS_ENTRY_BUTT, text,
HELP_PLACE_WIRE2BUS_ENTRY,
KiBitmap( add_line2bus_xpm ) );
// Bus to Bus entry
text = AddHotkeyName( _( "Bus to Bus Entry" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "Bus &to Bus Entry" ), s_Schematic_Hokeys_Descr,
HK_ADD_BUS_ENTRY, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_BUSTOBUS_ENTRY_BUTT, text,
HELP_PLACE_BUS2BUS_ENTRY,
KiBitmap( add_bus2bus_xpm ) );
// No Connect Flag
text = AddHotkeyName( _( "No Connect Flag" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&No Connect Flag" ), s_Schematic_Hokeys_Descr,
HK_ADD_NOCONN_FLAG, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, KiBitmap( noconn_xpm ) );
// Net name
text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Label" ), s_Schematic_Hokeys_Descr,
HK_ADD_LABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_LABEL_BUTT, text,
HELP_PLACE_NETLABEL,
KiBitmap( add_line_label_xpm ) );
// Global label
text = AddHotkeyName( _( "Global Label" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "Gl&obal Label" ), s_Schematic_Hokeys_Descr,
HK_ADD_GLABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_GLABEL_BUTT, text,
HELP_PLACE_GLOBALLABEL,
KiBitmap( add_glabel_xpm ) );
// Junction
text = AddHotkeyName( _( "Junction" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Junction" ), s_Schematic_Hokeys_Descr,
HK_ADD_JUNCTION, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_JUNCTION_BUTT, text,
HELP_PLACE_JUNCTION,
......@@ -322,9 +348,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
placeMenu->AppendSeparator();
// Hierarchical label
text = AddHotkeyName( _( "Hierarchical Label" ), s_Schematic_Hokeys_Descr,
HK_ADD_HLABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut
text = AddHotkeyName( _( "Hierarchical Label" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "&Hierarchical Label" ), s_Schematic_Hokeys_Descr,
HK_ADD_HLABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_HIERLABEL_BUTT,
text, HELP_PLACE_HIER_LABEL,
......@@ -332,7 +356,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Hierarchical sheet
text = AddHotkeyName( _( "Hierarchical Sheet" ), s_Schematic_Hokeys_Descr,
text = AddHotkeyName( _( "H&ierarchical &Sheet" ), s_Schematic_Hokeys_Descr,
HK_ADD_HIER_SHEET, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_SHEET_SYMBOL_BUTT, text,
HELP_PLACE_SHEET,
......@@ -341,14 +365,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Import hierarchical sheet
AddMenuItem( placeMenu,
ID_IMPORT_HLABEL_BUTT,
_( "Import Hierarchical Label" ),
_( "I&mport Hierarchical Label" ),
HELP_IMPORT_SHEETPIN,
KiBitmap( import_hierarchical_label_xpm ) );
// Add hierarchical Pin to Sheet
AddMenuItem( placeMenu,
ID_SHEET_PIN_BUTT,
_( "Hierarchical Pin to Sheet" ),
_( "Hierarchical Pi&n to Sheet" ),
HELP_PLACE_SHEETPIN,
KiBitmap( add_hierar_pin_xpm ) );
......@@ -472,7 +496,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Generate bill of materials
AddMenuItem( toolsMenu,
ID_GET_TOOLS,
_( "Generate Bill of Materials" ),
_( "Generate Bill of &Materials" ),
_( "Generate bill of materials" ),
KiBitmap( tools_xpm ) );
......@@ -506,6 +530,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
_( "&Contents" ),
_( "Open the Eeschema handbook" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
......@@ -525,7 +550,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( placeMenu, _( "&Place" ) );
menuBar->Append( preferencesMenu, _( "&Preferences" ) );
menuBar->Append( preferencesMenu, _( "P&references" ) );
menuBar->Append( toolsMenu, _( "&Tools" ) );
menuBar->Append( helpMenu, _( "&Help" ) );
......
eeschema/menubar_libedit.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file eeschema/menubar_libedit.cpp
* @brief (Re)Create the main menubar for the component editor frame (LibEdit)
......@@ -46,7 +71,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Save current library as...
AddMenuItem( fileMenu,
ID_LIBEDIT_SAVE_CURRENT_LIB_AS,
_( "Save Current Library &as" ),
_( "Save Current Library &As" ),
_( "Save current active library as..." ),
KiBitmap( save_as_xpm ) );
......@@ -63,7 +88,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Export as SVG file
AddMenuItem( fileMenu,
ID_LIBEDIT_GEN_SVG_FILE,
_( "&Create SVG File" ),
_( "Create S&VG File" ),
_( "Create a SVG file from the current loaded component" ),
KiBitmap( plot_xpm ) );
......@@ -81,7 +106,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* editMenu = new wxMenu;
// Undo
text = AddHotkeyName( _( "Undo" ), s_Libedit_Hokeys_Descr, HK_UNDO );
text = AddHotkeyName( _( "&Undo" ), s_Libedit_Hokeys_Descr, HK_UNDO );
AddMenuItem( editMenu,
wxID_UNDO,
......@@ -90,7 +115,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( undo_xpm ) );
// Redo
text = AddHotkeyName( _( "Redo" ), s_Libedit_Hokeys_Descr, HK_REDO );
text = AddHotkeyName( _( "&Redo" ), s_Libedit_Hokeys_Descr, HK_REDO );
AddMenuItem( editMenu,
wxID_REDO,
text,
......@@ -103,7 +128,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Delete
AddMenuItem( editMenu,
ID_LIBEDIT_DELETE_ITEM_BUTT,
_( "Delete" ),
_( "&Delete" ),
HELP_DELETE_ITEMS,
KiBitmap( delete_body_xpm ) );
......@@ -124,22 +149,22 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
*/
// Zoom in
text = _( "Zoom In" );
text = _( "Zoom &In" );
AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) );
// Zoom out
text = _( "Zoom Out" );
text = _( "Zoom &Out" );
AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );
// Fit on screen
text = AddHotkeyName( _( "Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
text = AddHotkeyName( _( "&Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, KiBitmap( zoom_fit_in_page_xpm ) );
// Separator
viewMenu->AppendSeparator();
// Redraw
text = AddHotkeyName( _( "Redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
text = AddHotkeyName( _( "&Redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) );
// Menu Place:
......@@ -155,35 +180,35 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Graphic text
AddMenuItem( placeMenu,
ID_LIBEDIT_BODY_TEXT_BUTT,
_( "Graphic text" ),
_( "Graphic &Text" ),
HELP_ADD_BODYTEXT,
KiBitmap( add_text_xpm ) );
// Graphic rectangle
AddMenuItem( placeMenu,
ID_LIBEDIT_BODY_RECT_BUTT,
_( "Rectangle" ),
_( "&Rectangle" ),
HELP_ADD_BODYRECT,
KiBitmap( add_rectangle_xpm ) );
// Graphic Circle
AddMenuItem( placeMenu,
ID_LIBEDIT_BODY_CIRCLE_BUTT,
_( "Circle" ),
_( "&Circle" ),
HELP_ADD_BODYCIRCLE,
KiBitmap( add_circle_xpm ) );
// Graphic Arc
AddMenuItem( placeMenu,
ID_LIBEDIT_BODY_ARC_BUTT,
_( "Arc" ),
_( "&Arc" ),
HELP_ADD_BODYARC,
KiBitmap( add_arc_xpm ) );
// Graphic Line or Polygon
AddMenuItem( placeMenu,
ID_LIBEDIT_BODY_LINE_BUTT,
_( "Line or Polygon" ),
_( "&Line or Polygon" ),
HELP_ADD_BODYPOLYGON,
KiBitmap( add_polygon_xpm ) );
......@@ -239,6 +264,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
_( "&Contents" ),
_( "Open the Eeschema manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
......@@ -247,6 +273,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// About Eeschema
helpMenu->AppendSeparator();
AddMenuItem( helpMenu,
wxID_ABOUT,
_( "&About Eeschema" ),
......@@ -258,7 +285,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( placeMenu, _( "&Place" ) );
menuBar->Append( preferencesMenu, _( "&Preferences" ) );
menuBar->Append( preferencesMenu, _( "P&references" ) );
menuBar->Append( helpMenu, _( "&Help" ) );
menuBar->Thaw();
......
gerbview/menubar.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file gerbview/menubar.cpp
* @brief (Re)Create the main menubar for GerbView
......@@ -79,7 +104,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
m_drillFileHistory.AddFilesToMenu( );
AddMenuItem( fileMenu, openRecentDrlMenu,
wxID_ANY,
_( "Open Recent &Drill File" ),
_( "Open Recent Dri&ll File" ),
_( "Open a recent opened drill file" ),
KiBitmap( open_project_xpm ) );
......@@ -99,7 +124,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
// Export to Pcbnew
AddMenuItem( fileMenu,
ID_GERBVIEW_EXPORT_TO_PCBNEW,
_( "Export to &Pcbnew" ),
_( "E&xport to Pcbnew" ),
_( "Export data in Pcbnew format" ),
KiBitmap( export_xpm ) );
......@@ -109,7 +134,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
// Print
AddMenuItem( fileMenu,
wxID_PRINT,
_( "P&rint" ),
_( "&Print" ),
_( "Print gerber" ),
KiBitmap( print_button_xpm ) );
......
kicad/menubar.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file kicad/menubar.cpp
* @brief (Re)Create the project manager menubar for KiCad
......@@ -30,7 +55,8 @@ BEGIN_EVENT_TABLE( KICAD_MANAGER_FRAME, EDA_BASE_FRAME )
EVT_MENU( ID_SELECT_PREFERED_EDITOR, EDA_BASE_FRAME::OnSelectPreferredEditor )
EVT_MENU( ID_SELECT_DEFAULT_PDF_BROWSER, KICAD_MANAGER_FRAME::OnSelectDefaultPdfBrowser )
EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER, KICAD_MANAGER_FRAME::OnSelectPreferredPdfBrowser )
EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER_NAME, KICAD_MANAGER_FRAME::OnSelectPreferredPdfBrowser )
EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER_NAME,
KICAD_MANAGER_FRAME::OnSelectPreferredPdfBrowser )
EVT_MENU( ID_SAVE_AND_ZIP_FILES, KICAD_MANAGER_FRAME::OnArchiveFiles )
EVT_MENU( ID_READ_ZIP_ARCHIVE, KICAD_MANAGER_FRAME::OnUnarchiveFiles )
EVT_MENU( ID_PROJECT_TREE_REFRESH, KICAD_MANAGER_FRAME::OnRefresh )
......@@ -52,7 +78,8 @@ BEGIN_EVENT_TABLE( KICAD_MANAGER_FRAME, EDA_BASE_FRAME )
EVT_BUTTON( ID_TO_PCB_CALCULATOR, KICAD_MANAGER_FRAME::OnRunPcbCalculator )
EVT_UPDATE_UI( ID_SELECT_DEFAULT_PDF_BROWSER, KICAD_MANAGER_FRAME::OnUpdateDefaultPdfBrowser )
EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER, KICAD_MANAGER_FRAME::OnUpdatePreferredPdfBrowser )
EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER,
KICAD_MANAGER_FRAME::OnUpdatePreferredPdfBrowser )
END_EVENT_TABLE()
......@@ -176,7 +203,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
// Default
item = new wxMenuItem( SubMenuPdfBrowserChoice,
ID_SELECT_DEFAULT_PDF_BROWSER,
_( "Default" ),
_( "&Default" ),
_( "Use system default PDF viewer used to browse datasheets" ),
wxITEM_CHECK );
......@@ -189,7 +216,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
// Favourite
item = new wxMenuItem( SubMenuPdfBrowserChoice,
ID_SELECT_PREFERED_PDF_BROWSER,
_( "Favourite" ),
_( "&Favourite" ),
_( "Use your favourite PDF viewer used to browse datasheets" ),
wxITEM_CHECK );
......@@ -203,14 +230,14 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
// Append PDF Viewer submenu to preferences
AddMenuItem( SubMenuPdfBrowserChoice,
ID_SELECT_PREFERED_PDF_BROWSER_NAME,
_( "PDF Viewer" ),
_( "&PDF Viewer" ),
_( "Select your favourite PDF viewer used to browse datasheets" ),
KiBitmap( datasheet_xpm ) );
// PDF viewer submenu
AddMenuItem( preferencesMenu,
SubMenuPdfBrowserChoice, -1,
_( "PDF Viewer" ),
_( "&PDF Viewer" ),
_( "PDF viewer preferences" ),
KiBitmap( datasheet_xpm ) );
......
pcbnew/menubar_modedit.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file pcbnew/menubar_modedit.cpp
* @brief (Re)Create the main menubar for the module editor
......@@ -34,7 +59,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// New module
AddMenuItem( fileMenu, ID_MODEDIT_NEW_MODULE,
_( "New Module" ), _( "Create new module" ),
_( "&New Module" ), _( "Create new module" ),
KiBitmap( new_footprint_xpm ) );
// Open submenu
......@@ -42,19 +67,19 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// from File
AddMenuItem( openSubmenu, ID_MODEDIT_IMPORT_PART,
_( "Load from File (Import)" ),
_( "Load from File (&Import)" ),
_( "Import a footprint from an existing file" ),
KiBitmap( import_module_xpm ) );
// from Library
AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE,
_( "Load from Library" ),
_( "Load from Li&brary" ),
_( "Open a footprint module from a Library" ),
KiBitmap( module_xpm ) );
// from current Board
AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE_FROM_BOARD,
_( "Load from Current Board" ),
_( "Load from &Current Board" ),
_( "Load a footprint module from the current loaded board" ),
KiBitmap( load_module_board_xpm ) );
......@@ -72,7 +97,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Save module in new lib
AddMenuItem( fileMenu, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
_( "&Save Module in a New Lib" ),
_( "S&ave Module in a New Lib" ),
_( "Create new library and save current module" ),
KiBitmap( new_library_xpm ) );
......@@ -96,7 +121,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Close editor
AddMenuItem( fileMenu, wxID_EXIT,
_( "Close" ),
_( "Cl&ose" ),
_( "Close the footprint editor" ),
KiBitmap( exit_xpm ) );
......@@ -105,17 +130,17 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Undo
AddMenuItem( editMenu, wxID_UNDO,
_( "Undo" ), _( "Undo last edit" ),
_( "&Undo" ), _( "Undo last edit" ),
KiBitmap( undo_xpm ) );
// Redo
AddMenuItem( editMenu, wxID_REDO,
_( "Redo" ), _( "Redo the last undo action" ),
_( "&Redo" ), _( "Redo the last undo action" ),
KiBitmap( redo_xpm ) );
// Delete items
AddMenuItem( editMenu, ID_MODEDIT_DELETE_TOOL,
_( "Delete" ), _( "Delete objects with the eraser" ),
_( "&Delete" ), _( "Delete objects with the eraser" ),
KiBitmap( delete_body_xpm ) );
// Separator
......@@ -123,7 +148,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Properties
AddMenuItem( editMenu, ID_MODEDIT_EDIT_MODULE_PROPERTIES,
_( "Properties" ),
_( "&Properties" ),
_( "Edit module properties" ),
KiBitmap( module_options_xpm ) );
......@@ -132,24 +157,24 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Sizes and Widths
AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
_( "Sizes and Widths" ),
_( "&Sizes and Widths" ),
_( "Adjust width for texts and drawings" ),
KiBitmap( options_text_xpm ) );
// Pad settings
AddMenuItem( dimensions_Submenu, ID_MODEDIT_PAD_SETTINGS,
_( "Pad Settings" ), _( "Edit the settings for new pads" ),
_( "&Pad Settings" ), _( "Edit the settings for new pads" ),
KiBitmap( options_pad_xpm ) );
// User grid size
AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP,
_( "User Grid Size" ), _( "Adjust user grid" ),
_( "&User Grid Size" ), _( "Adjust user grid" ),
KiBitmap( grid_xpm ) );
// Append dimensions_Submenu to editMenu
AddMenuItem( editMenu,
dimensions_Submenu, -1,
_( "&Dimensions" ),
_( "Di&mensions" ),
_( "Edit dimensions preferences" ),
KiBitmap( add_dimension_xpm ) );
......@@ -158,17 +183,17 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Zoom In
AddMenuItem( viewMenu, ID_ZOOM_IN,
_( "Zoom In" ), _( "Zoom in on the module" ),
_( "Zoom &In" ), _( "Zoom in on the module" ),
KiBitmap( zoom_in_xpm ) );
// Zoom Out
AddMenuItem( viewMenu, ID_ZOOM_OUT,
_( "Zoom Out" ), _( "Zoom out on the module" ),
_( "Zoom &Out" ), _( "Zoom out on the module" ),
KiBitmap( zoom_out_xpm ) );
// Fit on Screen
AddMenuItem( viewMenu, ID_ZOOM_PAGE,
_( "Fit on Screen" ),
_( "&Fit on Screen" ),
_( "Zoom and fit the module in the window" ),
KiBitmap( zoom_fit_in_page_xpm ) );
......@@ -176,12 +201,12 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Redraw
AddMenuItem( viewMenu, ID_ZOOM_REDRAW,
_( "Redraw" ), _( "Redraw the window's viewport" ),
_( "&Redraw" ), _( "Redraw the window's viewport" ),
KiBitmap( zoom_redraw_xpm ) );
// 3D view
AddMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
_( "3D View" ),
_( "3&D View" ),
_( "Show board in 3D viewer" ),
KiBitmap( three_d_xpm ) );
......@@ -190,36 +215,37 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Pad
AddMenuItem( placeMenu, ID_MODEDIT_PAD_TOOL,
_( "Pad" ), _( "Add pad" ),
_( "&Pad" ), _( "Add pad" ),
KiBitmap( pad_xpm ) );
placeMenu->AppendSeparator();
// Circle
AddMenuItem( placeMenu, ID_MODEDIT_CIRCLE_TOOL,
_( "Circle" ), _( "Add graphic circle" ),
_( "&Circle" ), _( "Add graphic circle" ),
KiBitmap( add_circle_xpm ) );
// Line or Polygon
AddMenuItem( placeMenu, ID_MODEDIT_LINE_TOOL,
_( "Line or Polygon" ),
_( "&Line or Polygon" ),
_( "Add graphic line or polygon" ),
KiBitmap( add_polygon_xpm ) );
// Arc
AddMenuItem( placeMenu, ID_MODEDIT_ARC_TOOL,
_( "Arc" ), _( "Add graphic arc" ),
_( "&Arc" ), _( "Add graphic arc" ),
KiBitmap( add_arc_xpm ) );
// Text
AddMenuItem( placeMenu, ID_MODEDIT_TEXT_TOOL,
_( "Text" ), _( "Add graphic text" ),
_( "&Text" ), _( "Add graphic text" ),
KiBitmap( add_text_xpm ) );
// Anchor
placeMenu->AppendSeparator();
// Anchor
AddMenuItem( placeMenu, ID_MODEDIT_ANCHOR_TOOL,
_( "Anchor" ),
_( "A&nchor" ),
_( "Place the footprint module reference anchor" ),
KiBitmap( anchor_xpm ) );
......@@ -234,6 +260,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
_( "&Contents" ),
_( "Open the Pcbnew handbook" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open the \"Getting Started in KiCad\" guide for beginners" ),
......
pcbnew/menubar_pcbframe.cpp
View file @ 1bd7fc8a
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2010-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file menubar_pcbframe.cpp
* Pcbnew editor menu bar
......@@ -28,7 +53,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
menuBar->Freeze();
while( menuBar->GetMenuCount() )
delete menuBar->Remove(0);
delete menuBar->Remove( 0 );
// Recreate all menus:
......@@ -42,8 +67,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( new_xpm ) );
// Open
text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr,
HK_LOAD_BOARD );
text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr, HK_LOAD_BOARD );
AddMenuItem( filesMenu, ID_LOAD_FILE, text,
_( "Delete current board and load new board" ),
KiBitmap( open_document_xpm ) );
......@@ -75,27 +99,26 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
filesMenu->AppendSeparator();
// Save
text = AddHotkeyName( _( "&Save" ), g_Board_Editor_Hokeys_Descr,
HK_SAVE_BOARD );
text = AddHotkeyName( _( "&Save" ), g_Board_Editor_Hokeys_Descr, HK_SAVE_BOARD );
AddMenuItem( filesMenu, ID_SAVE_BOARD, text,
_( "Save current board" ),
KiBitmap( save_xpm ) );
// Save As
AddMenuItem( filesMenu, ID_SAVE_BOARD_AS,
_( "Save as..." ),
_( "Sa&ve As..." ),
_( "Save the current board as.." ),
KiBitmap( save_as_xpm ) );
filesMenu->AppendSeparator();
// Revert
AddMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
_( "&Revert" ),
_( "Revert" ),
_( "Clear board and get previous saved version of board" ),
KiBitmap( jigsaw_xpm ) );
// Rescue
AddMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ),
AddMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "Rescue" ),
_( "Clear old board and get last rescue file" ),
KiBitmap( hammer_xpm ) );
filesMenu->AppendSeparator();
......@@ -127,7 +150,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Fabrications Outputs submenu append
AddMenuItem( filesMenu, fabricationOutputsMenu,
-1, _( "Fabrication Outputs" ),
-1, _( "&Fabrication Outputs" ),
_( "Generate files for fabrication" ),
KiBitmap( fabrication_xpm ) );
......@@ -142,7 +165,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( import_xpm ) );
AddMenuItem( filesMenu, submenuImport,
ID_GEN_IMPORT_FILE, _( "Import" ),
ID_GEN_IMPORT_FILE, _( "&Import" ),
_( "Import files" ), KiBitmap( import_xpm ) );
......@@ -173,14 +196,14 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( three_d_xpm ) );
AddMenuItem( filesMenu, submenuexport,
ID_GEN_EXPORT_FILE, _( "&Export" ),
ID_GEN_EXPORT_FILE, _( "E&xport" ),
_( "Export board" ), KiBitmap( export_xpm ) );
filesMenu->AppendSeparator();
// Page settings
AddMenuItem( filesMenu, ID_SHEET_SET,
_( "&Page settings" ),
_( "Page s&ettings" ),
_( "Page settings for paper size and texts" ),
KiBitmap( sheetset_xpm ) );
......@@ -191,13 +214,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Create SVG file
AddMenuItem( filesMenu, ID_GEN_PLOT_SVG,
_( "Print S&VG" ),
_( "Print SV&G" ),
_( "Plot board in Scalable Vector Graphics format" ),
KiBitmap( print_button_xpm ) );
// Plot
AddMenuItem( filesMenu, ID_GEN_PLOT,
_( "&Plot" ),
_( "P&lot" ),
_( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ),
KiBitmap( plot_xpm ) );
......@@ -207,19 +230,19 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Archive New Footprints
AddMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES,
_( "Archive New Footprints" ),
_( "&Archive New Footprints" ),
_( "Archive new footprints only in a library (keep other footprints in this lib)" ),
KiBitmap( library_update_xpm ) );
// Create FootPrint Archive
AddMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES,
_( "Create Footprint Archive" ),
_( "&Create Footprint Archive" ),
_( "Archive all footprints in a library (old library will be deleted)" ),
KiBitmap( library_xpm ) );
AddMenuItem( filesMenu, submenuarchive,
ID_MENU_ARCHIVE_MODULES,
_( "Archive Footprints" ),
_( "Arc&hive Footprints" ),
_( "Archive or add footprints in a library file" ),
KiBitmap( library_xpm ) );
......@@ -232,32 +255,29 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* editMenu = new wxMenu;
// Undo
text = AddHotkeyName( _( "Undo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_UNDO );
AddMenuItem( editMenu, wxID_UNDO, text,
HELP_UNDO, KiBitmap( undo_xpm ) );
text = AddHotkeyName( _( "&Undo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_UNDO );
AddMenuItem( editMenu, wxID_UNDO, text, HELP_UNDO, KiBitmap( undo_xpm ) );
// Redo
text = AddHotkeyName( _( "Redo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_REDO );
AddMenuItem( editMenu, wxID_REDO, text,
HELP_REDO, KiBitmap( redo_xpm ) );
text = AddHotkeyName( _( "&Redo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_REDO );
AddMenuItem( editMenu, wxID_REDO, text, HELP_REDO, KiBitmap( redo_xpm ) );
// Delete
AddMenuItem( editMenu, ID_PCB_DELETE_ITEM_BUTT,
_( "Delete" ), _( "Delete items" ),
_( "&Delete" ), _( "Delete items" ),
KiBitmap( delete_body_xpm ) );
editMenu->AppendSeparator();
// Find
text = AddHotkeyName( _( "&Find" ), g_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM );
AddMenuItem( editMenu, ID_FIND_ITEMS,
text, HELP_FIND , KiBitmap( find_xpm ) );
AddMenuItem( editMenu, ID_FIND_ITEMS, text, HELP_FIND , KiBitmap( find_xpm ) );
editMenu->AppendSeparator();
// Global Deletions
AddMenuItem( editMenu, ID_PCB_GLOBAL_DELETE,
_( "Global &Deletions" ),
_( "&Global Deletions" ),
_( "Delete tracks, modules, texts... on board" ),
KiBitmap( general_deletions_xpm ) );
......@@ -300,17 +320,17 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
* for Zoom in and Zoom out sub menus
*/
// Zoom In
text = AddHotkeyName( _( "Zoom In" ), g_Pcbnew_Editor_Hokeys_Descr,
text = AddHotkeyName( _( "Zoom &In" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_IN, IS_ACCELERATOR );
AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) );
// Zoom Out
text = AddHotkeyName( _( "Zoom Out" ), g_Pcbnew_Editor_Hokeys_Descr,
text = AddHotkeyName( _( "Zoom &Out" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_OUT, IS_ACCELERATOR );
AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );
// Fit on Screen
text = AddHotkeyName( _( "Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr,
text = AddHotkeyName( _( "&Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_AUTO );
AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT,
......@@ -319,7 +339,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
viewMenu->AppendSeparator();
// Redraw
text = AddHotkeyName( _( "Redraw" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
text = AddHotkeyName( _( "&Redraw" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) );
......@@ -327,7 +347,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// 3D Display
AddMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
_( "3D Display" ),_( "Show board in 3D viewer" ),
_( "3&D Display" ),_( "Show board in 3D viewer" ),
KiBitmap( three_d_xpm ) );
// List Nets
......@@ -339,38 +359,38 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* placeMenu = new wxMenu;
// Module
text = AddHotkeyName( _( "Module" ), g_Pcbnew_Editor_Hokeys_Descr,
text = AddHotkeyName( _( "&Module" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ADD_MODULE, IS_ACCELERATOR );
AddMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text,
_( "Add modules" ), KiBitmap( module_xpm ) );
// Track
text = AddHotkeyName( _( "Track" ), g_Pcbnew_Editor_Hokeys_Descr,
text = AddHotkeyName( _( "&Track" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ADD_NEW_TRACK, IS_ACCELERATOR );
AddMenuItem( placeMenu, ID_TRACK_BUTT, text,
_( "Add tracks and vias" ), KiBitmap( add_tracks_xpm ) );
// Zone
AddMenuItem( placeMenu, ID_PCB_ZONES_BUTT,
_( "Zone" ), _( "Add filled zones" ), KiBitmap( add_zone_xpm ) );
_( "&Zone" ), _( "Add filled zones" ), KiBitmap( add_zone_xpm ) );
// Text
AddMenuItem( placeMenu, ID_PCB_ADD_TEXT_BUTT,
_( "Text" ), _( "Add text on copper layers or graphic text" ),
_( "Te&xt" ), _( "Add text on copper layers or graphic text" ),
KiBitmap( add_text_xpm ) );
// Graphic Arc
AddMenuItem( placeMenu, ID_PCB_ARC_BUTT,
_( "Arc" ), _( "Add graphic arc" ),KiBitmap( add_arc_xpm ) );
_( "&Arc" ), _( "Add graphic arc" ),KiBitmap( add_arc_xpm ) );
// Graphic Circle
AddMenuItem( placeMenu, ID_PCB_CIRCLE_BUTT,
_( "Circle" ), _( "Add graphic circle" ),
_( "&Circle" ), _( "Add graphic circle" ),
KiBitmap( add_circle_xpm ) );
// Line or Polygon
AddMenuItem( placeMenu, ID_PCB_ADD_LINE_BUTT,
_( "Line or Polygon" ),
_( "&Line or Polygon" ),
_( "Add graphic line or polygon" ),
KiBitmap( add_dashed_line_xpm ) );
......@@ -378,25 +398,25 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Dimension
AddMenuItem( placeMenu, ID_PCB_DIMENSION_BUTT,
_( "Dimension" ), _( "Add dimension" ),
_( "&Dimension" ), _( "Add dimension" ),
KiBitmap( add_dimension_xpm ) );
// Layer alignment target
AddMenuItem( placeMenu, ID_PCB_MIRE_BUTT,
_( "Layer alignment target" ), _( "Add layer alignment target" ),
_( "La&yer alignment target" ), _( "Add layer alignment target" ),
KiBitmap( add_mires_xpm ) );
placeMenu->AppendSeparator();
// Drill & Place Offset
AddMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT,
_( "Drill and Place Offset" ),
_( "Drill and Place O&ffset" ),
_( "Place the origin point for drill and place files" ),
KiBitmap( pcb_offset_xpm ) );
// Grid Origin
AddMenuItem( placeMenu, ID_PCB_PLACE_GRID_COORD_BUTT,
_( "Grid Origin" ),
_( "&Grid Origin" ),
_( "Set the origin point for the grid" ),
KiBitmap( grid_select_axis_xpm ) );
......@@ -405,13 +425,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Library
AddMenuItem( configmenu, ID_CONFIG_REQ,
_( "&Library" ), _( "Setting libraries, directories and others..." ),
_( "Li&brary" ), _( "Setting libraries, directories and others..." ),
KiBitmap( library_xpm ) );
// Colors and Visibility are also handled by the layers manager toolbar
AddMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,
m_show_layer_manager_tools ?
_( "Hide &Layers Manager" ) : _("Show &Layers Manager" ),
_( "Hide La&yers Manager" ) : _("Show La&yers Manager" ),
HELP_SHOW_HIDE_LAYERMANAGER,
KiBitmap( layers_manager_xpm ) );
......@@ -435,23 +455,23 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Grid
AddMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP,
_( "Grid" ),_( "Adjust user grid dimensions" ),
_( "G&rid" ),_( "Adjust user grid dimensions" ),
KiBitmap( grid_xpm ) );
// Text and Drawings
AddMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
_( "Texts and Drawings" ),
_( "Te&xts and Drawings" ),
_( "Adjust dimensions for texts and drawings" ),
KiBitmap( options_text_xpm ) );
// Pads
AddMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP,
_( "Pads" ), _( "Adjust default pad characteristics" ),
_( "&Pads" ), _( "Adjust default pad characteristics" ),
KiBitmap( pad_xpm ) );
// Pads Mask Clearance
AddMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE,
_( "Pads Mask Clearance" ),
_( "Pads &Mask Clearance" ),
_( "Adjust the global clearance between pads and the solder resist mask" ),
KiBitmap( pads_mask_layers_xpm ) );
......@@ -478,18 +498,18 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* macrosMenu = new wxMenu;
AddMenuItem( macrosMenu, ID_PREFRENCES_MACROS_SAVE,
_( "Save macros" ),
_( "&Save macros" ),
_( "Save macros to file" ),
KiBitmap( save_setup_xpm ) );
AddMenuItem( macrosMenu, ID_PREFRENCES_MACROS_READ,
_( "Read macros" ),
_( "&Read macros" ),
_( "Read macros from file" ),
KiBitmap( read_setup_xpm ) );
// Append macros menu to config menu
AddMenuItem( configmenu, macrosMenu,
-1, _( "Macros" ),
-1, _( "Ma&cros" ),
_( "Macros save/read operations" ),
KiBitmap( macros_record_xpm ) );
......@@ -514,23 +534,23 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
/* Netlist */
AddMenuItem( toolsMenu, ID_GET_NETLIST,
_( "Netlist" ),
_( "&Netlist" ),
_( "Read the netlist and update board connectivity" ),
KiBitmap( netlist_xpm ) );
/* Layer pair */
AddMenuItem( toolsMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
_( "Layer Pair" ), _( "Change the active layer pair" ),
_( "&Layer Pair" ), _( "Change the active layer pair" ),
KiBitmap( select_layer_pair_xpm ) );
/* DRC */
AddMenuItem( toolsMenu, ID_DRC_CONTROL,
_( "DRC" ),
_( "&DRC" ),
_( "Perform design rules check" ), KiBitmap( erc_xpm ) );
/* FreeRoute */
AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
_( "FreeRoute" ),
_( "&FreeRoute" ),
_( "Fast access to the Web Based FreeROUTE advanced router" ),
KiBitmap( web_support_xpm ) );
......@@ -560,6 +580,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
_( "&Contents" ),
_( "Open the Pcbnew handbook" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open the \"Getting Started in KiCad\" guide for beginners" ),
......@@ -579,7 +600,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( placeMenu, _( "&Place" ) );
menuBar->Append( configmenu, _( "&Preferences" ) );
menuBar->Append( configmenu, _( "P&references" ) );
menuBar->Append( toolsMenu, _( "&Tools" ) );
menuBar->Append( designRulesMenu, _( "&Design Rules" ) );
menuBar->Append( helpMenu, _( "&Help" ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment