From 3c00b2a2a8545e3531ad90c66621b7b8f8078c57 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Mon, 23 Apr 2018 10:25:32 -0700 Subject: [PATCH] Standardize colons plot dialog --- pcbnew/dialogs/dialog_plot_base.cpp | 20 +++++++++---------- pcbnew/dialogs/dialog_plot_base.fbp | 31 +++++++++++++++-------------- pcbnew/dialogs/dialog_plot_base.h | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 7b0c6a14a5..667808c74d 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -80,7 +80,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbOptionsSizer; - sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options") ), wxVERTICAL ); + sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options:") ), wxVERTICAL ); wxBoxSizer* bSizer192; bSizer192 = new wxBoxSizer( wxHORIZONTAL ); @@ -166,7 +166,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_plotModeOpt->SetSelection( 0 ); bSizer14->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 ); - m_textDefaultPenSize = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Line width"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textDefaultPenSize = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Line width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textDefaultPenSize->Wrap( -1 ); m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") ); @@ -187,7 +187,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 ); wxStaticBoxSizer* sbSizerSoldMaskLayerOpt; - sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder Mask Options") ), wxVERTICAL ); + sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder Mask Options:") ), wxVERTICAL ); wxFlexGridSizer* fgSizerSoldMaskOpts; fgSizerSoldMaskOpts = new wxFlexGridSizer( 2, 2, 0, 0 ); @@ -220,7 +220,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( sbSizerSoldMaskLayerOpt, 1, wxEXPAND, 5 ); - m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxHORIZONTAL ); + m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options:") ), wxHORIZONTAL ); wxBoxSizer* bSizerGbrOpt; bSizerGbrOpt = new wxBoxSizer( wxVERTICAL ); @@ -264,12 +264,12 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 ); - m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL ); + m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options:") ), wxVERTICAL ); wxBoxSizer* bSizerHPGL_options; bSizerHPGL_options = new wxBoxSizer( wxVERTICAL ); - m_textPenSize = new wxStaticText( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textPenSize = new wxStaticText( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, _("Pen size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textPenSize->Wrap( -1 ); bSizerHPGL_options->Add( m_textPenSize, 0, wxRIGHT|wxLEFT, 5 ); @@ -282,7 +282,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL|wxEXPAND, 3 ); - m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL ); + m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options:") ), wxVERTICAL ); wxBoxSizer* bSizer17; bSizer17 = new wxBoxSizer( wxHORIZONTAL ); @@ -320,7 +320,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr wxBoxSizer* bSizer191; bSizer191 = new wxBoxSizer( wxVERTICAL ); - m_textPSFineAdjustWidth = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("Width correction"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textPSFineAdjustWidth = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("Width correction:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textPSFineAdjustWidth->Wrap( -1 ); bSizer191->Add( m_textPSFineAdjustWidth, 0, wxRIGHT|wxLEFT, 5 ); @@ -341,7 +341,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 ); - m_SizerDXF_options = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("DXF options") ), wxVERTICAL ); + m_SizerDXF_options = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("DXF options:") ), wxVERTICAL ); m_DXF_plotModeOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Plot all layers in outline (polygon) mode"), wxDefaultPosition, wxDefaultSize, 0 ); m_DXF_plotModeOpt->SetValue(true); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index ef694bd6d6..17375c9fe8 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -14,6 +14,7 @@ dialog_plot_base 1000 none + 1 Dialog_Plot_base @@ -703,7 +704,7 @@ 0 wxID_ANY - General Options + General Options: sbOptionsSizer wxVERTICAL @@ -723,7 +724,7 @@ 5 wxEXPAND 0 - + bSizerPlotItems wxVERTICAL @@ -2164,7 +2165,7 @@ 0 0 wxID_ANY - Line width + Line width: 0 @@ -2318,7 +2319,7 @@ 1 wxID_ANY - Solder Mask Options + Solder Mask Options: sbSizerSoldMaskLayerOpt wxVERTICAL @@ -2681,20 +2682,20 @@ 3 wxALL|wxEXPAND 0 - + wxID_ANY - Gerber Options + Gerber Options: m_GerberOptionsSizer wxHORIZONTAL 1 protected - + 5 wxALIGN_CENTER_VERTICAL 1 - + bSizerGbrOpt wxVERTICAL @@ -2963,11 +2964,11 @@ - + 2 wxALL 0 - + 1 1 1 @@ -3239,7 +3240,7 @@ 0 wxID_ANY - HPGL Options + HPGL Options: m_HPGLOptionsSizer wxVERTICAL @@ -3287,7 +3288,7 @@ 0 0 wxID_ANY - Pen size + Pen size: 0 @@ -3439,7 +3440,7 @@ 0 wxID_ANY - Postscript Options + Postscript Options: m_PSOptionsSizer wxVERTICAL @@ -3866,7 +3867,7 @@ 0 0 wxID_ANY - Width correction + Width correction: 0 @@ -4108,7 +4109,7 @@ 0 wxID_ANY - DXF options + DXF options: m_SizerDXF_options wxVERTICAL diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h index 37e31596b2..1b2478396c 100644 --- a/pcbnew/dialogs/dialog_plot_base.h +++ b/pcbnew/dialogs/dialog_plot_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!