diff --git a/include/board_design_settings.h b/include/board_design_settings.h
index a91123e533..c605c49561 100644
--- a/include/board_design_settings.h
+++ b/include/board_design_settings.h
@@ -49,7 +49,10 @@
#define DEFAULT_PCB_EDGE_THICKNESS 0.15
-#define DEFAULT_SOLDERMASK_CLEARANCE 0.05 // soldermask to pad clearance
+// soldermask to pad clearance. The default is 0 because usually board houses
+// create a clearance depending on their fab process:
+// mask material, color, price ...
+#define DEFAULT_SOLDERMASK_CLEARANCE 0.0
// DEFAULT_SOLDERMASK_MIN_WIDTH is only used in Gerber files: soldermask minimum size.
// Set to 0, because using non 0 value creates an annoying issue in Gerber files:
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 3eae55f5f3..6736bddc1d 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -379,6 +379,17 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
// this option exist only in DXF format:
m_DXF_plotModeOpt->Enable( getPlotFormat() == PLOT_FORMAT_DXF );
+ // The alert message about non 0 solder mask min width and margin is shown
+ // only in gerber format and if min mask width or mask margin is not 0
+ BOARD* board = m_parent->GetBoard();
+ const BOARD_DESIGN_SETTINGS& brd_settings = board->GetDesignSettings();
+
+ if( getPlotFormat() == PLOT_FORMAT_GERBER &&
+ ( brd_settings.m_SolderMaskMargin || brd_settings.m_SolderMaskMinWidth ) )
+ m_PlotOptionsSizer->Show( m_SizerSolderMaskAlert );
+ else
+ m_PlotOptionsSizer->Hide( m_SizerSolderMaskAlert );
+
switch( getPlotFormat() )
{
case PLOT_FORMAT_PDF:
diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp
index 7e14300cc5..02ba1fabd2 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 Oct 26 2018)
+// C++ code generated with wxFormBuilder (version Jul 10 2019)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -27,7 +27,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
wxString m_plotFormatOptChoices[] = { _("Gerber"), _("Postscript"), _("SVG"), _("DXF"), _("HPGL"), _("PDF") };
int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 );
- m_plotFormatOpt->SetSelection( 0 );
+ m_plotFormatOpt->SetSelection( 4 );
bupperSizer->Add( m_plotFormatOpt, 0, wxALL, 6 );
@@ -176,53 +176,65 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 5 );
+ m_SizerSolderMaskAlert = new wxBoxSizer( wxHORIZONTAL );
+
+ m_bitmapAlert = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxART_WARNING, wxART_CMN_DIALOG ), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SizerSolderMaskAlert->Add( m_bitmapAlert, 0, wxALL, 5 );
+
+ m_staticTextAlert = new wxStaticText( this, wxID_ANY, _("Global solder mask min width and margin are not set to 0\nMost of board houses expect a 0 value and use their constraints\nPlease ensure the solder mask min width and margin value are valid\nand use a non 0 value only when required."), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextAlert->Wrap( -1 );
+ m_SizerSolderMaskAlert->Add( m_staticTextAlert, 0, wxALL, 5 );
+
+
+ m_PlotOptionsSizer->Add( m_SizerSolderMaskAlert, 1, wxEXPAND, 5 );
+
m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxHORIZONTAL );
- wxGridBagSizer* gbSizer2;
- gbSizer2 = new wxGridBagSizer( 3, 0 );
- gbSizer2->SetFlexibleDirection( wxHORIZONTAL );
- gbSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ wxGridBagSizer* gbSizerOptions;
+ gbSizerOptions = new wxGridBagSizer( 3, 0 );
+ gbSizerOptions->SetFlexibleDirection( wxHORIZONTAL );
+ gbSizerOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_useGerberExtensions = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Use Protel filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
m_useGerberExtensions->SetToolTip( _("Use Protel Gerber extensions (.GBL, .GTL, etc...)\nNo longer recommended. The official extension is .gbr") );
m_useGerberExtensions->SetMinSize( wxSize( 280,-1 ) );
- gbSizer2->Add( m_useGerberExtensions, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ gbSizerOptions->Add( m_useGerberExtensions, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_generateGerberJobFile = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Generate Gerber job file"), wxDefaultPosition, wxDefaultSize, 0 );
m_generateGerberJobFile->SetToolTip( _("Generate a Gerber job file that contains info about the board,\nand the list of generated Gerber plot files") );
- gbSizer2->Add( m_generateGerberJobFile, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ gbSizerOptions->Add( m_generateGerberJobFile, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_subtractMaskFromSilk = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
- gbSizer2->Add( m_subtractMaskFromSilk, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ gbSizerOptions->Add( m_subtractMaskFromSilk, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
coordFormatLabel = new wxStaticText( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Coordinate format:"), wxDefaultPosition, wxDefaultSize, 0 );
coordFormatLabel->Wrap( -1 );
- gbSizer2->Add( coordFormatLabel, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 );
+ gbSizerOptions->Add( coordFormatLabel, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 );
wxString m_coordFormatCtrlChoices[] = { _("4.5, unit mm"), _("4.6, unit mm") };
int m_coordFormatCtrlNChoices = sizeof( m_coordFormatCtrlChoices ) / sizeof( wxString );
m_coordFormatCtrl = new wxChoice( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_coordFormatCtrlNChoices, m_coordFormatCtrlChoices, 0 );
m_coordFormatCtrl->SetSelection( 0 );
- gbSizer2->Add( m_coordFormatCtrl, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 );
+ gbSizerOptions->Add( m_coordFormatCtrl, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_useGerberX2Format = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Use extended X2 format"), wxDefaultPosition, wxDefaultSize, 0 );
m_useGerberX2Format->SetToolTip( _("Use X2 Gerber file format.\nInclude mainly X2 attributes in Gerber headers.\nIf not checked, use X1 format.\nIn X1 format, these attributes are included as comments in files.") );
- gbSizer2->Add( m_useGerberX2Format, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 );
+ gbSizerOptions->Add( m_useGerberX2Format, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 30 );
m_useGerberNetAttributes = new wxCheckBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Include netlist attributes"), wxDefaultPosition, wxDefaultSize, 0 );
m_useGerberNetAttributes->SetToolTip( _("Include netlist metadata and aperture attributes in Gerber files.\nIn X1 format, they are comments.\nUsed to check connectivity in CAM tools and Gerber viewers.") );
- gbSizer2->Add( m_useGerberNetAttributes, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 30 );
+ gbSizerOptions->Add( m_useGerberNetAttributes, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 30 );
- gbSizer2->AddGrowableCol( 2 );
+ gbSizerOptions->AddGrowableCol( 2 );
- m_GerberOptionsSizer->Add( gbSizer2, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ m_GerberOptionsSizer->Add( gbSizerOptions, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 5 );
@@ -302,25 +314,34 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 5 );
- 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") ), wxHORIZONTAL );
+
+ wxBoxSizer* bSizerDxfLeft;
+ bSizerDxfLeft = new wxBoxSizer( wxVERTICAL );
m_DXF_plotModeOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Plot graphic items using their contours"), wxDefaultPosition, wxDefaultSize, 0 );
m_DXF_plotModeOpt->SetValue(true);
m_DXF_plotModeOpt->SetToolTip( _("Uncheck to plot graphic items using their center lines") );
- m_SizerDXF_options->Add( m_DXF_plotModeOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ bSizerDxfLeft->Add( m_DXF_plotModeOpt, 0, wxALL, 5 );
m_DXF_plotTextStrokeFontOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Use Pcbnew font to plot texts"), wxDefaultPosition, wxDefaultSize, 0 );
m_DXF_plotTextStrokeFontOpt->SetToolTip( _("Check to use Pcbnew stroke font\nUncheck to plot oneline ASCII texts as editable text (using DXF font)") );
- m_SizerDXF_options->Add( m_DXF_plotTextStrokeFontOpt, 0, wxALL, 5 );
+ bSizerDxfLeft->Add( m_DXF_plotTextStrokeFontOpt, 0, wxALL, 5 );
- wxBoxSizer* dxfSizer1;
- dxfSizer1 = new wxBoxSizer( wxHORIZONTAL );
+
+ m_SizerDXF_options->Add( bSizerDxfLeft, 1, wxEXPAND, 5 );
+
+
+ m_SizerDXF_options->Add( 20, 0, 0, 0, 5 );
+
+ wxBoxSizer* dxfSizerRight;
+ dxfSizerRight = new wxBoxSizer( wxHORIZONTAL );
DXF_exportUnitsLabel = new wxStaticText( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Export units:"), wxDefaultPosition, wxDefaultSize, 0 );
DXF_exportUnitsLabel->Wrap( -1 );
- dxfSizer1->Add( DXF_exportUnitsLabel, 0, wxALIGN_CENTER|wxALIGN_LEFT|wxALL, 5 );
+ dxfSizerRight->Add( DXF_exportUnitsLabel, 0, wxALIGN_CENTER|wxALIGN_LEFT|wxALL, 5 );
wxString m_DXF_plotUnitsChoices[] = { _("Inches"), _("Millimeters") };
int m_DXF_plotUnitsNChoices = sizeof( m_DXF_plotUnitsChoices ) / sizeof( wxString );
@@ -328,10 +349,10 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_DXF_plotUnits->SetSelection( 0 );
m_DXF_plotUnits->SetToolTip( _("The units to use for the exported DXF file") );
- dxfSizer1->Add( m_DXF_plotUnits, 0, wxALIGN_CENTER|wxALL, 5 );
+ dxfSizerRight->Add( m_DXF_plotUnits, 0, wxALIGN_CENTER|wxALL, 5 );
- m_SizerDXF_options->Add( dxfSizer1, 1, wxEXPAND, 5 );
+ m_SizerDXF_options->Add( dxfSizerRight, 1, wxEXPAND, 5 );
m_PlotOptionsSizer->Add( m_SizerDXF_options, 0, wxEXPAND|wxALL, 5 );
@@ -375,7 +396,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
this->SetSizer( m_MainSizer );
this->Layout();
- m_MainSizer->Fit( this );
m_popMenu = new wxMenu();
wxMenuItem* m_menuItem1;
m_menuItem1 = new wxMenuItem( m_popMenu, ID_LAYER_FAB, wxString( _("Select Fab Layers") ) , wxEmptyString, wxITEM_NORMAL );
diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
index cbbe0e9628..d54e365869 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
@@ -25,6 +26,7 @@
1
1
UI
+ 0
1
0
+
+ 5
+ wxEXPAND
+ 1
+
+
+ m_SizerSolderMaskAlert
+ wxHORIZONTAL
+ protected
+
+ 5
+ wxALL
+ 0
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+
+
+ Load From Art Provider; wxART_WARNING; wxART_CMN_DIALOG
+
+ 1
+ 0
+ 1
+
+ 1
+ 0
+ Dock
+ 0
+ Left
+ 1
+
+ 1
+
+ 0
+ 0
+ wxID_ANY
+
+ 0
+
+
+ 0
+
+ 1
+ m_bitmapAlert
+ 1
+
+
+ protected
+ 1
+
+ Resizable
+ 1
+
+ ; ; forward_declare
+ 0
+
+
+
+
+
+
+
+ 5
+ wxALL
+ 0
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+ 1
+ 0
+ 1
+
+ 1
+ 0
+ Dock
+ 0
+ Left
+ 1
+
+ 1
+
+ 0
+ 0
+ wxID_ANY
+ Global solder mask min width and margin are not set to 0
Most of board houses expect a 0 value and use their constraints
Please ensure the solder mask min width and margin value are valid
and use a non 0 value only when required.
+ 0
+
+ 0
+
+
+ 0
+
+ 1
+ m_staticTextAlert
+ 1
+
+
+ protected
+ 1
+
+ Resizable
+ 1
+
+
+ ; ; forward_declare
+ 0
+
+
+
+
+ -1
+
+
+
+
5
wxALL|wxEXPAND
@@ -1881,7 +2013,7 @@
0
- gbSizer2
+ gbSizerOptions
wxFLEX_GROWMODE_SPECIFIED
none
3
@@ -3127,136 +3259,157 @@
DXF Options
m_SizerDXF_options
- wxVERTICAL
+ wxHORIZONTAL
1
protected
-
+
5
- wxBOTTOM|wxRIGHT|wxLEFT
- 0
-
- 1
- 1
- 1
- 1
-
-
-
-
-
-
-
- 1
- 0
- 1
- 1
-
- 1
- 0
- Dock
- 0
- Left
- 1
-
- 1
-
- 0
- 0
- wxID_ANY
- Plot graphic items using their contours
-
- 0
-
-
- 0
+ wxEXPAND
+ 1
+
- 1
- m_DXF_plotModeOpt
- 1
-
-
- protected
- 1
-
- Resizable
- 1
-
-
-
- 0
- Uncheck to plot graphic items using their center lines
-
- wxFILTER_NONE
- wxDefaultValidator
-
-
-
-
- OnChangeDXFPlotMode
+ bSizerDxfLeft
+ wxVERTICAL
+ none
+
+ 5
+ wxALL
+ 0
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+ 1
+ 0
+ 1
+ 1
+
+ 1
+ 0
+ Dock
+ 0
+ Left
+ 1
+
+ 1
+
+ 0
+ 0
+ wxID_ANY
+ Plot graphic items using their contours
+
+ 0
+
+
+ 0
+
+ 1
+ m_DXF_plotModeOpt
+ 1
+
+
+ protected
+ 1
+
+ Resizable
+ 1
+
+
+
+ 0
+ Uncheck to plot graphic items using their center lines
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+ OnChangeDXFPlotMode
+
+
+
+ 5
+ wxALL
+ 0
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+ 1
+ 0
+ 0
+ 1
+
+ 1
+ 0
+ Dock
+ 0
+ Left
+ 1
+
+ 1
+
+ 0
+ 0
+ wxID_ANY
+ Use Pcbnew font to plot texts
+
+ 0
+
+
+ 0
+
+ 1
+ m_DXF_plotTextStrokeFontOpt
+ 1
+
+
+ protected
+ 1
+
+ Resizable
+ 1
+
+
+
+ 0
+ Check to use Pcbnew stroke font
Uncheck to plot oneline ASCII texts as editable text (using DXF font)
+
+ wxFILTER_NONE
+ wxDefaultValidator
+
+
+
+
+
+
-
+
5
- wxALL
+
0
-
- 1
- 1
- 1
- 1
-
-
-
-
-
-
-
- 1
- 0
- 0
- 1
-
- 1
- 0
- Dock
- 0
- Left
- 1
-
- 1
-
- 0
- 0
- wxID_ANY
- Use Pcbnew font to plot texts
-
- 0
-
-
- 0
-
- 1
- m_DXF_plotTextStrokeFontOpt
- 1
-
-
+
+ 0
protected
- 1
-
- Resizable
- 1
-
-
-
- 0
- Check to use Pcbnew stroke font
Uncheck to plot oneline ASCII texts as editable text (using DXF font)
-
- wxFILTER_NONE
- wxDefaultValidator
-
-
-
-
+ 20
@@ -3265,7 +3418,7 @@
1
- dxfSizer1
+ dxfSizerRight
wxHORIZONTAL
none
diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h
index 063d263521..3f377dca99 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 Oct 26 2018)
+// C++ code generated with wxFormBuilder (version Jul 10 2019)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -31,6 +31,7 @@ class WX_HTML_REPORT_PANEL;
#include
#include
#include
+#include
#include
#include
#include
@@ -86,6 +87,9 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM
wxCheckBox* m_plotMirrorOpt;
wxCheckBox* m_plotPSNegativeOpt;
wxCheckBox* m_zoneFillCheck;
+ wxBoxSizer* m_SizerSolderMaskAlert;
+ wxStaticBitmap* m_bitmapAlert;
+ wxStaticText* m_staticTextAlert;
wxStaticBoxSizer* m_GerberOptionsSizer;
wxCheckBox* m_useGerberExtensions;
wxCheckBox* m_generateGerberJobFile;
@@ -137,7 +141,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM
public:
- DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 762,695 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_PLOT_BASE();
void DIALOG_PLOT_BASEOnContextMenu( wxMouseEvent &event )
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
index 5d6d558ead..34a8b6be53 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp
@@ -38,7 +38,7 @@ PANEL_SETUP_MASK_AND_PASTE_BASE::PANEL_SETUP_MASK_AND_PASTE_BASE( wxWindow* pare
m_bitmapWarning = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxART_WARNING, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 );
bSizer4->Add( m_bitmapWarning, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- m_staticTextInfoMaskMinWidth = new wxStaticText( this, wxID_ANY, _("Note: Set Solder mask minimum width to 0,\nunless your board house ask for a specific value"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextInfoMaskMinWidth = new wxStaticText( this, wxID_ANY, _("Note: Set Solder mask minimum width and solder mask clearance to 0,\nunless your board house ask for a specific value"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfoMaskMinWidth->Wrap( -1 );
m_staticTextInfoMaskMinWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
index ee10a68bc2..2a2c35ba7f 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste_base.fbp
@@ -295,7 +295,7 @@
0
0
wxID_ANY
- Note: Set Solder mask minimum width to 0,
unless your board house ask for a specific value
+ Note: Set Solder mask minimum width and solder mask clearance to 0,
unless your board house ask for a specific value
0
0