kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #29666
[PATCH] correct text inside two important plot windows
Hello,
the following patch corrects some text
and labels
inside the two Plot menus accessible from schematic editor and pcb editor.
See below
[image: Inline image 9]
[image: Inline image 4]
So that we know what we are talking about I include here a before vs after
comparison
[image: Inline image 6][image: Inline image 10]
Cheers
Fabrizio
From af3837281f51d2b63b90af19862828a868678315 Mon Sep 17 00:00:00 2001
From: Fabrizio Tappero <fabrizio.tappero@xxxxxxxxx>
Date: Thu, 8 Jun 2017 12:55:41 +0200
Subject: [PATCH] fixed plot menu text and labels
---
0001-fixed-plot-menu-text-and-labels.patch | 1342 ++++++++++++++++++++++++++++
pcbnew/dialogs/dialog_plot_base.fbp | 2 +-
pcbnew/dialogs/dialog_plot_base.h | 2 +-
3 files changed, 1344 insertions(+), 2 deletions(-)
create mode 100644 0001-fixed-plot-menu-text-and-labels.patch
diff --git a/0001-fixed-plot-menu-text-and-labels.patch b/0001-fixed-plot-menu-text-and-labels.patch
new file mode 100644
index 0000000..7f52be3
--- /dev/null
+++ b/0001-fixed-plot-menu-text-and-labels.patch
@@ -0,0 +1,1342 @@
+From dc828d003f11882ebf382b4d9efd5a0ad51af9dd Mon Sep 17 00:00:00 2001
+From: Fabrizio Tappero <fabrizio.tappero@xxxxxxxxx>
+Date: Thu, 8 Jun 2017 12:48:47 +0200
+Subject: [PATCH] fixed plot menu text and labels
+
+---
+ common/dialogs/wx_html_report_panel_base.cpp | 10 +-
+ common/dialogs/wx_html_report_panel_base.fbp | 6 +-
+ common/dialogs/wx_html_report_panel_base.h | 2 +-
+ eeschema/dialogs/dialog_plot_schematic_base.cpp | 41 +++----
+ eeschema/dialogs/dialog_plot_schematic_base.fbp | 135 ++++++++++++------------
+ eeschema/dialogs/dialog_plot_schematic_base.h | 4 +-
+ pcbnew/dialogs/dialog_plot_base.cpp | 48 ++++-----
+ pcbnew/dialogs/dialog_plot_base.fbp | 106 +++++++++----------
+ pcbnew/dialogs/dialog_plot_base.h | 4 +-
+ 9 files changed, 181 insertions(+), 175 deletions(-)
+
+diff --git a/common/dialogs/wx_html_report_panel_base.cpp b/common/dialogs/wx_html_report_panel_base.cpp
+index b297a5a..1e0d238 100644
+--- a/common/dialogs/wx_html_report_panel_base.cpp
++++ b/common/dialogs/wx_html_report_panel_base.cpp
+@@ -1,5 +1,5 @@
+ ///////////////////////////////////////////////////////////////////////////
+-// C++ code generated with wxFormBuilder (version May 6 2016)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+@@ -11,7 +11,7 @@
+
+ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+ {
+- m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
++ m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output Messages:") ), wxVERTICAL );
+
+ wxFlexGridSizer* fgSizer4;
+ fgSizer4 = new wxFlexGridSizer( 2, 1, 0, 0 );
+@@ -21,7 +21,7 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
+ fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ m_htmlView = new wxHtmlWindow( m_box->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+- m_htmlView->SetFont( wxFont( 10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
++ m_htmlView->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+ fgSizer4->Add( m_htmlView, 1, wxEXPAND, 5 );
+
+@@ -31,7 +31,7 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
+ fgSizer3->SetFlexibleDirection( wxBOTH );
+ fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+- m_staticText3 = new wxStaticText( m_box->GetStaticBox(), wxID_ANY, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticText3 = new wxStaticText( m_box->GetStaticBox(), wxID_ANY, _("Show:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText3->Wrap( -1 );
+ fgSizer3->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
+
+@@ -59,7 +59,7 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
+
+ fgSizer3->Add( m_checkBoxShowActions, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+- m_btnSaveReportToFile = new wxButton( m_box->GetStaticBox(), wxID_ANY, _("Save report to file..."), wxDefaultPosition, wxDefaultSize, 0 );
++ m_btnSaveReportToFile = new wxButton( m_box->GetStaticBox(), wxID_ANY, _("Save Output"), wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizer3->Add( m_btnSaveReportToFile, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 );
+
+
+diff --git a/common/dialogs/wx_html_report_panel_base.fbp b/common/dialogs/wx_html_report_panel_base.fbp
+index 97ae7e8..39bfe23 100644
+--- a/common/dialogs/wx_html_report_panel_base.fbp
++++ b/common/dialogs/wx_html_report_panel_base.fbp
+@@ -80,7 +80,7 @@
+ <event name="OnUpdateUI"></event>
+ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Messages:</property>
++ <property name="label">Output Messages:</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_box</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -235,7 +235,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Filter:</property>
++ <property name="label">Show:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -759,7 +759,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Save report to file...</property>
++ <property name="label">Save Output</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size">-1,-1</property>
+diff --git a/common/dialogs/wx_html_report_panel_base.h b/common/dialogs/wx_html_report_panel_base.h
+index 371eb01..f4a8617 100644
+--- a/common/dialogs/wx_html_report_panel_base.h
++++ b/common/dialogs/wx_html_report_panel_base.h
+@@ -1,5 +1,5 @@
+ ///////////////////////////////////////////////////////////////////////////
+-// C++ code generated with wxFormBuilder (version May 6 2016)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp
+index c3e21ed..806443a 100644
+--- a/eeschema/dialogs/dialog_plot_schematic_base.cpp
++++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp
+@@ -1,5 +1,5 @@
+ ///////////////////////////////////////////////////////////////////////////
+-// C++ code generated with wxFormBuilder (version Mar 28 2015)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+@@ -21,17 +21,16 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
+ wxBoxSizer* bSizerDir;
+ bSizerDir = new wxBoxSizer( wxHORIZONTAL );
+
+- m_staticTextOutputDirectory = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticTextOutputDirectory = new wxStaticText( this, wxID_ANY, _("Output Directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextOutputDirectory->Wrap( -1 );
+ bSizerDir->Add( m_staticTextOutputDirectory, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+ m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+- m_outputDirectoryName->SetMaxLength( 0 );
+ m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the schematic main file location.") );
+
+ bSizerDir->Add( m_outputDirectoryName, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+- m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
++ m_browseButton = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerDir->Add( m_browseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+@@ -41,16 +40,20 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
+
+ wxString m_plotFormatOptChoices[] = { _("Postscript"), _("PDF"), _("SVG"), _("DXF"), _("HPGL") };
+ int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
+- m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_COLS );
+- m_plotFormatOpt->SetSelection( 1 );
++ m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Output Format:"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_COLS|wxSUNKEN_BORDER );
++ m_plotFormatOpt->SetSelection( 0 );
++ m_plotFormatOpt->SetMinSize( wxSize( 120,-1 ) );
++
+ m_optionsSizer->Add( m_plotFormatOpt, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+ m_paperOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper Options") ), wxVERTICAL );
+
+- wxString m_PaperSizeOptionChoices[] = { _("Schematic size"), _("Force size A4"), _("Force size A") };
++ wxString m_PaperSizeOptionChoices[] = { _("Schematic Size"), _("A4"), _("A") };
+ int m_PaperSizeOptionNChoices = sizeof( m_PaperSizeOptionChoices ) / sizeof( wxString );
+ m_PaperSizeOption = new wxRadioBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PaperSizeOptionNChoices, m_PaperSizeOptionChoices, 1, wxRA_SPECIFY_COLS );
+- m_PaperSizeOption->SetSelection( 1 );
++ m_PaperSizeOption->SetSelection( 0 );
++ m_PaperSizeOption->SetMinSize( wxSize( 140,-1 ) );
++
+ m_paperOptionsSizer->Add( m_PaperSizeOption, 0, wxALL|wxEXPAND, 5 );
+
+ m_paperHPGLSizer = new wxStaticBoxSizer( new wxStaticBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("HPGL Options") ), wxVERTICAL );
+@@ -59,24 +62,23 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
+ m_staticText4->Wrap( -1 );
+ m_paperHPGLSizer->Add( m_staticText4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+- wxString m_HPGLPaperSizeOptionChoices[] = { _("Schematic size"), _("Page size A4"), _("Page size A3"), _("Page size A2"), _("Page size A1"), _("Page size A0"), _("Page size A"), _("Page size B"), _("Page size C"), _("Page size D"), _("Page size E") };
++ wxString m_HPGLPaperSizeOptionChoices[] = { _("Schematic Size"), _("A4"), _("A3"), _("A2"), _("A1"), _("A0"), _("A"), _("B"), _("C"), _("D") };
+ int m_HPGLPaperSizeOptionNChoices = sizeof( m_HPGLPaperSizeOptionChoices ) / sizeof( wxString );
+ m_HPGLPaperSizeOption = new wxChoice( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_HPGLPaperSizeOptionNChoices, m_HPGLPaperSizeOptionChoices, 0 );
+ m_HPGLPaperSizeOption->SetSelection( 0 );
+ m_paperHPGLSizer->Add( m_HPGLPaperSizeOption, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+- wxString m_plotOriginOptChoices[] = { _("Bottom left corner"), _("Center of the page") };
++ wxString m_plotOriginOptChoices[] = { _("Bottom left"), _("Center on page") };
+ int m_plotOriginOptNChoices = sizeof( m_plotOriginOptChoices ) / sizeof( wxString );
+- m_plotOriginOpt = new wxRadioBox( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 1, wxRA_SPECIFY_COLS );
++ m_plotOriginOpt = new wxRadioBox( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Allign:"), wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 1, wxRA_SPECIFY_COLS );
+ m_plotOriginOpt->SetSelection( 0 );
+ m_paperHPGLSizer->Add( m_plotOriginOpt, 0, wxALL, 5 );
+
+- m_penHPLGWidthTitle = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Pen width"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_penHPLGWidthTitle = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Pen Width:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_penHPLGWidthTitle->Wrap( -1 );
+ m_paperHPGLSizer->Add( m_penHPLGWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_penHPGLWidthCtrl = new wxTextCtrl( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+- m_penHPGLWidthCtrl->SetMaxLength( 0 );
+ m_paperHPGLSizer->Add( m_penHPGLWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+@@ -88,27 +90,28 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
+ wxStaticBoxSizer* sbSizerPlotFormat;
+ sbSizerPlotFormat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options") ), wxVERTICAL );
+
+- m_defaultLineWidthTitle = new wxStaticText( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Default line thickness"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_defaultLineWidthTitle = new wxStaticText( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Line Thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_defaultLineWidthTitle->Wrap( -1 );
++ m_defaultLineWidthTitle->SetMinSize( wxSize( 190,-1 ) );
++
+ sbSizerPlotFormat->Add( m_defaultLineWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_DefaultLineSizeCtrl = new wxTextCtrl( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+- m_DefaultLineSizeCtrl->SetMaxLength( 0 );
+ m_DefaultLineSizeCtrl->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
+
+ sbSizerPlotFormat->Add( m_DefaultLineSizeCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+ wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
+ int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
+- m_ModeColorOption = new wxRadioBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
+- m_ModeColorOption->SetSelection( 1 );
+- m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
++ m_ModeColorOption = new wxRadioBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Output Mode:"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
++ m_ModeColorOption->SetSelection( 0 );
++ m_ModeColorOption->SetToolTip( _("Plot in black and white mode, better when using black and white printers") );
+
+ sbSizerPlotFormat->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
+
+ m_PlotFrameRefOpt = new wxCheckBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Plot border and title block"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_PlotFrameRefOpt->SetValue(true);
+- m_PlotFrameRefOpt->SetToolTip( _("Print (or not) the Frame references.") );
++ m_PlotFrameRefOpt->SetToolTip( _("Print frame references") );
+
+ sbSizerPlotFormat->Add( m_PlotFrameRefOpt, 0, wxALL, 5 );
+
+diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp
+index caf7fe3..17fa94e 100644
+--- a/eeschema/dialogs/dialog_plot_schematic_base.fbp
++++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp
+@@ -47,7 +47,7 @@
+ <property name="size">-1,-1</property>
+ <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
+ <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
+- <property name="title">Plot Schematic</property>
++ <property name="title">Plot Schematic Options</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+@@ -97,16 +97,16 @@
+ <property name="border">10</property>
+ <property name="flag">wxBOTTOM|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="1">
++ <object class="wxBoxSizer" expanded="0">
+ <property name="minimum_size"></property>
+ <property name="name">bSizerDir</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticText" expanded="1">
++ <object class="wxStaticText" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -134,7 +134,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Output directory:</property>
++ <property name="label">Output Directory:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -185,11 +185,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">1</property>
+- <object class="wxTextCtrl" expanded="1">
++ <object class="wxTextCtrl" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -276,11 +276,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
+- <object class="wxButton" expanded="1">
++ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -309,7 +309,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Browse...</property>
++ <property name="label">Browse</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -375,11 +375,11 @@
+ <property name="name">m_optionsSizer</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">protected</property>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxRadioBox" expanded="1">
++ <object class="wxRadioBox" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -408,14 +408,14 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Format</property>
++ <property name="label">Output Format:</property>
+ <property name="majorDimension">1</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+- <property name="minimum_size"></property>
++ <property name="minimum_size">120,-1</property>
+ <property name="moveable">1</property>
+ <property name="name">m_plotFormatOpt</property>
+ <property name="pane_border">1</property>
+@@ -425,7 +425,7 @@
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+- <property name="selection">1</property>
++ <property name="selection">0</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxRA_SPECIFY_COLS</property>
+@@ -438,7 +438,7 @@
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+- <property name="window_style"></property>
++ <property name="window_style">wxSUNKEN_BORDER</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+@@ -465,23 +465,24 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticBoxSizer" expanded="1">
++ <object class="wxStaticBoxSizer" expanded="0">
+ <property name="id">wxID_ANY</property>
+ <property name="label">Paper Options</property>
+- <property name="minimum_size"></property>
++ <property name="minimum_size">-1,-1</property>
+ <property name="name">m_paperOptionsSizer</property>
+ <property name="orient">wxVERTICAL</property>
++ <property name="parent">1</property>
+ <property name="permission">protected</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxRadioBox" expanded="1">
++ <object class="wxRadioBox" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -495,7 +496,7 @@
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+- <property name="choices">"Schematic size" "Force size A4" "Force size A"</property>
++ <property name="choices">"Schematic Size" "A4" "A"</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+@@ -517,7 +518,7 @@
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+- <property name="minimum_size"></property>
++ <property name="minimum_size">140,-1</property>
+ <property name="moveable">1</property>
+ <property name="name">m_PaperSizeOption</property>
+ <property name="pane_border">1</property>
+@@ -527,7 +528,7 @@
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+- <property name="selection">1</property>
++ <property name="selection">0</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxRA_SPECIFY_COLS</property>
+@@ -567,23 +568,24 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxStaticBoxSizer" expanded="1">
++ <object class="wxStaticBoxSizer" expanded="0">
+ <property name="id">wxID_ANY</property>
+ <property name="label">HPGL Options</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_paperHPGLSizer</property>
+ <property name="orient">wxVERTICAL</property>
++ <property name="parent">1</property>
+ <property name="permission">protected</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticText" expanded="1">
++ <object class="wxStaticText" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -662,11 +664,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxChoice" expanded="1">
++ <object class="wxChoice" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -680,7 +682,7 @@
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+- <property name="choices">"Schematic size" "Page size A4" "Page size A3" "Page size A2" "Page size A1" "Page size A0" "Page size A" "Page size B" "Page size C" "Page size D" "Page size E"</property>
++ <property name="choices">"Schematic Size" "A4" "A3" "A2" "A1" "A0" "A" "B" "C" "D"</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+@@ -750,11 +752,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+- <object class="wxRadioBox" expanded="1">
++ <object class="wxRadioBox" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -768,7 +770,7 @@
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+- <property name="choices">"Bottom left corner" "Center of the page"</property>
++ <property name="choices">"Bottom left" "Center on page"</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+@@ -783,7 +785,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Origin</property>
++ <property name="label">Allign:</property>
+ <property name="majorDimension">1</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+@@ -840,11 +842,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticText" expanded="1">
++ <object class="wxStaticText" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -872,7 +874,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Pen width</property>
++ <property name="label">Pen Width:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -923,11 +925,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxTextCtrl" expanded="1">
++ <object class="wxTextCtrl" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1018,23 +1020,24 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticBoxSizer" expanded="1">
++ <object class="wxStaticBoxSizer" expanded="0">
+ <property name="id">wxID_ANY</property>
+ <property name="label">General Options</property>
+ <property name="minimum_size"></property>
+ <property name="name">sbSizerPlotFormat</property>
+ <property name="orient">wxVERTICAL</property>
++ <property name="parent">1</property>
+ <property name="permission">none</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticText" expanded="1">
++ <object class="wxStaticText" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1062,13 +1065,13 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Default line thickness</property>
++ <property name="label">Line Thickness:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+- <property name="minimum_size"></property>
++ <property name="minimum_size">190,-1</property>
+ <property name="moveable">1</property>
+ <property name="name">m_defaultLineWidthTitle</property>
+ <property name="pane_border">1</property>
+@@ -1113,11 +1116,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxTextCtrl" expanded="1">
++ <object class="wxTextCtrl" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1204,11 +1207,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxRadioBox" expanded="1">
++ <object class="wxRadioBox" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1237,7 +1240,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Mode</property>
++ <property name="label">Output Mode:</property>
+ <property name="majorDimension">1</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+@@ -1254,13 +1257,13 @@
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+- <property name="selection">1</property>
++ <property name="selection">0</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxRA_SPECIFY_COLS</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+- <property name="tooltip">Choose if you want to draw the sheet like it appears on screen,
or in black and white mode, better to print it when using black and white printers</property>
++ <property name="tooltip">Plot in black and white mode, better when using black and white printers</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+@@ -1294,11 +1297,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+- <object class="wxCheckBox" expanded="1">
++ <object class="wxCheckBox" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1348,7 +1351,7 @@
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+- <property name="tooltip">Print (or not) the Frame references.</property>
++ <property name="tooltip">Print frame references</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+@@ -1384,20 +1387,20 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="1">
++ <object class="wxBoxSizer" expanded="0">
+ <property name="minimum_size"></property>
+ <property name="name">m_ButtonsSizer</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="permission">protected</property>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxButton" expanded="1">
++ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1481,11 +1484,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxButton" expanded="1">
++ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1569,11 +1572,11 @@
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxButton" expanded="1">
++ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+@@ -1670,11 +1673,11 @@
+ <property name="name">bSizerMsgPanel</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="permission">none</property>
+- <object class="sizeritem" expanded="1">
++ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND | wxALL</property>
+ <property name="proportion">1</property>
+- <object class="wxPanel" expanded="1">
++ <object class="wxPanel" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+diff --git a/eeschema/dialogs/dialog_plot_schematic_base.h b/eeschema/dialogs/dialog_plot_schematic_base.h
+index a0b28df..e44fce8 100644
+--- a/eeschema/dialogs/dialog_plot_schematic_base.h
++++ b/eeschema/dialogs/dialog_plot_schematic_base.h
+@@ -1,5 +1,5 @@
+ ///////////////////////////////////////////////////////////////////////////
+-// C++ code generated with wxFormBuilder (version Mar 28 2015)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+@@ -82,7 +82,7 @@ class DIALOG_PLOT_SCHEMATIC_BASE : public DIALOG_SHIM
+
+ public:
+
+- DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
++ DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot Schematic Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PLOT_SCHEMATIC_BASE();
+
+ };
+diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp
+index c65fc8c..4ab7e27 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 21 2016)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+@@ -23,7 +23,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bSizerPlotFmt;
+ bSizerPlotFmt = new wxBoxSizer( wxVERTICAL );
+
+- m_staticTextPlotFmt = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticTextPlotFmt = new wxStaticText( this, wxID_ANY, _("Plot Format:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextPlotFmt->Wrap( -1 );
+ bSizerPlotFmt->Add( m_staticTextPlotFmt, 0, wxTOP, 5 );
+
+@@ -39,7 +39,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bSizerOutDir;
+ bSizerOutDir = new wxBoxSizer( wxVERTICAL );
+
+- m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output Directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextDir->Wrap( -1 );
+ bSizerOutDir->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
+
+@@ -47,11 +47,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ bSizer29 = new wxBoxSizer( wxHORIZONTAL );
+
+ m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+- m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );
++ m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location") );
+
+ bSizer29->Add( m_outputDirectoryName, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+- m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
++ m_browseButton = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+
+@@ -66,7 +66,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bmiddleSizer;
+ bmiddleSizer = new wxBoxSizer( wxHORIZONTAL );
+
+- m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
++ m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Included Layers:") ), wxHORIZONTAL );
+
+ wxArrayString m_layerCheckListBoxChoices;
+ m_layerCheckListBox = new wxCheckListBox( m_LayersSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );
+@@ -78,7 +78,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, _("Options") ), wxVERTICAL );
++ sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
+
+ wxBoxSizer* bSizer192;
+ bSizer192 = new wxBoxSizer( wxHORIZONTAL );
+@@ -146,7 +146,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bSizer14;
+ bSizer14 = new wxBoxSizer( wxVERTICAL );
+
+- m_staticText11 = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticText11 = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Drill Marks:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText11->Wrap( -1 );
+ bSizer14->Add( m_staticText11, 0, wxRIGHT|wxLEFT, 5 );
+
+@@ -166,7 +166,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ m_scaleOpt->SetSelection( 1 );
+ bSizer14->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );
+
+- m_staticText13 = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticText13 = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot Mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText13->Wrap( -1 );
+ bSizer14->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+@@ -176,7 +176,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, _("Default 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.") );
+
+@@ -197,14 +197,14 @@ 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, _("Current solder mask settings:") ), wxVERTICAL );
++ sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder Stop Mask Options:") ), wxVERTICAL );
+
+ wxFlexGridSizer* fgSizerSoldMaskOpts;
+ fgSizerSoldMaskOpts = new wxFlexGridSizer( 2, 2, 0, 0 );
+ fgSizerSoldMaskOpts->SetFlexibleDirection( wxBOTH );
+ fgSizerSoldMaskOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+- m_SolderMaskMarginLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_SolderMaskMarginLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SolderMaskMarginLabel->Wrap( -1 );
+ m_SolderMaskMarginLabel->SetToolTip( _("Margin between pads and solder mask") );
+
+@@ -214,7 +214,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ m_SolderMaskMarginCurrValue->Wrap( -1 );
+ fgSizerSoldMaskOpts->Add( m_SolderMaskMarginCurrValue, 0, wxALL, 5 );
+
+- m_solderMaskMinWidthLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Solder mask min width:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_solderMaskMinWidthLabel = new wxStaticText( sbSizerSoldMaskLayerOpt->GetStaticBox(), wxID_ANY, _("Minimum Width:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_solderMaskMinWidthLabel->Wrap( -1 );
+ m_solderMaskMinWidthLabel->SetToolTip( _("Minimum distance between 2 pad areas.\nTwo pad areas nearer than this value will be merged during plotting") );
+
+@@ -230,7 +230,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 );
+@@ -258,23 +258,23 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+
+ m_GerberOptionsSizer->Add( bSizerGbrOpt, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+- wxString m_rbGerberFormatChoices[] = { _("4.5 (unit mm)"), _("4.6 (unit mm)") };
++ wxString m_rbGerberFormatChoices[] = { _("4.5, unit mm"), _("4.6, unit mm") };
+ int m_rbGerberFormatNChoices = sizeof( m_rbGerberFormatChoices ) / sizeof( wxString );
+- m_rbGerberFormat = new wxRadioBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_rbGerberFormatNChoices, m_rbGerberFormatChoices, 1, wxRA_SPECIFY_COLS );
+- m_rbGerberFormat->SetSelection( 0 );
+- m_rbGerberFormat->SetToolTip( _("Resolution of coordinates in Gerber files.\nUse the higher value if possible.") );
++ m_rbGerberFormat = new wxRadioBox( m_GerberOptionsSizer->GetStaticBox(), wxID_ANY, _("Coordinate Format:"), wxDefaultPosition, wxDefaultSize, m_rbGerberFormatNChoices, m_rbGerberFormatChoices, 1, wxRA_SPECIFY_COLS );
++ m_rbGerberFormat->SetSelection( 1 );
++ m_rbGerberFormat->SetToolTip( _("Resolution of coordinates in Gerber files.\nUse the higher value if possible") );
+
+ m_GerberOptionsSizer->Add( m_rbGerberFormat, 1, wxEXPAND|wxALL, 5 );
+
+
+ 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* bSizer22;
+ bSizer22 = 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 );
+ bSizer22->Add( m_textPenSize, 0, wxRIGHT|wxLEFT, 5 );
+
+@@ -287,7 +287,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 );
+@@ -295,7 +295,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bSizer18;
+ bSizer18 = new wxBoxSizer( wxVERTICAL );
+
+- m_staticText7 = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticText7 = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("X Scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText7->Wrap( -1 );
+ bSizer18->Add( m_staticText7, 0, wxRIGHT|wxLEFT, 5 );
+
+@@ -310,7 +310,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
+ wxBoxSizer* bSizer19;
+ bSizer19 = new wxBoxSizer( wxVERTICAL );
+
+- m_staticText8 = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
++ m_staticText8 = new wxStaticText( m_PSOptionsSizer->GetStaticBox(), wxID_ANY, _("Y Scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText8->Wrap( -1 );
+ bSizer19->Add( m_staticText8, 0, wxRIGHT|wxLEFT, 5 );
+
+@@ -325,7 +325,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 );
+
+diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
+index 0902b5c..72699b3 100644
+--- a/pcbnew/dialogs/dialog_plot_base.fbp
++++ b/pcbnew/dialogs/dialog_plot_base.fbp
+@@ -47,7 +47,7 @@
+ <property name="size">733,809</property>
+ <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
+ <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
+- <property name="title">Plot</property>
++ <property name="title">Plot Preferences</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+@@ -88,7 +88,7 @@
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">m_MainSizer</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -143,7 +143,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Plot format:</property>
++ <property name="label">Plot Format:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -325,7 +325,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Output directory:</property>
++ <property name="label">Output Directory:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -438,7 +438,7 @@
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+- <property name="tooltip">Target directory for plot files. Can be absolute or relative to the board file location.</property>
++ <property name="tooltip">Target directory for plot files. Can be absolute or relative to the board file location</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+@@ -509,7 +509,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Browse...</property>
++ <property name="label">Browse</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -570,22 +570,22 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bmiddleSizer</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">3</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxStaticBoxSizer" expanded="0">
++ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Layers</property>
++ <property name="label">Included Layers:</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_LayersSizer</property>
+ <property name="orient">wxHORIZONTAL</property>
+@@ -683,11 +683,11 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag"></property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">m_PlotOptionsSizer</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -698,7 +698,7 @@
+ <property name="proportion">0</property>
+ <object class="wxStaticBoxSizer" expanded="0">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Options</property>
++ <property name="label">Options:</property>
+ <property name="minimum_size"></property>
+ <property name="name">sbOptionsSizer</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -1822,7 +1822,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Drill marks:</property>
++ <property name="label">Drill Marks:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -2164,7 +2164,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Plot mode:</property>
++ <property name="label">Plot Mode:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -2335,7 +2335,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Default line width</property>
++ <property name="label">Line Width:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -2483,24 +2483,24 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxStaticBoxSizer" expanded="0">
++ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Current solder mask settings:</property>
++ <property name="label">Solder Stop Mask Options:</property>
+ <property name="minimum_size"></property>
+ <property name="name">sbSizerSoldMaskLayerOpt</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="parent">1</property>
+ <property name="permission">none</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxFlexGridSizer" expanded="0">
++ <object class="wxFlexGridSizer" expanded="1">
+ <property name="cols">2</property>
+ <property name="flexible_direction">wxBOTH</property>
+ <property name="growablecols"></property>
+@@ -2544,7 +2544,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Solder mask clearance:</property>
++ <property name="label">Clearance:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -2710,7 +2710,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Solder mask min width:</property>
++ <property name="label">Minimum Width:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -2848,24 +2848,24 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">3</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticBoxSizer" expanded="0">
++ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Gerber Options</property>
++ <property name="label">Gerber Options:</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_GerberOptionsSizer</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="parent">1</property>
+ <property name="permission">protected</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizerGbrOpt</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -3242,7 +3242,7 @@
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+- <property name="choices">"4.5 (unit mm)" "4.6 (unit mm)"</property>
++ <property name="choices">"4.5, unit mm" "4.6, unit mm"</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+@@ -3257,7 +3257,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Format</property>
++ <property name="label">Coordinate Format:</property>
+ <property name="majorDimension">1</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+@@ -3274,13 +3274,13 @@
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+- <property name="selection">0</property>
++ <property name="selection">1</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxRA_SPECIFY_COLS</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+- <property name="tooltip">Resolution of coordinates in Gerber files.
Use the higher value if possible.</property>
++ <property name="tooltip">Resolution of coordinates in Gerber files.
Use the higher value if possible</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+@@ -3322,7 +3322,7 @@
+ <property name="proportion">0</property>
+ <object class="wxStaticBoxSizer" expanded="0">
+ <property name="id">wxID_ANY</property>
+- <property name="label">HPGL Options</property>
++ <property name="label">HPGL Options:</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_HPGLOptionsSizer</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -3370,7 +3370,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Pen size</property>
++ <property name="label">Pen Size:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -3516,33 +3516,33 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">3</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+- <object class="wxStaticBoxSizer" expanded="0">
++ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+- <property name="label">Postscript Options</property>
++ <property name="label">Postscript Options:</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_PSOptionsSizer</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="parent">1</property>
+ <property name="permission">protected</property>
+ <event name="OnUpdateUI"></event>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer17</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer18</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -3579,7 +3579,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">X scale:</property>
++ <property name="label">X Scale:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -3723,11 +3723,11 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer19</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -3764,7 +3764,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Y scale:</property>
++ <property name="label">Y Scale:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -3908,11 +3908,11 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer191</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -3949,7 +3949,7 @@
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+- <property name="label">Width correction</property>
++ <property name="label">Width Correction:</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+@@ -4189,11 +4189,11 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">sbSizerMsg</property>
+ <property name="orient">wxVERTICAL</property>
+@@ -4280,11 +4280,11 @@
+ </object>
+ </object>
+ </object>
+- <object class="sizeritem" expanded="0">
++ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_RIGHT|wxRIGHT|wxLEFT</property>
+ <property name="proportion">0</property>
+- <object class="wxBoxSizer" expanded="0">
++ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizerButtons</property>
+ <property name="orient">wxHORIZONTAL</property>
+diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h
+index 7e7c407..18f3bee 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 21 2016)
++// C++ code generated with wxFormBuilder (version Feb 16 2016)
+ // http://www.wxformbuilder.org/
+ //
+ // PLEASE DO "NOT" EDIT THIS FILE!
+@@ -134,7 +134,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( 733,809 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
++ DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,809 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_PLOT_BASE();
+
+ void DIALOG_PLOT_BASEOnContextMenu( wxMouseEvent &event )
+--
+2.7.4
+
diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
index 72699b3..2199c4a 100644
--- a/pcbnew/dialogs/dialog_plot_base.fbp
+++ b/pcbnew/dialogs/dialog_plot_base.fbp
@@ -47,7 +47,7 @@
<property name="size">733,809</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
- <property name="title">Plot Preferences</property>
+ <property name="title">Plot</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
diff --git a/pcbnew/dialogs/dialog_plot_base.h b/pcbnew/dialogs/dialog_plot_base.h
index 18f3bee..91ad9c2 100644
--- a/pcbnew/dialogs/dialog_plot_base.h
+++ b/pcbnew/dialogs/dialog_plot_base.h
@@ -134,7 +134,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM
public:
- DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,809 ), 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( 733,809 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_PLOT_BASE();
void DIALOG_PLOT_BASEOnContextMenu( wxMouseEvent &event )
--
2.7.4
Follow ups
