From e91b51011e0b2ff63f32f9d73296c230462bdc1d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 28 Jun 2025 19:51:10 -0600 Subject: [PATCH] Use title case for menu items. --- pcbnew/dialogs/dialog_outset_items_base.cpp | 26 +++++++++---------- pcbnew/dialogs/dialog_outset_items_base.fbp | 28 ++++++++++----------- pcbnew/tools/pcb_actions.cpp | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pcbnew/dialogs/dialog_outset_items_base.cpp b/pcbnew/dialogs/dialog_outset_items_base.cpp index 917c9620ba..d1837118e5 100644 --- a/pcbnew/dialogs/dialog_outset_items_base.cpp +++ b/pcbnew/dialogs/dialog_outset_items_base.cpp @@ -25,14 +25,14 @@ DIALOG_OUTSET_ITEMS_BASE::DIALOG_OUTSET_ITEMS_BASE( wxWindow* parent, wxWindowID m_outsetLabel = new wxStaticText( this, wxID_ANY, _("Outset:"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_outsetLabel->Wrap( -1 ); - gbSizer1->Add( m_outsetLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + gbSizer1->Add( m_outsetLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_outsetEntry = new wxComboBox( this, wxID_ANY, _("0.1"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); gbSizer1->Add( m_outsetEntry, wxGBPosition( 0, 1 ), wxGBSpan( 1, 2 ), wxALL|wxEXPAND, 5 ); m_outsetUnit = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_outsetUnit->Wrap( -1 ); - gbSizer1->Add( m_outsetUnit, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_outsetUnit, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_roundToGrid = new wxCheckBox( this, wxID_ANY, _("Round outwards to grid multiples (when possible)"), wxDefaultPosition, wxDefaultSize, 0 ); m_roundToGrid->SetValue(true); @@ -45,24 +45,24 @@ DIALOG_OUTSET_ITEMS_BASE::DIALOG_OUTSET_ITEMS_BASE( wxWindow* parent, wxWindowID m_gridRoundingLabel = new wxStaticText( this, wxID_ANY, _("Grid size:"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_gridRoundingLabel->Wrap( -1 ); - gbSizer1->Add( m_gridRoundingLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + gbSizer1->Add( m_gridRoundingLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_gridRoundingEntry = new wxComboBox( this, wxID_ANY, _("0.01"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); gbSizer1->Add( m_gridRoundingEntry, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxALL|wxEXPAND, 5 ); m_gridRoundingUnit = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_gridRoundingUnit->Wrap( -1 ); - gbSizer1->Add( m_gridRoundingUnit, wxGBPosition( 3, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_gridRoundingUnit, wxGBPosition( 3, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - gbSizer1->Add( m_staticline2, wxGBPosition( 4, 0 ), wxGBSpan( 1, 4 ), wxALL|wxEXPAND, 5 ); + gbSizer1->Add( m_staticline2, wxGBPosition( 4, 0 ), wxGBSpan( 1, 4 ), wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_copyLayers = new wxCheckBox( this, wxID_ANY, _("Copy item layers"), wxDefaultPosition, wxDefaultSize, 0 ); - gbSizer1->Add( m_copyLayers, wxGBPosition( 5, 0 ), wxGBSpan( 1, 4 ), wxALL|wxEXPAND, 5 ); + gbSizer1->Add( m_copyLayers, wxGBPosition( 5, 0 ), wxGBSpan( 1, 4 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_layerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_layerLabel->Wrap( -1 ); - gbSizer1->Add( m_layerLabel, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + gbSizer1->Add( m_layerLabel, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); gbSizer1->Add( m_LayerSelectionCtrl, wxGBPosition( 6, 1 ), wxGBSpan( 1, 3 ), wxALL|wxEXPAND, 5 ); @@ -77,17 +77,17 @@ DIALOG_OUTSET_ITEMS_BASE::DIALOG_OUTSET_ITEMS_BASE( wxWindow* parent, wxWindowID gbSizer1->Add( m_lineWidthLabel, wxGBPosition( 8, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_lineWidthEntry = new wxComboBox( this, wxID_ANY, _("0.1"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gbSizer1->Add( m_lineWidthEntry, wxGBPosition( 8, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); + gbSizer1->Add( m_lineWidthEntry, wxGBPosition( 8, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_lineWidthUnit = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthUnit->Wrap( -1 ); - gbSizer1->Add( m_lineWidthUnit, wxGBPosition( 8, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_lineWidthUnit, wxGBPosition( 8, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); - m_layerDefaultBtn = new wxButton( this, wxID_ANY, _("Layer default"), wxDefaultPosition, wxDefaultSize, 0 ); - gbSizer1->Add( m_layerDefaultBtn, wxGBPosition( 8, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + m_layerDefaultBtn = new wxButton( this, wxID_ANY, _("Layer Default"), wxDefaultPosition, wxDefaultSize, 0 ); + gbSizer1->Add( m_layerDefaultBtn, wxGBPosition( 8, 3 ), wxGBSpan( 1, 1 ), wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - gbSizer1->Add( m_staticline21, wxGBPosition( 9, 0 ), wxGBSpan( 1, 4 ), wxEXPAND | wxALL, 5 ); + gbSizer1->Add( m_staticline21, wxGBPosition( 9, 0 ), wxGBSpan( 1, 4 ), wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_deleteSourceItems = new wxCheckBox( this, wxID_ANY, _("Delete source items after outset"), wxDefaultPosition, wxDefaultSize, 0 ); m_deleteSourceItems->SetToolTip( _("This is not possible for items like pads, which will still use the value below.") ); @@ -97,7 +97,7 @@ DIALOG_OUTSET_ITEMS_BASE::DIALOG_OUTSET_ITEMS_BASE( wxWindow* parent, wxWindowID gbSizer1->AddGrowableCol( 1 ); - bMainSizer->Add( gbSizer1, 1, wxEXPAND, 5 ); + bMainSizer->Add( gbSizer1, 1, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizerBottom; bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_outset_items_base.fbp b/pcbnew/dialogs/dialog_outset_items_base.fbp index 6a9c64bd44..03e5cbc472 100644 --- a/pcbnew/dialogs/dialog_outset_items_base.fbp +++ b/pcbnew/dialogs/dialog_outset_items_base.fbp @@ -67,7 +67,7 @@ none 5 - wxEXPAND + wxEXPAND|wxALL 1 @@ -84,7 +84,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -218,7 +218,7 @@ 5 1 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 1 @@ -420,7 +420,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 3 1 @@ -554,7 +554,7 @@ 5 1 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 3 1 @@ -619,7 +619,7 @@ 5 4 0 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxBOTTOM 4 1 @@ -681,7 +681,7 @@ 5 4 0 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 5 1 @@ -750,7 +750,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 6 1 @@ -1017,7 +1017,7 @@ 5 1 1 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL 8 1 @@ -1083,10 +1083,10 @@ - 5 + 10 1 2 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 8 1 @@ -1151,7 +1151,7 @@ 5 1 3 - wxALL + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 8 1 @@ -1189,7 +1189,7 @@ 0 0 wxID_ANY - Layer default + Layer Default 0 @@ -1229,7 +1229,7 @@ 5 4 0 - wxEXPAND | wxALL + wxEXPAND|wxTOP|wxBOTTOM 9 1 diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index f413bbc908..9fe85e7db5 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -94,7 +94,7 @@ TOOL_ACTION PCB_ACTIONS::convertToTracks( TOOL_ACTION_ARGS() TOOL_ACTION PCB_ACTIONS::outsetItems( TOOL_ACTION_ARGS() .Name( "pcbnew.Convert.outsetItems" ) .Scope( AS_GLOBAL ) - .FriendlyName( _( "Create Outsets from Selection" ) ) + .FriendlyName( _( "Create Outsets from Selection..." ) ) .Tooltip( _( "Create outset lines from the selected item" ) ) .Icon( BITMAPS::outset_from_selection ) );