From 3f52e87224d9f028afdf86e2dbc661be71584642 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Fri, 16 Mar 2018 08:38:36 -0400 Subject: [PATCH] Standardize terminology for automatic zoom to "Zoom to Fit". Fixes lp:1753336 https://bugs.launchpad.net/kicad/+bug/1753336 --- 3d-viewer/3d_viewer/3d_toolbar.cpp | 72 ++++++++++++------------ cvpcb/display_footprints_frame.cpp | 6 +- eeschema/help_common_strings.h | 4 +- eeschema/menubar.cpp | 6 +- eeschema/menubar_libedit.cpp | 5 +- eeschema/tool_lib.cpp | 67 ++++++++++++++-------- eeschema/tool_sch.cpp | 2 +- eeschema/tool_viewlib.cpp | 7 +-- pagelayout_editor/menubar.cpp | 4 +- pagelayout_editor/toolbars_pl_editor.cpp | 11 ++-- pcbnew/help_common_strings.h | 2 +- pcbnew/menubar_footprint_editor.cpp | 20 +++---- pcbnew/menubar_pcb_editor.cpp | 2 +- pcbnew/tool_footprint_viewer.cpp | 6 +- 14 files changed, 119 insertions(+), 95 deletions(-) diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp index 041051efbd..3027b1dee0 100644 --- a/3d-viewer/3d_viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_viewer/3d_toolbar.cpp @@ -3,8 +3,8 @@ * * Copyright (C) 2016 Mario Luzeiro * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2013 Wayne Stambaugh - * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2013 Wayne Stambaugh + * Copyright (C) 1992-2018 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 @@ -63,8 +63,8 @@ void EDA_3D_VIEWER::ReCreateMainToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_TOOL_SET_VISIBLE_ITEMS, wxEmptyString, - KiBitmap( read_setup_xpm ), - _( "Set display options, and some layers visibility" ) ); + KiBitmap( read_setup_xpm ), + _( "Set display options, and some layers visibility" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_RENDER_CURRENT_VIEW, wxEmptyString, @@ -84,7 +84,7 @@ void EDA_3D_VIEWER::ReCreateMainToolbar() _( "Redraw view" ) ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), - _( "Fit in page" ) ); + _( "Zoom to fit 3D model" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString, @@ -148,8 +148,8 @@ void EDA_3D_VIEWER::CreateMenuBar() menuBar->Append( fileMenu, _( "&File" ) ); AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_PNG, - _( "Export Current View as PNG..." ), - KiBitmap( export_xpm ) ); + _( "Export Current View as PNG..." ), + KiBitmap( export_xpm ) ); AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_JPEG, _( "Export Current View as JPEG..." ), @@ -237,26 +237,26 @@ void EDA_3D_VIEWER::CreateMenuBar() // ///////////////////////////////////////////////////////////////////////// wxMenu * renderOptionsMenu_RAYTRACING = new wxMenu; AddMenuItem( renderOptionsMenu, renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING, - _( "Raytracing Options" ), KiBitmap( tools_xpm ) ); + _( "Raytracing Options" ), KiBitmap( tools_xpm ) ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_RENDER_SHADOWS, - _( "Render Shadows" ), - KiBitmap( green_xpm ), wxITEM_CHECK ); + _( "Render Shadows" ), + KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_PROCEDURAL_TEXTURES, - _( "Procedural Textures" ), - _( "Apply procedural textures to materials (slow)"), + _( "Procedural Textures" ), + _( "Apply procedural textures to materials (slow)"), KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_BACKFLOOR, - _( "Add Floor" ), - _( "Adds a floor plane below the board (slow)"), - KiBitmap( green_xpm ), wxITEM_CHECK ); + _( "Add Floor" ), + _( "Adds a floor plane below the board (slow)"), + KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_REFRACTIONS, - _( "Refractions" ), - _( "Render materials with refractions properties on final render (slow)"), - KiBitmap( green_xpm ), wxITEM_CHECK ); + _( "Refractions" ), + _( "Render materials with refractions properties on final render (slow)"), + KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_REFLECTIONS, _( "Reflections" ), @@ -264,14 +264,14 @@ void EDA_3D_VIEWER::CreateMenuBar() KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_ANTI_ALIASING, - _( "Anti-aliasing" ), - _( "Render with improved quality on final render (slow)"), - KiBitmap( green_xpm ), wxITEM_CHECK ); + _( "Anti-aliasing" ), + _( "Render with improved quality on final render (slow)"), + KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_POST_PROCESSING, - _( "Post-processing" ), - _( "Apply Screen Space Ambient Occlusion and Global Illumination reflections on final render (slow)"), - KiBitmap( green_xpm ), wxITEM_CHECK ); + _( "Post-processing" ), + _( "Apply Screen Space Ambient Occlusion and Global Illumination reflections on final render (slow)"), + KiBitmap( green_xpm ), wxITEM_CHECK ); prefsMenu->AppendSeparator(); @@ -342,14 +342,14 @@ void EDA_3D_VIEWER::CreateMenuBar() prefsMenu->AppendSeparator(); AddMenuItem( prefsMenu, ID_MENU3D_SHOW_BOARD_BODY, - _( "Show Board Bod&y" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK ); + _( "Show Board Bod&y" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK ); AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF, - _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK ); + _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK ); wxMenu * moduleAttributes = new wxMenu; AddMenuItem( prefsMenu, moduleAttributes, ID_MENU3D_MODULE_ONOFF, - _( "Show 3D M&odels" ), KiBitmap( shape_3d_xpm ) ); + _( "Show 3D M&odels" ), KiBitmap( shape_3d_xpm ) ); moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL, _( "Through Hole" ), _( "Footprint Properties -> Placement type -> Through hole" ) ); @@ -368,35 +368,35 @@ void EDA_3D_VIEWER::CreateMenuBar() wxMenu * layersMenu = new wxMenu; AddMenuItem( prefsMenu, layersMenu, ID_MENU3D_LAYERS, - _( "Show &Layers" ), KiBitmap( tools_xpm ) ); + _( "Show &Layers" ), KiBitmap( tools_xpm ) ); AddMenuItem( layersMenu, ID_MENU3D_ADHESIVE_ONOFF, - _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK ); + _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK ); AddMenuItem( layersMenu, ID_MENU3D_SILKSCREEN_ONOFF, - _( "Show &Silkscreen Layers" ), KiBitmap( text_xpm ), wxITEM_CHECK ); + _( "Show &Silkscreen Layers" ), KiBitmap( text_xpm ), wxITEM_CHECK ); AddMenuItem( layersMenu, ID_MENU3D_SOLDER_MASK_ONOFF, - _( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); + _( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); AddMenuItem( layersMenu, ID_MENU3D_SOLDER_PASTE_ONOFF, - _( "Show Solder &Paste Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); + _( "Show Solder &Paste Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK ); // Other layers are not "board" layers, and are not shown in realistic mode // These menus will be disabled in in realistic mode AddMenuItem( layersMenu, ID_MENU3D_COMMENTS_ONOFF, - _( "Show &Comments and Drawings Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK ); + _( "Show &Comments and Drawings Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK ); AddMenuItem( layersMenu, ID_MENU3D_ECO_ONOFF, - _( "Show &Eco Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK ); + _( "Show &Eco Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK ); // Reset options // ///////////////////////////////////////////////////////////////////////// prefsMenu->AppendSeparator(); AddMenuItem( prefsMenu, ID_MENU3D_RESET_DEFAULTS, - _( "Reset to Default Settings" ), - KiBitmap( tools_xpm ) ); + _( "Reset to Default Settings" ), + KiBitmap( tools_xpm ) ); // Help menu // ///////////////////////////////////////////////////////////////////////// diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp index dd45a7fb08..9d80687b4f 100644 --- a/cvpcb/display_footprints_frame.cpp +++ b/cvpcb/display_footprints_frame.cpp @@ -2,8 +2,8 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2015-2016 Wayne Stambaugh - * Copyright (C) 2007-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2015 Wayne Stambaugh + * Copyright (C) 2007-2018 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 @@ -240,7 +240,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar() _( "Redraw view (F3)" ) ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), - _( "Zoom auto (Home)" ) ); + _( "Zoom to fit footprint (Home)" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_CVPCB_SHOW3D_FRAME, wxEmptyString, KiBitmap( three_d_xpm ), diff --git a/eeschema/help_common_strings.h b/eeschema/help_common_strings.h index f5b0d8e1a3..6d87a5168c 100644 --- a/eeschema/help_common_strings.h +++ b/eeschema/help_common_strings.h @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 CERN - * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2014-2018 KiCad Developers, see CHANGELOG.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 @@ -42,7 +42,7 @@ #define HELP_ZOOM_IN _( "Zoom in" ) #define HELP_ZOOM_OUT _( "Zoom out" ) -#define HELP_ZOOM_FIT _( "Fit schematic sheet on screen" ) +#define HELP_ZOOM_FIT _( "Zoom to fit schematic page" ) #define HELP_ZOOM_REDRAW _( "Redraw schematic view" ) #define HELP_DELETE_ITEMS _( "Delete item" ) diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index a93f76f604..6ef53d4d73 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2009 Wayne Stambaugh - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2018 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 @@ -184,7 +184,7 @@ void prepareViewMenu( wxMenu* aParentMenu ) HK_ZOOM_OUT, IS_ACCELERATOR ); // add accelerator, not a shortcut AddMenuItem( aParentMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "&Fit on Screen" ), g_Schematic_Hokeys_Descr, HK_ZOOM_AUTO ); + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Schematic_Hokeys_Descr, HK_ZOOM_AUTO ); AddMenuItem( aParentMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, KiBitmap( zoom_fit_in_page_xpm ) ); @@ -597,7 +597,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) ID_OPEN_CMP_TABLE, _( "S&ymbol Table..." ), KiBitmap( spreadsheet_xpm ) ); - + AddMenuItem( aParentMenu, ID_GET_ANNOTATE, _( "&Annotate Schematic..." ), HELP_ANNOTATE, diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index f304930a85..e3ad89da2e 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -167,8 +167,9 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); // Fit on screen - text = AddHotkeyName( _( "&Fit on Screen" ), g_Libedit_Hokeys_Descr, HK_ZOOM_AUTO ); - AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, KiBitmap( zoom_fit_in_page_xpm ) ); + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Libedit_Hokeys_Descr, HK_ZOOM_AUTO ); + AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit symbol" ), + KiBitmap( zoom_fit_in_page_xpm ) ); // Redraw text = AddHotkeyName( _( "&Redraw" ), g_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp index 0607c11f0c..1b449ba1ba 100644 --- a/eeschema/tool_lib.cpp +++ b/eeschema/tool_lib.cpp @@ -60,31 +60,40 @@ void LIB_EDIT_FRAME::ReCreateVToolbar() m_drawToolBar->AddTool( ID_LIBEDIT_PIN_BUTT, wxEmptyString, KiScaledBitmap( pin_xpm, this ), HELP_ADD_PIN, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_BODY_TEXT_BUTT, wxEmptyString, KiScaledBitmap( text_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_BODY_TEXT_BUTT, wxEmptyString, + KiScaledBitmap( text_xpm, this ), HELP_ADD_BODYTEXT, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_BODY_RECT_BUTT, wxEmptyString, KiScaledBitmap( add_rectangle_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_BODY_RECT_BUTT, wxEmptyString, + KiScaledBitmap( add_rectangle_xpm, this ), HELP_ADD_BODYRECT, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_BODY_CIRCLE_BUTT, wxEmptyString, KiScaledBitmap( add_circle_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_BODY_CIRCLE_BUTT, wxEmptyString, + KiScaledBitmap( add_circle_xpm, this ), HELP_ADD_BODYCIRCLE, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_BODY_ARC_BUTT, wxEmptyString, KiScaledBitmap( add_arc_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_BODY_ARC_BUTT, wxEmptyString, + KiScaledBitmap( add_arc_xpm, this ), HELP_ADD_BODYARC, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_BODY_LINE_BUTT, wxEmptyString, KiScaledBitmap( add_polygon_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_BODY_LINE_BUTT, wxEmptyString, + KiScaledBitmap( add_polygon_xpm, this ), HELP_ADD_BODYPOLYGON, wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_ANCHOR_ITEM_BUTT, wxEmptyString, KiScaledBitmap( anchor_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_ANCHOR_ITEM_BUTT, wxEmptyString, + KiScaledBitmap( anchor_xpm, this ), _( "Move symbol anchor" ), wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_IMPORT_BODY_BUTT, wxEmptyString, KiScaledBitmap( import_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_IMPORT_BODY_BUTT, wxEmptyString, + KiScaledBitmap( import_xpm, this ), _( "Import existing drawings" ), wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_EXPORT_BODY_BUTT, wxEmptyString, KiScaledBitmap( export_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_EXPORT_BODY_BUTT, wxEmptyString, + KiScaledBitmap( export_xpm, this ), _( "Export current drawing" ), wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_LIBEDIT_DELETE_ITEM_BUTT, wxEmptyString, KiScaledBitmap( delete_xpm, this ), + m_drawToolBar->AddTool( ID_LIBEDIT_DELETE_ITEM_BUTT, wxEmptyString, + KiScaledBitmap( delete_xpm, this ), HELP_DELETE_ITEMS, wxITEM_CHECK ); m_drawToolBar->Realize(); @@ -116,17 +125,20 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); - m_mainToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, KiScaledBitmap( new_component_xpm, this ), + m_mainToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, + KiScaledBitmap( new_component_xpm, this ), _( "Create new symbol" ) ); m_mainToolBar->AddTool( ID_LIBEDIT_SAVE_PART, wxEmptyString, KiScaledBitmap( save_part_xpm, this ), _( "Save current symbol" ) ); - m_mainToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, KiScaledBitmap( import_part_xpm, this ), + m_mainToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, + KiScaledBitmap( import_part_xpm, this ), _( "Import symbol" ) ); - m_mainToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, KiScaledBitmap( export_part_xpm, this ), + m_mainToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, + KiScaledBitmap( export_part_xpm, this ), _( "Export symbol" ) ); KiScaledSeparator( m_mainToolBar, this ); @@ -145,7 +157,8 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); m_mainToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_PART, wxEmptyString, - KiScaledBitmap( part_properties_xpm, this ), _( "Edit symbol properties" ) ); + KiScaledBitmap( part_properties_xpm, this ), + _( "Edit symbol properties" ) ); m_mainToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_FIELDS, wxEmptyString, KiScaledBitmap( text_xpm, this ), @@ -159,7 +172,8 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); - m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); + m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, + KiScaledBitmap( zoom_redraw_xpm, this ), msg ); msg = AddHotkeyName( HELP_ZOOM_IN, g_Libedit_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); @@ -167,22 +181,27 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() msg = AddHotkeyName( HELP_ZOOM_OUT, g_Libedit_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_FIT, g_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); - m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); + msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Libedit_Hokeys_Descr, + HK_ZOOM_AUTO, IS_COMMENT ); + m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, + KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); m_mainToolBar->AddTool( ID_ZOOM_SELECTION, wxEmptyString, KiScaledBitmap( zoom_area_xpm, this ), _( "Zoom to selection" ), wxITEM_CHECK ); KiScaledSeparator( m_mainToolBar, this ); - m_mainToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString, KiScaledBitmap( morgan1_xpm, this ), + m_mainToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString, + KiScaledBitmap( morgan1_xpm, this ), _( "Show as \"De Morgan\" normal symbol" ), wxITEM_CHECK ); - m_mainToolBar->AddTool( ID_DE_MORGAN_CONVERT_BUTT, wxEmptyString, KiScaledBitmap( morgan2_xpm, this ), + m_mainToolBar->AddTool( ID_DE_MORGAN_CONVERT_BUTT, wxEmptyString, + KiScaledBitmap( morgan2_xpm, this ), _( "Show as \"De Morgan\" convert symbol" ), wxITEM_CHECK ); KiScaledSeparator( m_mainToolBar, this ); - m_mainToolBar->AddTool( ID_LIBEDIT_VIEW_DOC, wxEmptyString, KiScaledBitmap( datasheet_xpm, this ), + m_mainToolBar->AddTool( ID_LIBEDIT_VIEW_DOC, wxEmptyString, + KiScaledBitmap( datasheet_xpm, this ), _( "Show associated datasheet or document" ) ); KiScaledSeparator( m_mainToolBar, this ); @@ -208,9 +227,10 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() msg = _( "Synchronized pin edit mode\n" "Synchronized pin edit mode propagates to other units all pin changes except pin number modification.\n" "Enabled by default for multiunit parts with interchangeable units." ); - m_mainToolBar->AddTool( ID_LIBEDIT_SYNC_PIN_EDIT, wxEmptyString, KiScaledBitmap( pin2pin_xpm, this ), - msg, wxITEM_CHECK ); - m_mainToolBar->AddTool( ID_LIBEDIT_EDIT_PIN_BY_TABLE, wxEmptyString, KiScaledBitmap( pin_table_xpm, this ), + m_mainToolBar->AddTool( ID_LIBEDIT_SYNC_PIN_EDIT, wxEmptyString, + KiScaledBitmap( pin2pin_xpm, this ), msg, wxITEM_CHECK ); + m_mainToolBar->AddTool( ID_LIBEDIT_EDIT_PIN_BY_TABLE, wxEmptyString, + KiScaledBitmap( pin_table_xpm, this ), _( "Show pin table" ) ); // after adding the buttons to the toolbar, must call Realize() to reflect the changes @@ -226,7 +246,8 @@ void LIB_EDIT_FRAME::ReCreateOptToolbar() m_optionsToolBar = new wxAuiToolBar( this, ID_OPT_TOOLBAR, wxDefaultPosition, wxDefaultSize, KICAD_AUI_TB_STYLE | wxAUI_TB_VERTICAL ); - m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, KiScaledBitmap( grid_xpm, this ), + m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, + KiScaledBitmap( grid_xpm, this ), _( "Turn grid off" ), wxITEM_CHECK ); m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString, diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index ebf8b02b91..c8e2f04af4 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2008-2017 Wayne Stambaugh + * Copyright (C) 2008 Wayne Stambaugh * Copyright (C) 2004-2018 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index a43a371872..f276cf9cdf 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -78,7 +78,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom auto" ), g_Viewlib_Hokeys_Descr, + msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Viewlib_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); @@ -193,9 +193,8 @@ void LIB_VIEW_FRAME::ReCreateMenuBar( void ) HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "&Fit on Screen" ), g_Viewlib_Hokeys_Descr, - HK_ZOOM_AUTO ); - AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Viewlib_Hokeys_Descr, HK_ZOOM_AUTO ); + AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit symbol" ), KiBitmap( zoom_fit_in_page_xpm ) ); text = AddHotkeyName( _( "&Redraw" ), g_Viewlib_Hokeys_Descr, HK_ZOOM_REDRAW ); diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index d1dbd7306d..31f8300257 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2016-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2013 CERN * @author Jean-Pierre Charras, jp.charras at wanadoo.fr * @@ -137,7 +137,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() msg = AddHotkeyName( _( "Zoom Out" ), PlEditorHokeysDescr, HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, msg, wxEmptyString, KiBitmap( zoom_out_xpm ) ); - msg = AddHotkeyName( _( "Zoom All" ), PlEditorHokeysDescr, HK_ZOOM_AUTO ); + msg = AddHotkeyName( _( "Zoom to Fit" ), PlEditorHokeysDescr, HK_ZOOM_AUTO ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, msg, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ) ); msg = AddHotkeyName( _( "Zoom to Selection" ), PlEditorHokeysDescr, HK_ZOOM_SELECTION ); diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp index 940eebec8c..a4ee6d06ad 100644 --- a/pagelayout_editor/toolbars_pl_editor.cpp +++ b/pagelayout_editor/toolbars_pl_editor.cpp @@ -80,7 +80,8 @@ void PL_EDITOR_FRAME::ReCreateHToolbar( void ) // Standard Zoom controls: m_mainToolBar->AddSeparator(); msg = AddHotkeyName( _( "Redraw view" ), PlEditorHokeysDescr, HK_ZOOM_REDRAW, IS_COMMENT ); - m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); + m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, + KiScaledBitmap( zoom_redraw_xpm, this ), msg ); msg = AddHotkeyName( _( "Zoom in" ), PlEditorHokeysDescr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); @@ -88,8 +89,9 @@ void PL_EDITOR_FRAME::ReCreateHToolbar( void ) msg = AddHotkeyName( _( "Zoom out" ), PlEditorHokeysDescr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom auto" ), PlEditorHokeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); - m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); + msg = AddHotkeyName( _( "Zoom to fit page" ), PlEditorHokeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); + m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, + KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); // Zoom-to-selection m_mainToolBar->AddTool( ID_ZOOM_SELECTION, wxEmptyString, KiScaledBitmap( zoom_area_xpm, this ), @@ -163,7 +165,8 @@ void PL_EDITOR_FRAME::ReCreateVToolbar( void ) KICAD_AUI_TB_STYLE | wxAUI_TB_VERTICAL ); // Set up toolbar - m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, KiScaledBitmap( cursor_xpm, this ) ); + m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, + KiScaledBitmap( cursor_xpm, this ) ); KiScaledSeparator( m_drawToolBar, this ); m_drawToolBar->Realize(); diff --git a/pcbnew/help_common_strings.h b/pcbnew/help_common_strings.h index c121b963cf..fe1a3a8fa2 100644 --- a/pcbnew/help_common_strings.h +++ b/pcbnew/help_common_strings.h @@ -18,7 +18,7 @@ #define HELP_ZOOM_IN _( "Zoom in" ) #define HELP_ZOOM_OUT _( "Zoom out" ) -#define HELP_ZOOM_FIT _( "Zoom to fit board on screen" ) +#define HELP_ZOOM_FIT _( "Zoom to fit board or page" ) #define HELP_ZOOM_REDRAW _( "Redraw screen" ) #define HELP_SHOW_HIDE_LAYERMANAGER _( "Show/hide the layers manager toolbar" ) diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index 84ecb912dc..17d8dae24b 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -3,8 +3,8 @@ * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2015 Wayne Stambaugh - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2015 Wayne Stambaugh + * Copyright (C) 1992-2018 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 @@ -180,14 +180,14 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() if( IsGalCanvasActive() ) { text = AddHotkeyName( _( "Cu&t" ), m_hotkeysDescrList, HK_EDIT_CUT ); - AddMenuItem( editMenu, ID_EDIT_CUT, text, _( - "Cuts the selected item(s) to the Clipboard" ), KiBitmap( cut_xpm ) ); + AddMenuItem( editMenu, ID_EDIT_CUT, text, + _( "Cuts the selected item(s) to the Clipboard" ), KiBitmap( cut_xpm ) ); text = AddHotkeyName( _( "&Copy" ), m_hotkeysDescrList, HK_EDIT_COPY ); - AddMenuItem( editMenu, ID_EDIT_COPY, text, _( - "Copies the selected item(s) to the Clipboard" ), KiBitmap( copy_xpm ) ); + AddMenuItem( editMenu, ID_EDIT_COPY, text, + _( "Copies the selected item(s) to the Clipboard" ), KiBitmap( copy_xpm ) ); text = AddHotkeyName( _( "&Paste" ), m_hotkeysDescrList, HK_EDIT_PASTE ); - AddMenuItem( editMenu, ID_EDIT_PASTE, text, _( - "Pastes item(s) from the Clipboard" ), KiBitmap( paste_xpm ) ); + AddMenuItem( editMenu, ID_EDIT_PASTE, text, + _( "Pastes item(s) from the Clipboard" ), KiBitmap( paste_xpm ) ); } // Delete items @@ -231,9 +231,9 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "&Fit on Screen" ), m_hotkeysDescrList, + text = AddHotkeyName( _( "&Zoom to Fit" ), m_hotkeysDescrList, HK_ZOOM_AUTO ); - AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, + AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit footprint" ), KiBitmap( zoom_fit_in_page_xpm ) ); text = AddHotkeyName( _( "&Redraw" ), m_hotkeysDescrList, HK_ZOOM_REDRAW ); diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index ed56c19c17..939864cf58 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2012 Wayne Stambaugh - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2018 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 diff --git a/pcbnew/tool_footprint_viewer.cpp b/pcbnew/tool_footprint_viewer.cpp index a75ed3afa1..4294175cba 100644 --- a/pcbnew/tool_footprint_viewer.cpp +++ b/pcbnew/tool_footprint_viewer.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2012-2015 Wayne Stambaugh + * Copyright (C) 2012 Wayne Stambaugh * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it @@ -90,7 +90,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_VIEWER_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom auto" ), g_Module_Viewer_Hotkeys_Descr, + msg = AddHotkeyName( _( "Zoom to fit footprint" ), g_Module_Viewer_Hotkeys_Descr, HK_ZOOM_AUTO ); m_mainToolBar->AddTool( ID_VIEWER_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); @@ -161,7 +161,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateMenuBar( void ) text = AddHotkeyName( _( "&Fit on Screen" ), g_Module_Viewer_Hotkeys_Descr, HK_ZOOM_AUTO ); - AddMenuItem( viewMenu, ID_VIEWER_ZOOM_PAGE, text, HELP_ZOOM_FIT, + AddMenuItem( viewMenu, ID_VIEWER_ZOOM_PAGE, text, _( "Zoom to fit footprint" ), KiBitmap( zoom_fit_in_page_xpm ) ); text = AddHotkeyName( _( "&Redraw" ), g_Module_Viewer_Hotkeys_Descr, HK_ZOOM_REDRAW );