haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use consistent terminology for various constraint modes.

This commit is contained in:
Jeff Young 2021-10-23 12:18:08 +01:00
parent 90eff6c6a2
commit e30d867439
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/dialogs/panel_eeschema_editing_options_base.cpp
View File

@ -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 );

4
eeschema/dialogs/panel_eeschema_editing_options_base.fbp
View File

@ -108,7 +108,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">&amp;Restrict buses and wires to H and V orientation</property>
<property name="label">Constrain buses and wires to H or V</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -172,7 +172,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Mouse drag performs drag (G) operation</property>
<property name="label">Mouse drag performs Drag (G) operation</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>

4
pcbnew/dialogs/panel_edit_options_base.cpp
View File

@ -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 );

4
pcbnew/dialogs/panel_edit_options_base.fbp
View File

@ -2346,7 +2346,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -2377,7 +2377,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Limit actions to 45 degrees from start</property>
<property name="label">Constrain to H, V, 45 degrees</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>

21
pcbnew/tools/pcb_actions.cpp
View File

@ -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 );