From e94752a6cff929c5cd7c43f4bfd301f83a8e3d2f Mon Sep 17 00:00:00 2001 From: D4p0up Date: Sun, 3 Jun 2018 23:42:04 +0200 Subject: [PATCH] Added help string to select buttons. Also moved highlight text string to help_common_strings.h Fixes: lp:1497737 * https://bugs.launchpad.net/kicad/+bug/1497737 --- eeschema/help_common_strings.h | 6 ++++-- eeschema/libedit/tool_lib.cpp | 2 +- eeschema/tool_sch.cpp | 4 ++-- gerbview/toolbars_gerber.cpp | 2 +- pcbnew/tool_footprint_editor.cpp | 2 +- pcbnew/tool_pcb_editor.cpp | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eeschema/help_common_strings.h b/eeschema/help_common_strings.h index 6d87a5168c..2e2f56c70c 100644 --- a/eeschema/help_common_strings.h +++ b/eeschema/help_common_strings.h @@ -48,8 +48,10 @@ #define HELP_DELETE_ITEMS _( "Delete item" ) // Schematic editor: -#define HELP_FIND _( "Find symbols and text" ) -#define HELP_REPLACE _( "Find and replace text in schematic items" ) +#define HELP_SELECT _( "Select item" ) +#define HELP_HIGHLIGHT _( "Highlight net" ) +#define HELP_FIND _( "Find symbols and text" ) +#define HELP_REPLACE _( "Find and replace text in schematic items" ) #define HELP_PLACE_COMPONENTS _( "Place symbol" ) #define HELP_PLACE_POWERPORT _( "Place power port" ) #define HELP_PLACE_WIRE _( "Place wire" ) diff --git a/eeschema/libedit/tool_lib.cpp b/eeschema/libedit/tool_lib.cpp index 6e85fdb0b5..487afaf625 100644 --- a/eeschema/libedit/tool_lib.cpp +++ b/eeschema/libedit/tool_lib.cpp @@ -55,7 +55,7 @@ void LIB_EDIT_FRAME::ReCreateVToolbar() // Set up toolbar m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, KiScaledBitmap( cursor_xpm, this ), - _( "Deselect current tool" ), wxITEM_CHECK ); + HELP_SELECT, wxITEM_CHECK ); m_drawToolBar->AddTool( ID_LIBEDIT_PIN_BUTT, wxEmptyString, KiScaledBitmap( pin_xpm, this ), HELP_ADD_PIN, wxITEM_CHECK ); diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index ed7bdf349a..b07cdeecf9 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -198,11 +198,11 @@ void SCH_EDIT_FRAME::ReCreateVToolbar() // Set up toolbar m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, KiScaledBitmap( cursor_xpm, this ), - wxEmptyString, wxITEM_CHECK ); + HELP_SELECT, wxITEM_CHECK ); m_drawToolBar->AddTool( ID_HIGHLIGHT, wxEmptyString, KiScaledBitmap( net_highlight_schematic_xpm, this ), - _( "Highlight net" ), wxITEM_CHECK ); + HELP_HIGHLIGHT, wxITEM_CHECK ); m_drawToolBar->AddTool( ID_SCH_PLACE_COMPONENT, wxEmptyString, KiScaledBitmap( add_component_xpm, this ), HELP_PLACE_COMPONENTS, diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp index 843a060457..32e3a513df 100644 --- a/gerbview/toolbars_gerber.cpp +++ b/gerbview/toolbars_gerber.cpp @@ -215,7 +215,7 @@ void GERBVIEW_FRAME::ReCreateVToolbar( void ) KICAD_AUI_TB_STYLE | wxAUI_TB_VERTICAL ); // Set up toolbar - m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, + m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, _( "Select item" ), KiScaledBitmap( cursor_xpm, this ) ); KiScaledSeparator( m_mainToolBar, this ); diff --git a/pcbnew/tool_footprint_editor.cpp b/pcbnew/tool_footprint_editor.cpp index fc252b6663..c5fcfb42b9 100644 --- a/pcbnew/tool_footprint_editor.cpp +++ b/pcbnew/tool_footprint_editor.cpp @@ -143,7 +143,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateVToolbar() // Set up toolbar m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, KiScaledBitmap( cursor_xpm, this ), - wxEmptyString, wxITEM_CHECK ); + _( "Select item" ), wxITEM_CHECK ); KiScaledSeparator( m_drawToolBar, this ); m_drawToolBar->AddTool( ID_MODEDIT_PAD_TOOL, wxEmptyString, KiScaledBitmap( pad_xpm, this ), diff --git a/pcbnew/tool_pcb_editor.cpp b/pcbnew/tool_pcb_editor.cpp index 16e53b8df1..76a6ae6b20 100644 --- a/pcbnew/tool_pcb_editor.cpp +++ b/pcbnew/tool_pcb_editor.cpp @@ -435,7 +435,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar() // Set up toolbar m_drawToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, KiScaledBitmap( cursor_xpm, this ), - wxEmptyString, wxITEM_CHECK ); + _( "Select item" ), wxITEM_CHECK ); KiScaledSeparator( m_drawToolBar, this );