kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #12577
[PATCH] fix cvpcb, pcbnew and layout editor menu items
Hello,
the following patch is the follow up of a previous one and fixes some menu
entries of eescheama and pcbnew (and the layout editor). The goal is to
maintain consistencies among menu entries and give short end concise menu
item tips.
Additionally. this patch updates the "how to contribute file"
thank you
Fabrizio
=== modified file 'cvpcb/common_help_msg.h'
--- cvpcb/common_help_msg.h 2013-05-26 04:36:44 +0000
+++ cvpcb/common_help_msg.h 2014-02-28 08:49:29 +0000
@@ -1,8 +1,8 @@
#ifndef HELP_MESSAGE_FILE_H
#define HELP_MESSAGE_FILE_H
-#define LOAD_FILE_HELP _( "Open a net list file" )
-#define SAVE_HLP_MSG _( "Save the component/footprint link file (.cmp file)" )
-#define SAVE_AS_HLP_MSG _( "Save the component/footprint link file (.cmp file) with a new name" )
+#define LOAD_FILE_HELP _( "Open netlist file" )
+#define SAVE_HLP_MSG _( "Save component/footprint link file (.cmp file)" )
+#define SAVE_AS_HLP_MSG _( "Save component/footprint link file (.cmp file) with new name" )
#endif // HELP_MESSAGE_FILE_H
=== modified file 'cvpcb/menubar.cpp'
--- cvpcb/menubar.cpp 2013-12-20 09:15:00 +0000
+++ cvpcb/menubar.cpp 2014-02-28 09:26:42 +0000
@@ -66,7 +66,7 @@
// Open
AddMenuItem( filesMenu,
ID_LOAD_PROJECT,
- _( "&Open" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
+ _( "&Open Netlist" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
// Open Recent submenu
static wxMenu* openRecentMenu;
@@ -81,7 +81,7 @@
wxGetApp().GetFileHistory().AddFilesToMenu();
AddMenuItem( filesMenu, openRecentMenu, -1,
_( "Open &Recent" ),
- _( "Open a recent opened netlist document" ),
+ _( "Open recent netlist" ),
KiBitmap( open_project_xpm ) );
// Separator
@@ -111,7 +111,7 @@
wxMenu* preferencesMenu = new wxMenu;
AddMenuItem( preferencesMenu, ID_CVPCB_LIB_TABLE_EDIT,
- _( "Li&brary Tables" ), _( "Setup footprint libraries" ),
+ _( "Edit Li&brary Table" ), _( "Setup footprint libraries" ),
KiBitmap( library_table_xpm ) );
// Language submenu
@@ -134,7 +134,7 @@
AddMenuItem( preferencesMenu, ID_SAVE_PROJECT_AS,
_( "&Save Project File As" ),
- _( "Save changes to the project configuration to a new file" ),
+ _( "Save changes to a new project configuration file" ),
KiBitmap( save_setup_xpm ) );
// Menu Help:
@@ -143,12 +143,12 @@
// Version info
AddHelpVersionInfoMenuEntry( helpMenu );
- // Contents
- AddMenuItem( helpMenu, wxID_HELP, _( "&Contents" ),
- _( "Open the CvPcb handbook" ),
+ // Manual Contents
+ AddMenuItem( helpMenu, wxID_HELP, _( "&CvPcb Manual" ),
+ _( "Open CvPcb manual" ),
KiBitmap( online_help_xpm ) );
- // About
+ // About CvPcb
AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About CvPcb" ),
_( "About CvPcb footprint selector" ),
=== modified file 'cvpcb/tool_cvpcb.cpp'
--- cvpcb/tool_cvpcb.cpp 2013-06-06 15:37:48 +0000
+++ cvpcb/tool_cvpcb.cpp 2014-02-28 09:30:12 +0000
@@ -58,7 +58,7 @@
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_CVPCB_CREATE_CONFIGWINDOW, wxEmptyString,
KiBitmap( config_xpm ),
- _( "Configuration" ) );
+ _( "Set library path" ) );
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_CVPCB_CREATE_SCREENCMP, wxEmptyString,
@@ -72,11 +72,11 @@
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_CVPCB_GOTO_PREVIOUSNA, wxEmptyString,
KiBitmap( left_xpm ),
- _( "Select previous free component" ) );
+ _( "Select previous available component" ) );
m_mainToolBar->AddTool( ID_CVPCB_GOTO_FIRSTNA, wxEmptyString,
KiBitmap( right_xpm ),
- _( "Select next free component" ) );
+ _( "Select next available component" ) );
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_CVPCB_DEL_ASSOCIATIONS, wxEmptyString,
@@ -86,7 +86,7 @@
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_PCB_DISPLAY_FOOTPRINT_DOC, wxEmptyString,
KiBitmap( datasheet_xpm ),
- _( "Display footprints list documentation" ) );
+ _( "Display footprint documentation" ) );
m_mainToolBar->AddSeparator();
m_mainToolBar->AddSeparator();
@@ -94,20 +94,20 @@
KiBitmap( module_filtered_list_xpm ),
wxNullBitmap,
true, NULL,
- _( "Filter the footprint list for the current component key words" ),
+ _( "Filter footprint list by keywords" ),
wxEmptyString );
m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST,
KiBitmap( module_pin_filtered_list_xpm ),
wxNullBitmap,
true, NULL,
- _( "Filter the footprint list by pin count for the current component" ),
+ _( "Filter footprint list by pin count" ),
wxEmptyString );
m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST,
KiBitmap( module_library_list_xpm ),
wxNullBitmap, true, NULL,
- _( "Filter the footprint list by the selected library" ),
+ _( "Filter footprint list by library" ),
wxEmptyString );
if( config )
=== modified file 'eeschema/help_common_strings.h'
--- eeschema/help_common_strings.h 2014-02-21 07:54:13 +0000
+++ eeschema/help_common_strings.h 2014-02-28 08:46:25 +0000
@@ -47,7 +47,7 @@
"Place hierarchical pin imported from the corresponding hierarchical label" )
#define HELP_PLACE_SHEETPIN _( "Place hierarchical pin in sheet" )
#define HELP_PLACE_GRAPHICLINES _( "Place graphic lines or polygons" )
-#define HELP_PLACE_GRAPHICTEXTS _( "Place graphic text/comment" )
+#define HELP_PLACE_GRAPHICTEXTS _( "Place text" )
#define HELP_ANNOTATE _( "Annotate schematic components" )
#define HELP_RUN_LIB_EDITOR _( "Library Editor - Create/edit components" )
=== modified file 'eeschema/menubar.cpp'
--- eeschema/menubar.cpp 2014-02-22 12:39:59 +0000
+++ eeschema/menubar.cpp 2014-02-28 08:31:02 +0000
@@ -66,7 +66,7 @@
// New
AddMenuItem( fileMenu,
ID_NEW_PROJECT,
- _( "&New Schematic Project" ),
+ _( "&New Schematic Sheet" ),
_( "Clear current schematic hierarchy and start a new schematic root sheet" ),
KiBitmap( new_xpm ) );
@@ -103,7 +103,7 @@
fileMenu->AppendSeparator();
// Save schematic project
- text = AddHotkeyName( _( "&Save Schematic Project" ),
+ text = AddHotkeyName( _( "&Save Schematic Sheet" ),
s_Schematic_Hokeys_Descr, HK_SAVE_SCH );
AddMenuItem( fileMenu,
ID_SAVE_PROJECT, text,
@@ -497,7 +497,7 @@
//Run CvPcb
AddMenuItem( toolsMenu,
ID_TO_CVPCB,
- _( "A&ssign Component Footprints" ),
+ _( "A&ssign Component Footprint" ),
_( "Run CvPcb" ),
KiBitmap( cvpcb_xpm ) );
=== modified file 'eeschema/tool_sch.cpp'
--- eeschema/tool_sch.cpp 2013-02-11 18:50:55 +0000
+++ eeschema/tool_sch.cpp 2014-02-28 08:43:39 +0000
@@ -195,7 +195,7 @@
m_drawToolBar->AddTool( ID_HIERARCHY_PUSH_POP_BUTT, wxEmptyString,
KiBitmap( hierarchy_cursor_xpm ),
- _( "Ascend or descend hierarchy" ), wxITEM_CHECK );
+ _( "Ascend/descend hierarchy" ), wxITEM_CHECK );
m_drawToolBar->AddTool( ID_SCH_PLACE_COMPONENT, wxEmptyString, KiBitmap( add_component_xpm ),
HELP_PLACE_COMPONENTS, wxITEM_CHECK );
@@ -251,7 +251,7 @@
HELP_PLACE_GRAPHICTEXTS, wxITEM_CHECK );
m_drawToolBar->AddTool( ID_ADD_IMAGE_BUTT, wxEmptyString, KiBitmap( image_xpm ),
- _("Add a bitmap image"), wxITEM_CHECK );
+ _("Add bitmap image"), wxITEM_CHECK );
m_drawToolBar->AddTool( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxEmptyString,
KiBitmap( delete_xpm ),
@@ -282,11 +282,11 @@
m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString,
KiBitmap( unit_inch_xpm ),
- _( "Units in inches" ), wxITEM_CHECK );
+ _( "Set unit to inch" ), wxITEM_CHECK );
m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString,
KiBitmap( unit_mm_xpm ),
- _( "Units in millimeters" ), wxITEM_CHECK );
+ _( "Set unit to mm" ), wxITEM_CHECK );
m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString,
KiBitmap( cursor_shape_xpm ),
=== modified file 'kicad/commandframe.cpp'
--- kicad/commandframe.cpp 2014-02-21 07:54:13 +0000
+++ kicad/commandframe.cpp 2014-02-28 08:23:35 +0000
@@ -78,7 +78,7 @@
btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, KiBitmap( icon_bitmap2component_xpm ) );
btn->SetToolTip( _(
"Bitmap2Component - Convert bitmap images to Eeschema\n"
- "or Pcbnew elements." ) );
+ "or Pcbnew elements" ) );
btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, KiBitmap( icon_pcbcalculator_xpm ) );
btn->SetToolTip( _( "Pcb calculator - Calculator for components, track width, etc." ) );
=== modified file 'kicad/menubar.cpp'
--- kicad/menubar.cpp 2014-02-26 14:06:24 +0000
+++ kicad/menubar.cpp 2014-02-28 07:37:48 +0000
@@ -193,14 +193,14 @@
// Text editor
AddMenuItem( browseMenu,
ID_TO_EDITOR,
- _( "Launch Text E&ditor" ),
+ _( "Open Text E&ditor" ),
_( "Launch preferred text editor" ),
KiBitmap( editor_xpm ) );
// View file
AddMenuItem( browseMenu,
ID_BROWSE_AN_SELECT_FILE,
- _( "&Edit Local File" ),
+ _( "&Open Local File" ),
_( "Edit local file" ),
KiBitmap( browse_files_xpm ) );
=== modified file 'pcbnew/menubar_modedit.cpp'
--- pcbnew/menubar_modedit.cpp 2013-04-05 07:38:00 +0000
+++ pcbnew/menubar_modedit.cpp 2014-02-28 09:49:10 +0000
@@ -62,7 +62,7 @@
wxMenu* fileMenu = new wxMenu;
// Active library selection
- AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Current Library"),
+ AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Set Active Library"),
_( "Select active library" ),
KiBitmap( open_library_xpm ) );
fileMenu->AppendSeparator();
@@ -77,32 +77,32 @@
// from File
AddMenuItem( openSubmenu, ID_MODEDIT_IMPORT_PART,
- _( "&Import Module from File" ),
- _( "Import a footprint from an existing file" ),
+ _( "&Import Module From File" ),
+ _( "Import footprint from an existing file" ),
KiBitmap( import_module_xpm ) );
// from Library
AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE,
- _( "Load Module from Current Li&brary" ),
- _( "Open a footprint module from a Library" ),
+ _( "Load Module From Current Li&brary" ),
+ _( "Open a footprint module from library" ),
KiBitmap( module_xpm ) );
// from current Board
AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE_FROM_BOARD,
- _( "Load Module from &Current Board" ),
- _( "Load a footprint module from the current loaded board" ),
+ _( "Load Module From &Current Board" ),
+ _( "Load a footprint module from the current board" ),
KiBitmap( load_module_board_xpm ) );
/* Append openSubmenu to fileMenu */
AddMenuItem( fileMenu, openSubmenu, -1,
_( "&Load Module" ),
- _( "Load a footprint module" ),
+ _( "Load footprint module" ),
KiBitmap( open_document_xpm ) );
fileMenu->AppendSeparator();
// Save the currently loaded legacy library as an s-expression library.
AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBRARY_AS,
- _( "Save Current Library as ..." ),
+ _( "Save Current Library As..." ),
_( "Save entire current library under a new name." ),
wxNullBitmap );
@@ -116,21 +116,21 @@
// Save module in new lib
AddMenuItem( fileMenu, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART,
- _( "S&ave Module into a New Library" ),
+ _( "S&ave Module in New Library" ),
_( "Create a new library and save current module into it" ),
KiBitmap( new_library_xpm ) );
// Export module
AddMenuItem( fileMenu, ID_MODEDIT_EXPORT_PART,
_( "&Export Module" ),
- _( "Save the current loaded module to a file" ),
+ _( "Save current loaded module into file" ),
KiBitmap( export_module_xpm ) );
fileMenu->AppendSeparator();
// Print
AddMenuItem( fileMenu, wxID_PRINT,
_( "&Print" ),
- _( "Print the current module" ),
+ _( "Print current module" ),
KiBitmap( plot_xpm ) );
// Separator
@@ -139,7 +139,7 @@
// Close editor
AddMenuItem( fileMenu, wxID_EXIT,
_( "Cl&ose" ),
- _( "Close the footprint editor" ),
+ _( "Close footprint editor" ),
KiBitmap( exit_xpm ) );
// Menu Edit:
@@ -148,18 +148,18 @@
// Undo
text = AddHotkeyName( _( "&Undo" ), g_Module_Editor_Hokeys_Descr, HK_UNDO );
AddMenuItem( editMenu, wxID_UNDO,
- text, _( "Undo last edit" ),
+ text, _( "Undo last action" ),
KiBitmap( undo_xpm ) );
// Redo
text = AddHotkeyName( _( "&Redo" ), g_Module_Editor_Hokeys_Descr, HK_REDO );
AddMenuItem( editMenu, wxID_REDO,
- text, _( "Redo the last undo action" ),
+ text, _( "Redo last action" ),
KiBitmap( redo_xpm ) );
// Delete items
AddMenuItem( editMenu, ID_MODEDIT_DELETE_TOOL,
- _( "&Delete" ), _( "Delete objects with the eraser" ),
+ _( "&Delete" ), _( "Delete objects with eraser" ),
KiBitmap( delete_xpm ) );
// Separator
@@ -167,7 +167,7 @@
// Properties
AddMenuItem( editMenu, ID_MODEDIT_EDIT_MODULE_PROPERTIES,
- _( "&Properties" ),
+ _( "Edit &Properties" ),
_( "Edit module properties" ),
KiBitmap( module_options_xpm ) );
@@ -176,13 +176,13 @@
// Sizes and Widths
AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
- _( "&Sizes and Widths" ),
+ _( "&Size and Width" ),
_( "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 Setting" ), _( "Edit settings for new pads" ),
KiBitmap( pad_dimensions_xpm ) );
// User grid size
@@ -195,25 +195,25 @@
// Zoom In
AddMenuItem( viewMenu, ID_ZOOM_IN,
- _( "Zoom &In" ), _( "Zoom in on the module" ),
+ _( "Zoom &In" ), _( "Zoom in" ),
KiBitmap( zoom_in_xpm ) );
// Zoom Out
AddMenuItem( viewMenu, ID_ZOOM_OUT,
- _( "Zoom &Out" ), _( "Zoom out on the module" ),
+ _( "Zoom &Out" ), _( "Zoom out" ),
KiBitmap( zoom_out_xpm ) );
// Fit on Screen
AddMenuItem( viewMenu, ID_ZOOM_PAGE,
_( "&Fit on Screen" ),
- _( "Zoom and fit the module in the window" ),
+ _( "Zoom to fit the module in the window" ),
KiBitmap( zoom_fit_in_page_xpm ) );
viewMenu->AppendSeparator();
// Redraw
AddMenuItem( viewMenu, ID_ZOOM_REDRAW,
- _( "&Redraw" ), _( "Redraw the window's viewport" ),
+ _( "&Redraw" ), _( "Redraw window's viewport" ),
KiBitmap( zoom_redraw_xpm ) );
// 3D view
@@ -258,7 +258,7 @@
// Anchor
AddMenuItem( placeMenu, ID_MODEDIT_ANCHOR_TOOL,
_( "A&nchor" ),
- _( "Place the footprint module reference anchor" ),
+ _( "Place footprint module reference anchor" ),
KiBitmap( anchor_xpm ) );
// Menu Help:
@@ -269,8 +269,8 @@
// Contents
AddMenuItem( helpMenu, wxID_HELP,
- _( "&Contents" ),
- _( "Open the Pcbnew handbook" ),
+ _( "P&cbnew Manual" ),
+ _( "Open the Pcbnew manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, wxID_INDEX,
Follow ups
