From e30d867439c886576426a4cf96869167eb612c7f Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 23 Oct 2021 12:18:08 +0100 Subject: [PATCH] Use consistent terminology for various constraint modes. --- .../panel_eeschema_editing_options_base.cpp | 4 ++-- .../panel_eeschema_editing_options_base.fbp | 4 ++-- pcbnew/dialogs/panel_edit_options_base.cpp | 4 ++-- pcbnew/dialogs/panel_edit_options_base.fbp | 4 ++-- pcbnew/tools/pcb_actions.cpp | 21 ++++++++++++------- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp index 997cfbeade..06a3c52ca7 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp @@ -20,11 +20,11 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWind wxStaticBoxSizer* sbSizerEditOpt; sbSizerEditOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Editing") ), wxVERTICAL ); - m_checkHVOrientation = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("&Restrict buses and wires to H and V orientation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkHVOrientation = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Constrain buses and wires to H or V"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkHVOrientation->SetValue(true); sbSizerEditOpt->Add( m_checkHVOrientation, 0, wxRIGHT|wxLEFT, 5 ); - m_mouseDragIsDrag = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Mouse drag performs drag (G) operation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_mouseDragIsDrag = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Mouse drag performs Drag (G) operation"), wxDefaultPosition, wxDefaultSize, 0 ); m_mouseDragIsDrag->SetToolTip( _("If unchecked, mouse drag will perform move (M) operation") ); sbSizerEditOpt->Add( m_mouseDragIsDrag, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp index ad0024f3a4..3300f45f46 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp @@ -108,7 +108,7 @@ 0 0 wxID_ANY - &Restrict buses and wires to H and V orientation + Constrain buses and wires to H or V 0 @@ -172,7 +172,7 @@ 0 0 wxID_ANY - Mouse drag performs drag (G) operation + Mouse drag performs Drag (G) operation 0 diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp index 3ce0b3f449..04bd26226b 100644 --- a/pcbnew/dialogs/panel_edit_options_base.cpp +++ b/pcbnew/dialogs/panel_edit_options_base.cpp @@ -242,8 +242,8 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i wxStaticBoxSizer* sbSizerFpGraphics; sbSizerFpGraphics = new wxStaticBoxSizer( new wxStaticBox( fpPage, wxID_ANY, _("Graphics Editing") ), wxVERTICAL ); - m_cbFpGraphic45Mode = new wxCheckBox( sbSizerFpGraphics->GetStaticBox(), wxID_ANY, _("Limit actions to 45 degrees from start"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerFpGraphics->Add( m_cbFpGraphic45Mode, 0, wxALL, 5 ); + m_cbFpGraphic45Mode = new wxCheckBox( sbSizerFpGraphics->GetStaticBox(), wxID_ANY, _("Constrain to H, V, 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizerFpGraphics->Add( m_cbFpGraphic45Mode, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizer10->Add( sbSizerFpGraphics, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp index 81f1d72e42..971196dca6 100644 --- a/pcbnew/dialogs/panel_edit_options_base.fbp +++ b/pcbnew/dialogs/panel_edit_options_base.fbp @@ -2346,7 +2346,7 @@ none 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -2377,7 +2377,7 @@ 0 0 wxID_ANY - Limit actions to 45 degrees from start + Constrain to H, V, 45 degrees 0 diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index e19b121f13..0718b8aa09 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -663,8 +663,10 @@ TOOL_ACTION PCB_ACTIONS::toggleLock( "pcbnew.EditorControl.toggleLock", BITMAPS::lock_unlock ); TOOL_ACTION PCB_ACTIONS::toggle45( "pcbnew.EditorControl.toggle45", - AS_GLOBAL, MD_SHIFT + ' ', "", - _( "Toggle 45 Limit" ), _( "Limit actions to 45 degrees from the starting point" ), + AS_GLOBAL, + MD_SHIFT + ' ', "", + _( "Constrain to H, V, 45" ), + _( "Limit actions to horizontal, vertical, or 45 degrees from the starting point" ), BITMAPS::INVALID_BITMAP ); TOOL_ACTION PCB_ACTIONS::lock( "pcbnew.EditorControl.lock", @@ -708,7 +710,8 @@ TOOL_ACTION PCB_ACTIONS::appendBoard( "pcbnew.EditorControl.appendBoard", BITMAPS::add_board ); TOOL_ACTION PCB_ACTIONS::highlightNet( "pcbnew.EditorControl.highlightNet", - AS_GLOBAL, 0, "", _( "Highlight Net" ), _( "Highlight the selected net" ), + AS_GLOBAL, 0, "", + _( "Highlight Net" ), _( "Highlight the selected net" ), BITMAPS::net_highlight ); TOOL_ACTION PCB_ACTIONS::toggleLastNetHighlight( "pcbnew.EditorControl.toggleLastNetHighlight", @@ -716,11 +719,13 @@ TOOL_ACTION PCB_ACTIONS::toggleLastNetHighlight( "pcbnew.EditorControl.toggleLas _( "Toggle Last Net Highlight" ), _( "Toggle between last two highlighted nets" ) ); TOOL_ACTION PCB_ACTIONS::clearHighlight( "pcbnew.EditorControl.clearHighlight", - AS_GLOBAL, '~', "", + AS_GLOBAL, + '~', "", _( "Clear Net Highlighting" ), _( "Clear any existing net highlighting" ) ); TOOL_ACTION PCB_ACTIONS::toggleNetHighlight( "pcbnew.EditorControl.toggleNetHighlight", - AS_GLOBAL, MD_CTRL + '`', "", + AS_GLOBAL, + MD_CTRL + '`', "", _( "Toggle Net Highlight" ), _( "Toggle net highlighting" ), BITMAPS::net_highlight ); @@ -734,11 +739,13 @@ TOOL_ACTION PCB_ACTIONS::highlightNetSelection( "pcbnew.EditorControl.highlightN TOOL_ACTION PCB_ACTIONS::highlightItem( "pcbnew.EditorControl.highlightItem", AS_GLOBAL ); -TOOL_ACTION PCB_ACTIONS::hideNet( "pcbnew.EditorControl.hideNet", AS_GLOBAL, 0, "", +TOOL_ACTION PCB_ACTIONS::hideNet( "pcbnew.EditorControl.hideNet", + AS_GLOBAL, 0, "", _( "Hide Net" ), _( "Hide the ratsnest for the selected net" ), BITMAPS::hide_ratsnest ); -TOOL_ACTION PCB_ACTIONS::showNet( "pcbnew.EditorControl.showNet", AS_GLOBAL, 0, "", +TOOL_ACTION PCB_ACTIONS::showNet( "pcbnew.EditorControl.showNet", + AS_GLOBAL, 0, "", _( "Show Net" ), _( "Show the ratsnest for the selected net" ), BITMAPS::show_ratsnest );