Remove g_PcbPlotOptions, use wxformbuilder to subclass DIALOG_SHIM on several dialogs

.bzrignore

@@ -18,7 +18,7 @@ Documentation/doxygen
 *.cmake
 *.bak
 common/pcb_plot_params_keywords.cpp
-common/pcb_plot_params_lexer.h
+include/pcb_plot_params_lexer.h
 pcbnew/specctra_keywords.cpp
 pcbnew/specctra_lexer.h
 new/html

CMakeLists.txt

@@ -254,7 +254,6 @@ set(INC_AFTER
 ############
 # Binaries #
 ############
-add_subdirectory(3d-viewer)
 
 if( USE_PNG_BITMAPS )
     add_subdirectory(bitmaps_png)
@@ -262,8 +261,8 @@ else()
     add_subdirectory(bitmaps_xpm)
 endif()
 
-
 add_subdirectory(common)
+add_subdirectory(3d-viewer)
 add_subdirectory(cvpcb)
 add_subdirectory(eeschema)
 add_subdirectory(gerbview)

common/CMakeLists.txt

@@ -113,6 +113,7 @@ set(PCB_COMMON_SRCS
     ../pcbnew/classpcb.cpp
     ../pcbnew/collectors.cpp
     ../pcbnew/sel_layer.cpp
+    ../pcbnew/pcb_plot_params.cpp
     pcb_plot_params_keywords.cpp
     dialogs/dialog_page_settings.cpp
 )
@@ -142,7 +143,7 @@ make_lexer(
 # auto-generate pcb_plot_params_lexer.h and pcb_plot_params_keywords.cpp
 make_lexer(
     ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params.keywords
-    ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_lexer.h
+    ${PROJECT_SOURCE_DIR}/include/pcb_plot_params_lexer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_keywords.cpp
     PCBPLOTPARAMS_T
     )

common/dialogs/dialog_page_settings.cpp

@@ -438,9 +438,9 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ),
 
             PAGE_INFO::SetCustomWidthMils( m_layout_size.x );
             PAGE_INFO::SetCustomHeightMils( m_layout_size.y );
+
             m_pageInfo.SetWidthMils( m_layout_size.x );
             m_pageInfo.SetHeightMils( m_layout_size.y );
-            m_pageInfo.SetPortrait( m_layout_size.x < m_layout_size.y );
         }
     }
     else

eeschema/general.h

@@ -139,22 +139,21 @@ extern const wxString g_SchematicBackupFileExtension;
 
 extern LayerStruct    g_LayerDescr;
 
-extern bool           g_EditPinByPinIsOn;   /* True to prevent displacing
-                                             * pins, when they are at the
-                                             * same position. */
-
-extern int            g_DrawDefaultLineThickness; /* Default line (in Eeschema
-                                                   * units) thickness used to
-                                                   * draw/plot items having a
-                                                   * default thickness line
-                                                   * value (i.e. = 0 ).
-                                                   * 0 = single pixel line width
-                                                   */
-
-// Color to draw selected items
+/// True to prevent displacing pins, when they are at the same position.
+extern bool           g_EditPinByPinIsOn;
+
+/**
+ * Default line (in Eeschema units) thickness used to draw/plot items having a
+ * default thickness line value (i.e. = 0 ).
+ * 0 = single pixel line width.
+ */
+extern int            g_DrawDefaultLineThickness;
+
+
+/// Color to draw selected items
 extern int g_ItemSelectetColor;
 
-// Color to draw items flagged invisible, in libedit (they are invisible in Eeschema
+/// Color to draw items flagged invisible, in libedit (they are invisible in Eeschema
 extern int g_InvisibleItemColor;
 
 /* Global Variables */

include/wxBasePcbFrame.h

@@ -28,8 +28,8 @@
  * @brief Classes used in Pcbnew, CvPcb and GerbView.
  */
 
-#ifndef  WX_BASE_PCB_FRAME_H
-#define  WX_BASE_PCB_FRAME_H
+#ifndef  WX_BASE_PCB_FRAME_H_
+#define  WX_BASE_PCB_FRAME_H_
 
 
 #include <vector>
@@ -59,6 +59,8 @@ class GENERAL_COLLECTOR;
 class GENERAL_COLLECTORS_GUIDE;
 class BOARD_DESIGN_SETTINGS;
 class ZONE_SETTINGS;
+class PCB_PLOT_PARAMS;
+
 
 /**
  * class PCB_BASE_FRAME
@@ -138,6 +140,14 @@ public:
     const ZONE_SETTINGS& GetZoneSettings() const;
     void SetZoneSettings( const ZONE_SETTINGS& aSettings );
 
+    /**
+     * Function GetPlotSettings
+     * returns the PCB_PLOT_PARAMS for the BOARD owned by this frame.
+     * Overloaded in FOOTPRINT_EDIT_FRAME.
+     */
+    virtual const PCB_PLOT_PARAMS& GetPlotSettings() const;
+    virtual void SetPlotSettings( const PCB_PLOT_PARAMS& aSettings );
+
     /**
      * Function SetBoard
      * sets the m_Pcb member in such as way as to ensure deleting any previous
@@ -674,4 +684,4 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-#endif  /* WX_BASE_PCB_FRAME_H */
+#endif  // WX_BASE_PCB_FRAME_H_

pcbnew/CMakeLists.txt

@@ -161,7 +161,6 @@ set(PCBNEW_SRCS
     netlist_reader_kicad.cpp
     onleftclick.cpp
     onrightclick.cpp
-    pcb_plot_params.cpp
     pcbnew.cpp
     pcbnew_config.cpp
     pcbplot.cpp

pcbnew/basepcbframe.cpp

@@ -205,6 +205,20 @@ void PCB_BASE_FRAME::SetZoneSettings( const ZONE_SETTINGS& aSettings )
 }
 
 
+const PCB_PLOT_PARAMS& PCB_BASE_FRAME::GetPlotSettings() const
+{
+    wxASSERT( m_Pcb );
+    return m_Pcb->GetPlotOptions();
+}
+
+
+void PCB_BASE_FRAME::SetPlotSettings( const PCB_PLOT_PARAMS& aSettings )
+{
+    wxASSERT( m_Pcb );
+    m_Pcb->SetPlotOptions( aSettings );
+}
+
+
 EDA_RECT PCB_BASE_FRAME::GetBoardBoundingBox( bool aBoardEdgesOnly ) const
 {
     wxASSERT( m_Pcb );

pcbnew/class_board.h

@@ -17,7 +17,7 @@
 #include <common.h>                         // PAGE_INFO
 #include <class_title_block.h>
 #include <class_zone_settings.h>
-
+#include <pcb_plot_params.h>
 
 class PCB_BASE_FRAME;
 class PCB_EDIT_FRAME;
@@ -180,6 +180,7 @@ private:
     COLORS_DESIGN_SETTINGS* m_colorsSettings;
     PAGE_INFO               m_paper;
     TITLE_BLOCK             m_titles;               ///< text in lower right of screen and plots
+    PCB_PLOT_PARAMS         m_plotOptions;
 
     /// Position of the origin axis, which is used in exports mostly
     wxPoint             m_originAxisPosition;
@@ -543,6 +544,9 @@ public:
     const PAGE_INFO& GetPageSettings() const                { return m_paper; }
     void SetPageSettings( const PAGE_INFO& aPageSettings )  { m_paper = aPageSettings; }
 
+    const PCB_PLOT_PARAMS& GetPlotOptions() const           { return m_plotOptions; }
+    void SetPlotOptions( const PCB_PLOT_PARAMS& aOptions )  { m_plotOptions = aOptions; }
+
     const wxPoint& GetOriginAxisPosition() const            { return m_originAxisPosition; }
     void SetOriginAxisPosition( const wxPoint& aPosition )  { m_originAxisPosition = aPosition; }
 

pcbnew/class_module.h

@@ -51,7 +51,7 @@ class BOARD;
  * Enum MODULE_ATTR_T
  * is the set of attributes allowed within a MODULE, using MODULE::SetAttributes()
  * and MODULE::GetAttributes().  These are to be ORed together when calling
- * MODULE::SetAttrbute()
+ * MODULE::SetAttributes()
  */
 enum MODULE_ATTR_T
 {

pcbnew/dialogs/dialog_SVG_print.cpp

@@ -37,8 +37,6 @@
 #define WIDTH_MAX_VALUE 500
 #define WIDTH_MIN_VALUE 1
 
-extern int g_DrawDefaultLineThickness;
-
 // Local variables:
 static PRINT_PARAMETERS  s_Parameters;
 static long s_SelectedLayers    = LAYER_BACK | LAYER_FRONT |

pcbnew/dialogs/dialog_gen_module_position_file_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_gen_module_position_file_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
-	m_MainSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bUpperSizer;
-	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bDirSizer;
-	bDirSizer = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDir->Wrap( -1 );
-	bDirSizer->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizerdirBrowse;
-	bSizerdirBrowse = 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->SetMinSize( wxSize( 350,-1 ) );
-	
-	bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerdirBrowse->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-	
-	bDirSizer->Add( bSizerdirBrowse, 1, wxEXPAND, 5 );
-	
-	bUpperSizer->Add( bDirSizer, 1, 0, 5 );
-	
-	m_MainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizerOptions;
-	bSizerOptions = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxString m_radioBoxUnitsChoices[] = { _("Inches"), _("mm") };
-	int m_radioBoxUnitsNChoices = sizeof( m_radioBoxUnitsChoices ) / sizeof( wxString );
-	m_radioBoxUnits = new wxRadioBox( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, m_radioBoxUnitsNChoices, m_radioBoxUnitsChoices, 1, wxRA_SPECIFY_COLS );
-	m_radioBoxUnits->SetSelection( 0 );
-	bSizerOptions->Add( m_radioBoxUnits, 1, wxALL, 5 );
-	
-	wxString m_radioBoxFilesCountChoices[] = { _("One file per side"), _("One file for board") };
-	int m_radioBoxFilesCountNChoices = sizeof( m_radioBoxFilesCountChoices ) / sizeof( wxString );
-	m_radioBoxFilesCount = new wxRadioBox( this, wxID_ANY, _("Files:"), wxDefaultPosition, wxDefaultSize, m_radioBoxFilesCountNChoices, m_radioBoxFilesCountChoices, 1, wxRA_SPECIFY_COLS );
-	m_radioBoxFilesCount->SetSelection( 0 );
-	m_radioBoxFilesCount->SetToolTip( _("Creates 2 files: one for each board side or\nCreates only one file containing all footprints to place\n") );
-	
-	bSizerOptions->Add( m_radioBoxFilesCount, 1, wxALL, 5 );
-	
-	wxString m_radioBoxForceSmdChoices[] = { _("With INSERT attribute set"), _("Force INSERT attribute for all SMD footprints") };
-	int m_radioBoxForceSmdNChoices = sizeof( m_radioBoxForceSmdChoices ) / sizeof( wxString );
-	m_radioBoxForceSmd = new wxRadioBox( this, wxID_ANY, _("Footprints:"), wxDefaultPosition, wxDefaultSize, m_radioBoxForceSmdNChoices, m_radioBoxForceSmdChoices, 1, wxRA_SPECIFY_COLS );
-	m_radioBoxForceSmd->SetSelection( 0 );
-	m_radioBoxForceSmd->SetToolTip( _("Only footprints with option INSERT are listed in placement file.\nThis option can force this option for all footprints having only SMD pads.\nWarning: this options will modify the board.") );
-	
-	bSizerOptions->Add( m_radioBoxForceSmd, 0, wxALL, 5 );
-	
-	m_MainSizer->Add( bSizerOptions, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticBoxSizer* sbSizerMsg;
-	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
-	
-	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_messagesBox->SetMinSize( wxSize( -1,70 ) );
-	
-	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );
-	
-	m_MainSizer->Add( sbSizerMsg, 1, wxEXPAND, 5 );
-	
-	m_sdbSizerButtons = new wxStdDialogButtonSizer();
-	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
-	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
-	m_sdbSizerButtons->Realize();
-	m_MainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	this->SetSizer( m_MainSizer );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnClose ) );
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnInitDialog ) );
-	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
-	m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnCancelButton ), NULL, this );
-	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this );
-}
-
-DIALOG_GEN_MODULE_POSITION_BASE::~DIALOG_GEN_MODULE_POSITION_BASE()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnClose ) );
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnInitDialog ) );
-	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
-	m_sdbSizerButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnCancelButton ), NULL, this );
-	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_gen_module_position_file_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	
+	m_MainSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bUpperSizer;
+	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bDirSizer;
+	bDirSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDir->Wrap( -1 );
+	bDirSizer->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizerdirBrowse;
+	bSizerdirBrowse = 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->SetMinSize( wxSize( 350,-1 ) );
+	
+	bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerdirBrowse->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+	
+	
+	bDirSizer->Add( bSizerdirBrowse, 1, wxEXPAND, 5 );
+	
+	
+	bUpperSizer->Add( bDirSizer, 1, 0, 5 );
+	
+	
+	m_MainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerOptions;
+	bSizerOptions = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxString m_radioBoxUnitsChoices[] = { _("Inches"), _("mm") };
+	int m_radioBoxUnitsNChoices = sizeof( m_radioBoxUnitsChoices ) / sizeof( wxString );
+	m_radioBoxUnits = new wxRadioBox( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, m_radioBoxUnitsNChoices, m_radioBoxUnitsChoices, 1, wxRA_SPECIFY_COLS );
+	m_radioBoxUnits->SetSelection( 0 );
+	bSizerOptions->Add( m_radioBoxUnits, 1, wxALL, 5 );
+	
+	wxString m_radioBoxFilesCountChoices[] = { _("One file per side"), _("One file for board") };
+	int m_radioBoxFilesCountNChoices = sizeof( m_radioBoxFilesCountChoices ) / sizeof( wxString );
+	m_radioBoxFilesCount = new wxRadioBox( this, wxID_ANY, _("Files:"), wxDefaultPosition, wxDefaultSize, m_radioBoxFilesCountNChoices, m_radioBoxFilesCountChoices, 1, wxRA_SPECIFY_COLS );
+	m_radioBoxFilesCount->SetSelection( 0 );
+	m_radioBoxFilesCount->SetToolTip( _("Creates 2 files: one for each board side or\nCreates only one file containing all footprints to place\n") );
+	
+	bSizerOptions->Add( m_radioBoxFilesCount, 1, wxALL, 5 );
+	
+	wxString m_radioBoxForceSmdChoices[] = { _("With INSERT attribute set"), _("Force INSERT attribute for all SMD footprints") };
+	int m_radioBoxForceSmdNChoices = sizeof( m_radioBoxForceSmdChoices ) / sizeof( wxString );
+	m_radioBoxForceSmd = new wxRadioBox( this, wxID_ANY, _("Footprints Selection:"), wxDefaultPosition, wxDefaultSize, m_radioBoxForceSmdNChoices, m_radioBoxForceSmdChoices, 1, wxRA_SPECIFY_COLS );
+	m_radioBoxForceSmd->SetSelection( 0 );
+	m_radioBoxForceSmd->SetToolTip( _("Only footprints with option INSERT are listed in placement file.\nThis option can force this option for all footprints having only SMD pads.\nWarning: this options will modify the board.") );
+	
+	bSizerOptions->Add( m_radioBoxForceSmd, 0, wxALL, 5 );
+	
+	
+	m_MainSizer->Add( bSizerOptions, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxStaticBoxSizer* sbSizerMsg;
+	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
+	
+	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+	m_messagesBox->SetMinSize( wxSize( -1,70 ) );
+	
+	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );
+	
+	
+	m_MainSizer->Add( sbSizerMsg, 1, wxEXPAND, 5 );
+	
+	m_sdbSizerButtons = new wxStdDialogButtonSizer();
+	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
+	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
+	m_sdbSizerButtons->Realize();
+	
+	m_MainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	this->SetSizer( m_MainSizer );
+	this->Layout();
+	m_MainSizer->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnClose ) );
+	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnInitDialog ) );
+	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+	m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnCancelButton ), NULL, this );
+	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this );
+}
+
+DIALOG_GEN_MODULE_POSITION_BASE::~DIALOG_GEN_MODULE_POSITION_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnClose ) );
+	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnInitDialog ) );
+	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+	m_sdbSizerButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnCancelButton ), NULL, this );
+	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_gen_module_position_file_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
-#define __DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/radiobox.h>
-#include <wx/statbox.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_GEN_MODULE_POSITION_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_GEN_MODULE_POSITION_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxBoxSizer* m_MainSizer;
-		wxStaticText* m_staticTextDir;
-		wxTextCtrl* m_outputDirectoryName;
-		wxButton* m_browseButton;
-		wxRadioBox* m_radioBoxUnits;
-		wxRadioBox* m_radioBoxFilesCount;
-		wxRadioBox* m_radioBoxForceSmd;
-		wxTextCtrl* m_messagesBox;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancelButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOKButton( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Position Files:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 501,340 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_GEN_MODULE_POSITION_BASE();
-	
-};
-
-#endif //__DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
+#define __DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/radiobox.h>
+#include <wx/statbox.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_GEN_MODULE_POSITION_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_GEN_MODULE_POSITION_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxBoxSizer* m_MainSizer;
+		wxStaticText* m_staticTextDir;
+		wxTextCtrl* m_outputDirectoryName;
+		wxButton* m_browseButton;
+		wxRadioBox* m_radioBoxUnits;
+		wxRadioBox* m_radioBoxFilesCount;
+		wxRadioBox* m_radioBoxForceSmd;
+		wxTextCtrl* m_messagesBox;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButton( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Position Files:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_GEN_MODULE_POSITION_BASE();
+	
+};
+
+#endif //__DIALOG_GEN_MODULE_POSITION_FILE_BASE_H__

pcbnew/dialogs/dialog_gendrill.cpp

@@ -55,6 +55,7 @@ static DRILL_PRECISION precisionListForInches[] =
 {
     DRILL_PRECISION( 2, 3 ), DRILL_PRECISION( 2, 4 )
 };
+
 static DRILL_PRECISION precisionListForMetric[] =
 {
     DRILL_PRECISION( 3, 2 ), DRILL_PRECISION( 3, 3 )
@@ -64,12 +65,12 @@ static DRILL_PRECISION precisionListForMetric[] =
 DIALOG_GENDRILL::DIALOG_GENDRILL( PCB_EDIT_FRAME* parent ) :
     DIALOG_GENDRILL_BASE( parent )
 {
-    m_Parent = parent;
+    m_parent = parent;
+    m_board  = parent->GetBoard();
 
     SetReturnCode( 1 );
     initDialog();
     GetSizer()->SetSizeHints( this );
-    Centre();
 }
 
 
@@ -83,9 +84,6 @@ int DIALOG_GENDRILL:: m_PrecisionFormat = 1;
 bool DIALOG_GENDRILL::m_createRpt = false;
 int DIALOG_GENDRILL::m_createMap = 0;
 
-/*!
- * DIALOG_GENDRILL destructor
- */
 
 DIALOG_GENDRILL::~DIALOG_GENDRILL()
 {
@@ -93,13 +91,8 @@ DIALOG_GENDRILL::~DIALOG_GENDRILL()
 }
 
 
-/*!
- * Member initialisation
- */
-
 void DIALOG_GENDRILL::initDialog()
 {
-    SetFocus(); // Under wxGTK: mandatory to close dialog by the ESC key
     wxConfig* Config = wxGetApp().GetSettings();
 
     if( Config )
@@ -116,11 +109,10 @@ void DIALOG_GENDRILL::initDialog()
 }
 
 
-/* some param values initialization before display dialog window
- */
-void DIALOG_GENDRILL::InitDisplayParams( void )
+void DIALOG_GENDRILL::InitDisplayParams()
 {
     wxString msg;
+    const PCB_PLOT_PARAMS& plot_opts = m_board->GetPlotOptions();
 
     m_Choice_Unit->SetSelection( m_UnitDrillIsInch ? 1 : 0 );
     m_Choice_Precision->SetSelection( m_PrecisionFormat );
@@ -146,11 +138,11 @@ void DIALOG_GENDRILL::InitDisplayParams( void )
     m_MicroViaDrillValue->SetLabel( _( "Use Netclasses values" ) );
 
     msg.Empty();
-    msg << g_PcbPlotOptions.m_HPGLPenNum;
+    msg << plot_opts.m_HPGLPenNum;
     m_PenNum->SetValue( msg );
 
     msg.Empty();
-    msg << g_PcbPlotOptions.m_HPGLPenSpeed;
+    msg << plot_opts.m_HPGLPenSpeed;
     m_PenSpeed->SetValue( msg );
 
     // See if we have some buried vias or/and microvias, and display
@@ -159,7 +151,7 @@ void DIALOG_GENDRILL::InitDisplayParams( void )
     m_microViasCount   = 0;
     m_blindOrBuriedViasCount = 0;
 
-    for( TRACK* track = m_Parent->GetBoard()->m_Track; track != NULL; track = track->Next() )
+    for( TRACK* track = m_parent->GetBoard()->m_Track; track != NULL; track = track->Next() )
     {
         if( track->Type() != PCB_VIA_T )
             continue;
@@ -178,7 +170,7 @@ void DIALOG_GENDRILL::InitDisplayParams( void )
     m_platedPadsHoleCount    = 0;
     m_notplatedPadsHoleCount = 0;
 
-    for( MODULE* module = m_Parent->GetBoard()->m_Modules; module != NULL; module = module->Next() )
+    for( MODULE* module = m_parent->GetBoard()->m_Modules;  module;  module = module->Next() )
     {
         for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() )
         {
@@ -228,39 +220,30 @@ void DIALOG_GENDRILL::InitDisplayParams( void )
 }
 
 
-// Save drill options:
 void DIALOG_GENDRILL::UpdateConfig()
 {
     SetParams();
 
-    wxConfig* Config = wxGetApp().GetSettings();
+    wxConfig* config = wxGetApp().GetSettings();
 
-    if( Config )
+    if( config )
     {
-        Config->Write( ZerosFormatKey, m_ZerosFormat );
-        Config->Write( PrecisionKey, m_PrecisionFormat );
-        Config->Write( MirrorKey, m_Mirror );
-        Config->Write( MinimalHeaderKey, m_MinimalHeader );
-        Config->Write( UnitDrillInchKey, m_UnitDrillIsInch );
-        Config->Write( DrillOriginIsAuxAxisKey, m_DrillOriginIsAuxAxis );
+        config->Write( ZerosFormatKey, m_ZerosFormat );
+        config->Write( PrecisionKey, m_PrecisionFormat );
+        config->Write( MirrorKey, m_Mirror );
+        config->Write( MinimalHeaderKey, m_MinimalHeader );
+        config->Write( UnitDrillInchKey, m_UnitDrillIsInch );
+        config->Write( DrillOriginIsAuxAxisKey, m_DrillOriginIsAuxAxis );
     }
 }
 
 
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX
- */
-
 void DIALOG_GENDRILL::OnSelDrillUnitsSelected( wxCommandEvent& event )
 {
     UpdatePrecisionOptions();
 }
 
 
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
- */
-
 void DIALOG_GENDRILL::OnOkClick( wxCommandEvent& event )
 {
     GenDrillAndReportFiles();
@@ -268,10 +251,6 @@ void DIALOG_GENDRILL::OnOkClick( wxCommandEvent& event )
 }
 
 
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
- */
-
 void DIALOG_GENDRILL::OnCancelClick( wxCommandEvent& event )
 {
     UpdateConfig();                 // Save drill options:
@@ -279,10 +258,6 @@ void DIALOG_GENDRILL::OnCancelClick( wxCommandEvent& event )
 }
 
 
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_SEL_ZEROS_FMT
- */
-
 void DIALOG_GENDRILL::OnSelZerosFmtSelected( wxCommandEvent& event )
 {
     UpdatePrecisionOptions();
@@ -311,11 +286,13 @@ void DIALOG_GENDRILL::UpdatePrecisionOptions()
 }
 
 
-void DIALOG_GENDRILL::SetParams( void )
+void DIALOG_GENDRILL::SetParams()
 {
     wxString msg;
     long     ltmp;
 
+    PCB_PLOT_PARAMS plot_opts = m_board->GetPlotOptions();
+
     m_createMap = m_Choice_Drill_Map->GetSelection();
     m_createRpt = m_Choice_Drill_Report->GetSelection();
 
@@ -329,17 +306,17 @@ void DIALOG_GENDRILL::SetParams( void )
     msg = m_PenSpeed->GetValue();
 
     if( msg.ToLong( &ltmp ) )
-        g_PcbPlotOptions.m_HPGLPenSpeed = ltmp;
+        plot_opts.m_HPGLPenSpeed = ltmp;
 
     msg = m_PenNum->GetValue();
 
     if( msg.ToLong( &ltmp ) )
-        g_PcbPlotOptions.m_HPGLPenNum = ltmp;
+        plot_opts.m_HPGLPenNum = ltmp;
 
     if( m_Choice_Drill_Offset->GetSelection() == 0 )
         m_FileDrillOffset = wxPoint( 0, 0 );
     else
-        m_FileDrillOffset = m_Parent->GetOriginAxisPosition();
+        m_FileDrillOffset = m_parent->GetOriginAxisPosition();
 
     // get precision
     int idx = m_Choice_Precision->GetSelection();
@@ -348,4 +325,6 @@ void DIALOG_GENDRILL::SetParams( void )
         m_Precision = precisionListForInches[idx];
     else
         m_Precision = precisionListForMetric[idx];
+
+    m_board->SetPlotOptions( plot_opts );
 }

pcbnew/dialogs/dialog_gendrill.h

@@ -26,14 +26,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _DIALOG_GENDRILL_H_
-#define _DIALOG_GENDRILL_H_
+#ifndef DIALOG_GENDRILL_H_
+#define DIALOG_GENDRILL_H_
 
 #include <dialog_gendrill_base.h>
 
 class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE
 {
 public:
+    DIALOG_GENDRILL( PCB_EDIT_FRAME* parent );
+    ~DIALOG_GENDRILL();
+
     static int       m_UnitDrillIsInch;
     static int       m_ZerosFormat;
     static int       m_PrecisionFormat;
@@ -44,23 +47,21 @@ public:
     DRILL_PRECISION  m_Precision;       // Selected precision for drill files
     wxPoint          m_FileDrillOffset; // Drill offset: 0,0 for absolute coordiantes, or auxialry axis origin
 
+
 private:
-    PCB_EDIT_FRAME* m_Parent;
+    PCB_EDIT_FRAME* m_parent;
+    BOARD*          m_board;
+
     int m_platedPadsHoleCount;
     int m_notplatedPadsHoleCount;
     int m_throughViasCount;
     int m_microViasCount;
     int m_blindOrBuriedViasCount;
+
     static bool m_createRpt;           // true to create a drill file report
     static int m_createMap;            // > 0 to create a map file report
 
-public:
-    DIALOG_GENDRILL( PCB_EDIT_FRAME* parent );
-    ~DIALOG_GENDRILL();
-
-private:
 
-    // Initialises member variables
     void            initDialog();
     void            InitDisplayParams( void );
 
@@ -92,4 +93,4 @@ private:
     DRILL_PRECISION GetPrecison();
 };
 
-#endif      // _DIALOG_GENDRILL_H_
+#endif      // DIALOG_GENDRILL_H_

pcbnew/dialogs/dialog_gendrill_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_gendrill_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* m_LeftBoxSizer;
-	m_LeftBoxSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_Choice_UnitChoices[] = { _("Millimeters"), _("Inches") };
-	int m_Choice_UnitNChoices = sizeof( m_Choice_UnitChoices ) / sizeof( wxString );
-	m_Choice_Unit = new wxRadioBox( this, wxID_ANY, _("Drill Units:"), wxDefaultPosition, wxDefaultSize, m_Choice_UnitNChoices, m_Choice_UnitChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Unit->SetSelection( 1 );
-	m_LeftBoxSizer->Add( m_Choice_Unit, 0, wxALL|wxEXPAND, 5 );
-	
-	wxString m_Choice_Zeros_FormatChoices[] = { _("Decimal format"), _("Suppress leading zeros"), _("Suppress trailing zeros"), _("Keep zeros") };
-	int m_Choice_Zeros_FormatNChoices = sizeof( m_Choice_Zeros_FormatChoices ) / sizeof( wxString );
-	m_Choice_Zeros_Format = new wxRadioBox( this, wxID_ANY, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatNChoices, m_Choice_Zeros_FormatChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Zeros_Format->SetSelection( 0 );
-	m_Choice_Zeros_Format->SetToolTip( _("Choose EXCELLON numbers notation") );
-	
-	m_LeftBoxSizer->Add( m_Choice_Zeros_Format, 0, wxALL|wxEXPAND, 5 );
-	
-	wxString m_Choice_PrecisionChoices[] = { _("2:3"), _("2:4") };
-	int m_Choice_PrecisionNChoices = sizeof( m_Choice_PrecisionChoices ) / sizeof( wxString );
-	m_Choice_Precision = new wxRadioBox( this, wxID_ANY, _("Precision"), wxDefaultPosition, wxDefaultSize, m_Choice_PrecisionNChoices, m_Choice_PrecisionChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Precision->SetSelection( 1 );
-	m_Choice_Precision->SetToolTip( _("Choose EXCELLON numbers precision") );
-	
-	m_LeftBoxSizer->Add( m_Choice_Precision, 0, wxALL|wxEXPAND, 5 );
-	
-	wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") };
-	int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString );
-	m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Drill_Offset->SetSelection( 0 );
-	m_Choice_Drill_Offset->SetToolTip( _("Choose the coordinate origin: absolute or relative to the auxiliray axis") );
-	
-	m_LeftBoxSizer->Add( m_Choice_Drill_Offset, 0, wxALL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( m_LeftBoxSizer, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bMiddleBoxSizer;
-	bMiddleBoxSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_Choice_Drill_MapChoices[] = { _("None"), _("Drill map (HPGL)"), _("Drill map (PostScript)"), _("Drill map (Gerber)"), _("Drill map (DXF)") };
-	int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );
-	m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Drill_Map->SetSelection( 0 );
-	m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PS, HPGL or other formats") );
-	
-	bMiddleBoxSizer->Add( m_Choice_Drill_Map, 0, wxALL|wxEXPAND, 5 );
-	
-	wxString m_Choice_Drill_ReportChoices[] = { _("None"), _("Drill report") };
-	int m_Choice_Drill_ReportNChoices = sizeof( m_Choice_Drill_ReportChoices ) / sizeof( wxString );
-	m_Choice_Drill_Report = new wxRadioBox( this, wxID_ANY, _("Drill Report:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_ReportNChoices, m_Choice_Drill_ReportChoices, 1, wxRA_SPECIFY_COLS );
-	m_Choice_Drill_Report->SetSelection( 0 );
-	m_Choice_Drill_Report->SetToolTip( _("Creates a plain text report") );
-	
-	bMiddleBoxSizer->Add( m_Choice_Drill_Report, 0, wxALL|wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbHPGOptionsSizer;
-	sbHPGOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL plotter Options:") ), wxVERTICAL );
-	
-	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Speed (cm/s)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1->Wrap( -1 );
-	sbHPGOptionsSizer->Add( m_staticText1, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_PenSpeed = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbHPGOptionsSizer->Add( m_PenSpeed, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Pen Number"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText2->Wrap( -1 );
-	sbHPGOptionsSizer->Add( m_staticText2, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_PenNum = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbHPGOptionsSizer->Add( m_PenNum, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bMiddleBoxSizer->Add( sbHPGOptionsSizer, 0, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbOptSizer;
-	sbOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
-	
-	m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbOptSizer->Add( m_Check_Mirror, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("Minimal header"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbOptSizer->Add( m_Check_Minimal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	bMiddleBoxSizer->Add( sbOptSizer, 0, wxEXPAND, 5 );
-	
-	bMainSizer->Add( bMiddleBoxSizer, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bRightBoxSizer;
-	bRightBoxSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizerInfo;
-	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Info:") ), wxVERTICAL );
-	
-	m_DefaultViasDrillSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Vias Drill:") ), wxVERTICAL );
-	
-	m_ViaDrillValue = new wxStaticText( this, wxID_ANY, _("Via Drill Value"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_ViaDrillValue->Wrap( -1 );
-	m_DefaultViasDrillSizer->Add( m_ViaDrillValue, 0, wxALL, 5 );
-	
-	sbSizerInfo->Add( m_DefaultViasDrillSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	m_MicroViasDrillSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Micro Vias Drill:") ), wxVERTICAL );
-	
-	m_MicroViaDrillValue = new wxStaticText( this, wxID_ANY, _("Micro Via Drill Value"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_MicroViaDrillValue->Wrap( -1 );
-	m_MicroViasDrillSizer->Add( m_MicroViaDrillValue, 0, wxALL, 5 );
-	
-	sbSizerInfo->Add( m_MicroViasDrillSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticBoxSizer* sbSizerHoles;
-	sbSizerHoles = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Holes Count:") ), wxVERTICAL );
-	
-	m_PlatedPadsCountInfoMsg = new wxStaticText( this, wxID_ANY, _("Plated Pads:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PlatedPadsCountInfoMsg->Wrap( -1 );
-	sbSizerHoles->Add( m_PlatedPadsCountInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_NotPlatedPadsCountInfoMsg = new wxStaticText( this, wxID_ANY, _("Not Plated Pads:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_NotPlatedPadsCountInfoMsg->Wrap( -1 );
-	sbSizerHoles->Add( m_NotPlatedPadsCountInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_ThroughViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Through Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_ThroughViasInfoMsg->Wrap( -1 );
-	sbSizerHoles->Add( m_ThroughViasInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_MicroViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Micro Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_MicroViasInfoMsg->Wrap( -1 );
-	sbSizerHoles->Add( m_MicroViasInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_BuriedViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Buried Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_BuriedViasInfoMsg->Wrap( -1 );
-	sbSizerHoles->Add( m_BuriedViasInfoMsg, 0, wxALL, 5 );
-	
-	sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	bRightBoxSizer->Add( sbSizerInfo, 0, wxEXPAND|wxTOP, 5 );
-	
-	
-	bRightBoxSizer->Add( 10, 10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_OkButton->SetDefault(); 
-	bRightBoxSizer->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	bRightBoxSizer->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( bRightBoxSizer, 1, wxEXPAND, 5 );
-	
-	this->SetSizer( bMainSizer );
-	this->Layout();
-	
-	// Connect Events
-	m_Choice_Unit->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelDrillUnitsSelected ), NULL, this );
-	m_Choice_Zeros_Format->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelZerosFmtSelected ), NULL, this );
-	m_OkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnOkClick ), NULL, this );
-	m_CancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnCancelClick ), NULL, this );
-}
-
-DIALOG_GENDRILL_BASE::~DIALOG_GENDRILL_BASE()
-{
-	// Disconnect Events
-	m_Choice_Unit->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelDrillUnitsSelected ), NULL, this );
-	m_Choice_Zeros_Format->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelZerosFmtSelected ), NULL, this );
-	m_OkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnOkClick ), NULL, this );
-	m_CancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnCancelClick ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_gendrill_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* m_LeftBoxSizer;
+	m_LeftBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_Choice_UnitChoices[] = { _("Millimeters"), _("Inches") };
+	int m_Choice_UnitNChoices = sizeof( m_Choice_UnitChoices ) / sizeof( wxString );
+	m_Choice_Unit = new wxRadioBox( this, wxID_ANY, _("Drill Units:"), wxDefaultPosition, wxDefaultSize, m_Choice_UnitNChoices, m_Choice_UnitChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Unit->SetSelection( 1 );
+	m_LeftBoxSizer->Add( m_Choice_Unit, 0, wxALL|wxEXPAND, 5 );
+	
+	wxString m_Choice_Zeros_FormatChoices[] = { _("Decimal format"), _("Suppress leading zeros"), _("Suppress trailing zeros"), _("Keep zeros") };
+	int m_Choice_Zeros_FormatNChoices = sizeof( m_Choice_Zeros_FormatChoices ) / sizeof( wxString );
+	m_Choice_Zeros_Format = new wxRadioBox( this, wxID_ANY, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatNChoices, m_Choice_Zeros_FormatChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Zeros_Format->SetSelection( 0 );
+	m_Choice_Zeros_Format->SetToolTip( _("Choose EXCELLON numbers notation") );
+	
+	m_LeftBoxSizer->Add( m_Choice_Zeros_Format, 0, wxALL|wxEXPAND, 5 );
+	
+	wxString m_Choice_PrecisionChoices[] = { _("2:3"), _("2:4") };
+	int m_Choice_PrecisionNChoices = sizeof( m_Choice_PrecisionChoices ) / sizeof( wxString );
+	m_Choice_Precision = new wxRadioBox( this, wxID_ANY, _("Precision"), wxDefaultPosition, wxDefaultSize, m_Choice_PrecisionNChoices, m_Choice_PrecisionChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Precision->SetSelection( 1 );
+	m_Choice_Precision->SetToolTip( _("Choose EXCELLON numbers precision") );
+	
+	m_LeftBoxSizer->Add( m_Choice_Precision, 0, wxALL|wxEXPAND, 5 );
+	
+	wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") };
+	int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString );
+	m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Drill_Offset->SetSelection( 0 );
+	m_Choice_Drill_Offset->SetToolTip( _("Choose the coordinate origin: absolute or relative to the auxiliray axis") );
+	
+	m_LeftBoxSizer->Add( m_Choice_Drill_Offset, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( m_LeftBoxSizer, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bMiddleBoxSizer;
+	bMiddleBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_Choice_Drill_MapChoices[] = { _("None"), _("Drill map (HPGL)"), _("Drill map (PostScript)"), _("Drill map (Gerber)"), _("Drill map (DXF)") };
+	int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );
+	m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Drill_Map->SetSelection( 0 );
+	m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PS, HPGL or other formats") );
+	
+	bMiddleBoxSizer->Add( m_Choice_Drill_Map, 0, wxALL|wxEXPAND, 5 );
+	
+	wxString m_Choice_Drill_ReportChoices[] = { _("None"), _("Drill report") };
+	int m_Choice_Drill_ReportNChoices = sizeof( m_Choice_Drill_ReportChoices ) / sizeof( wxString );
+	m_Choice_Drill_Report = new wxRadioBox( this, wxID_ANY, _("Drill Report:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_ReportNChoices, m_Choice_Drill_ReportChoices, 1, wxRA_SPECIFY_COLS );
+	m_Choice_Drill_Report->SetSelection( 0 );
+	m_Choice_Drill_Report->SetToolTip( _("Creates a plain text report") );
+	
+	bMiddleBoxSizer->Add( m_Choice_Drill_Report, 0, wxALL|wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbHPGOptionsSizer;
+	sbHPGOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL plotter Options:") ), wxVERTICAL );
+	
+	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Speed (cm/s)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1->Wrap( -1 );
+	sbHPGOptionsSizer->Add( m_staticText1, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_PenSpeed = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	sbHPGOptionsSizer->Add( m_PenSpeed, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Pen Number"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2->Wrap( -1 );
+	sbHPGOptionsSizer->Add( m_staticText2, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_PenNum = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	sbHPGOptionsSizer->Add( m_PenNum, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bMiddleBoxSizer->Add( sbHPGOptionsSizer, 0, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbOptSizer;
+	sbOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
+	
+	m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbOptSizer->Add( m_Check_Mirror, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("Minimal header"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbOptSizer->Add( m_Check_Minimal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bMiddleBoxSizer->Add( sbOptSizer, 0, wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bMiddleBoxSizer, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bRightBoxSizer;
+	bRightBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizerInfo;
+	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Info:") ), wxVERTICAL );
+	
+	m_DefaultViasDrillSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default Vias Drill:") ), wxVERTICAL );
+	
+	m_ViaDrillValue = new wxStaticText( this, wxID_ANY, _("Via Drill Value"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_ViaDrillValue->Wrap( -1 );
+	m_DefaultViasDrillSizer->Add( m_ViaDrillValue, 0, wxALL, 5 );
+	
+	
+	sbSizerInfo->Add( m_DefaultViasDrillSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	m_MicroViasDrillSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Micro Vias Drill:") ), wxVERTICAL );
+	
+	m_MicroViaDrillValue = new wxStaticText( this, wxID_ANY, _("Micro Via Drill Value"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_MicroViaDrillValue->Wrap( -1 );
+	m_MicroViasDrillSizer->Add( m_MicroViaDrillValue, 0, wxALL, 5 );
+	
+	
+	sbSizerInfo->Add( m_MicroViasDrillSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxStaticBoxSizer* sbSizerHoles;
+	sbSizerHoles = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Holes Count:") ), wxVERTICAL );
+	
+	m_PlatedPadsCountInfoMsg = new wxStaticText( this, wxID_ANY, _("Plated Pads:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PlatedPadsCountInfoMsg->Wrap( -1 );
+	sbSizerHoles->Add( m_PlatedPadsCountInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_NotPlatedPadsCountInfoMsg = new wxStaticText( this, wxID_ANY, _("Not Plated Pads:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_NotPlatedPadsCountInfoMsg->Wrap( -1 );
+	sbSizerHoles->Add( m_NotPlatedPadsCountInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_ThroughViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Through Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_ThroughViasInfoMsg->Wrap( -1 );
+	sbSizerHoles->Add( m_ThroughViasInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_MicroViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Micro Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_MicroViasInfoMsg->Wrap( -1 );
+	sbSizerHoles->Add( m_MicroViasInfoMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_BuriedViasInfoMsg = new wxStaticText( this, wxID_ANY, _("Buried Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BuriedViasInfoMsg->Wrap( -1 );
+	sbSizerHoles->Add( m_BuriedViasInfoMsg, 0, wxALL, 5 );
+	
+	
+	sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	
+	bRightBoxSizer->Add( sbSizerInfo, 0, wxEXPAND|wxTOP, 5 );
+	
+	
+	bRightBoxSizer->Add( 10, 10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_OkButton->SetDefault(); 
+	bRightBoxSizer->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+	bRightBoxSizer->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bRightBoxSizer, 1, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	bMainSizer->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	m_Choice_Unit->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelDrillUnitsSelected ), NULL, this );
+	m_Choice_Zeros_Format->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelZerosFmtSelected ), NULL, this );
+	m_OkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnOkClick ), NULL, this );
+	m_CancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnCancelClick ), NULL, this );
+}
+
+DIALOG_GENDRILL_BASE::~DIALOG_GENDRILL_BASE()
+{
+	// Disconnect Events
+	m_Choice_Unit->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelDrillUnitsSelected ), NULL, this );
+	m_Choice_Zeros_Format->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnSelZerosFmtSelected ), NULL, this );
+	m_OkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnOkClick ), NULL, this );
+	m_CancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GENDRILL_BASE::OnCancelClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_gendrill_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_GENDRILL_BASE_H__
-#define __DIALOG_GENDRILL_BASE_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/string.h>
-#include <wx/radiobox.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/sizer.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/statbox.h>
-#include <wx/checkbox.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_GENDRILL_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_GENDRILL_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxRadioBox* m_Choice_Unit;
-		wxRadioBox* m_Choice_Zeros_Format;
-		wxRadioBox* m_Choice_Precision;
-		wxRadioBox* m_Choice_Drill_Offset;
-		wxRadioBox* m_Choice_Drill_Map;
-		wxRadioBox* m_Choice_Drill_Report;
-		wxStaticText* m_staticText1;
-		wxTextCtrl* m_PenSpeed;
-		wxStaticText* m_staticText2;
-		wxTextCtrl* m_PenNum;
-		wxCheckBox* m_Check_Mirror;
-		wxCheckBox* m_Check_Minimal;
-		wxStaticBoxSizer* m_DefaultViasDrillSizer;
-		wxStaticText* m_ViaDrillValue;
-		wxStaticBoxSizer* m_MicroViasDrillSizer;
-		wxStaticText* m_MicroViaDrillValue;
-		wxStaticText* m_PlatedPadsCountInfoMsg;
-		wxStaticText* m_NotPlatedPadsCountInfoMsg;
-		wxStaticText* m_ThroughViasInfoMsg;
-		wxStaticText* m_MicroViasInfoMsg;
-		wxStaticText* m_BuriedViasInfoMsg;
-		wxButton* m_OkButton;
-		wxButton* m_CancelButton;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnSelDrillUnitsSelected( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSelZerosFmtSelected( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,385 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_GENDRILL_BASE();
-	
-};
-
-#endif //__DIALOG_GENDRILL_BASE_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_GENDRILL_BASE_H__
+#define __DIALOG_GENDRILL_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/radiobox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/statbox.h>
+#include <wx/checkbox.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_GENDRILL_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_GENDRILL_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxRadioBox* m_Choice_Unit;
+		wxRadioBox* m_Choice_Zeros_Format;
+		wxRadioBox* m_Choice_Precision;
+		wxRadioBox* m_Choice_Drill_Offset;
+		wxRadioBox* m_Choice_Drill_Map;
+		wxRadioBox* m_Choice_Drill_Report;
+		wxStaticText* m_staticText1;
+		wxTextCtrl* m_PenSpeed;
+		wxStaticText* m_staticText2;
+		wxTextCtrl* m_PenNum;
+		wxCheckBox* m_Check_Mirror;
+		wxCheckBox* m_Check_Minimal;
+		wxStaticBoxSizer* m_DefaultViasDrillSizer;
+		wxStaticText* m_ViaDrillValue;
+		wxStaticBoxSizer* m_MicroViasDrillSizer;
+		wxStaticText* m_MicroViaDrillValue;
+		wxStaticText* m_PlatedPadsCountInfoMsg;
+		wxStaticText* m_NotPlatedPadsCountInfoMsg;
+		wxStaticText* m_ThroughViasInfoMsg;
+		wxStaticText* m_MicroViasInfoMsg;
+		wxStaticText* m_BuriedViasInfoMsg;
+		wxButton* m_OkButton;
+		wxButton* m_CancelButton;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnSelDrillUnitsSelected( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelZerosFmtSelected( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_GENDRILL_BASE();
+	
+};
+
+#endif //__DIALOG_GENDRILL_BASE_H__

pcbnew/dialogs/dialog_graphic_items_options.cpp

@@ -14,8 +14,6 @@
 
 #include <dialog_graphic_items_options.h>
 
-extern int g_DrawDefaultLineThickness;
-
 
 void PCB_EDIT_FRAME::OnConfigurePcbOptions( wxCommandEvent& aEvent )
 {

pcbnew/dialogs/dialog_plot_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 17 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_plot_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
-	m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer12;
-	bSizer12 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer27;
-	bSizer27 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText121 = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText121->Wrap( -1 );
-	bSizer27->Add( m_staticText121, 0, wxTOP, 5 );
-	
-	wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("DXF") };
-	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 );
-	bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );
-	
-	bSizer26->Add( bSizer27, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer28;
-	bSizer28 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDir->Wrap( -1 );
-	bSizer28->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer29;
-	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.") );
-	
-	bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-	
-	bSizer28->Add( bSizer29, 1, wxEXPAND, 5 );
-	
-	bSizer26->Add( bSizer28, 1, 0, 5 );
-	
-	bSizer12->Add( bSizer26, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bUpperSizer;
-	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
-	
-	wxArrayString m_layerCheckListBoxChoices;
-	m_layerCheckListBox = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );
-	m_LayersSizer->Add( m_layerCheckListBox, 1, wxEXPAND, 5 );
-	
-	bUpperSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 );
-	
-	m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbOptionsSizer;
-	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer192;
-	bSizer192 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizerPlotItems;
-	bSizerPlotItems = new wxBoxSizer( wxVERTICAL );
-	
-	m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerPlotItems->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );
-	
-	bSizerPlotItems->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerPlotItems->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerPlotItems->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );
-	
-	bSizerPlotItems->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Plot invisible texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );
-	
-	bSizerPlotItems->Add( m_plotInvisibleText, 0, wxALL, 2 );
-	
-	m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias.") );
-	
-	bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
-	
-	m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerPlotItems->Add( m_plotMirrorOpt, 0, wxALL, 2 );
-	
-	bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer14;
-	bSizer14 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText11->Wrap( -1 );
-	bSizer14->Add( m_staticText11, 0, wxRIGHT|wxLEFT, 5 );
-	
-	wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
-	int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
-	m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
-	m_drillShapeOpt->SetSelection( 0 );
-	bSizer14->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );
-	
-	m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12->Wrap( -1 );
-	bSizer14->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
-	int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
-	m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
-	m_scaleOpt->SetSelection( 0 );
-	bSizer14->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );
-	
-	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13->Wrap( -1 );
-	bSizer14->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
-	int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
-	m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
-	m_plotModeOpt->SetSelection( 0 );
-	bSizer14->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );
-	
-	m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), 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.") );
-	
-	bSizer14->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
-	
-	bSizer14->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
-	
-	bSizer192->Add( bSizer14, 1, wxRIGHT|wxLEFT, 3 );
-	
-	sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );
-	
-	m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
-	
-	m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
-	
-	m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
-	
-	m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
-	
-	m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer from other layers"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
-	
-	m_GerberOptionsSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
-	
-	m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
-	
-	m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in Gerber files.") );
-	
-	m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
-	
-	m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 );
-	
-	m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer20;
-	bSizer20 = new wxBoxSizer( wxVERTICAL );
-	
-	m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_textPenSize->Wrap( -1 );
-	bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_textPenOvr->Wrap( -1 );
-	bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
-	
-	bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_textPenSpeed->Wrap( -1 );
-	bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
-	
-	bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
-	
-	m_HPGLOptionsSizer->Add( bSizer22, 1, wxEXPAND, 5 );
-	
-	m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL|wxEXPAND, 3 );
-	
-	m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer17;
-	bSizer17 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer18;
-	bSizer18 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText7->Wrap( -1 );
-	bSizer18->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_fineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fineAdjustXscaleOpt->SetToolTip( _("Set global X scale adjust for exact scale postscript output.") );
-	
-	bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer19;
-	bSizer19 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8->Wrap( -1 );
-	bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fineAdjustYscaleOpt->SetToolTip( _("Set global Y scale adjust for exact scale postscript output.") );
-	
-	bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer191;
-	bSizer191 = new wxBoxSizer( wxVERTICAL );
-	
-	m_textPSFineAdjustWidth = new wxStaticText( this, wxID_ANY, _("Width correction"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_textPSFineAdjustWidth->Wrap( -1 );
-	bSizer191->Add( m_textPSFineAdjustWidth, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
-	
-	m_PSFineAdjustWidthOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_PSFineAdjustWidthOpt->SetToolTip( _("Set global width correction for exact width postscript output.\nThese width correction is intended to compensate tracks width and also pads and vias size errors.\nThe reasonable width correction value must be in a range of [-(MinTrackWidth-1), +(MinClearanceValue-1)] in decimils.") );
-	
-	bSizer191->Add( m_PSFineAdjustWidthOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-	
-	bSizer17->Add( bSizer191, 1, wxEXPAND, 5 );
-	
-	m_PSOptionsSizer->Add( bSizer17, 1, wxEXPAND, 5 );
-	
-	m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PSOptionsSizer->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
-	
-	m_forcePSA4OutputOpt = new wxCheckBox( this, wxID_ANY, _("Force A4 output"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxALL, 2 );
-	
-	m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 );
-	
-	bUpperSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );
-	
-	bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizerMsg;
-	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
-	
-	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_messagesBox->SetMinSize( wxSize( -1,70 ) );
-	
-	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );
-	
-	bSizer12->Add( sbSizerMsg, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizerButtons;
-	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotButton->SetDefault(); 
-	bSizerButtons->Add( m_plotButton, 0, wxALL, 5 );
-	
-	m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerButtons->Add( m_buttonDrill, 0, wxALL, 5 );
-	
-	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerButtons->Add( m_buttonQuit, 0, wxALL, 5 );
-	
-	bSizer12->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );
-	
-	m_MainSizer->Add( bSizer12, 1, wxALL|wxEXPAND, 5 );
-	
-	this->SetSizer( m_MainSizer );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
-	m_plotFormatOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
-	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
-	m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
-	m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
-	m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
-	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
-}
-
-DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
-	m_plotFormatOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
-	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
-	m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
-	m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
-	m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
-	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_plot_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	
+	m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer12;
+	bSizer12 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer26;
+	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer27;
+	bSizer27 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText121 = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText121->Wrap( -1 );
+	bSizer27->Add( m_staticText121, 0, wxTOP, 5 );
+	
+	wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("DXF") };
+	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 );
+	bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );
+	
+	
+	bSizer26->Add( bSizer27, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer28;
+	bSizer28 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDir->Wrap( -1 );
+	bSizer28->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer29;
+	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.") );
+	
+	bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+	
+	
+	bSizer28->Add( bSizer29, 1, wxEXPAND, 5 );
+	
+	
+	bSizer26->Add( bSizer28, 1, 0, 5 );
+	
+	
+	bSizer12->Add( bSizer26, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bUpperSizer;
+	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
+	
+	wxArrayString m_layerCheckListBoxChoices;
+	m_layerCheckListBox = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );
+	m_LayersSizer->Add( m_layerCheckListBox, 1, wxEXPAND, 5 );
+	
+	
+	bUpperSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 );
+	
+	m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbOptionsSizer;
+	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer192;
+	bSizer192 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizerPlotItems;
+	bSizerPlotItems = new wxBoxSizer( wxVERTICAL );
+	
+	m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPlotItems->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );
+	
+	bSizerPlotItems->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPlotItems->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPlotItems->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );
+	
+	bSizerPlotItems->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Plot invisible texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );
+	
+	bSizerPlotItems->Add( m_plotInvisibleText, 0, wxALL, 2 );
+	
+	m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias.") );
+	
+	bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
+	
+	m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPlotItems->Add( m_plotMirrorOpt, 0, wxALL, 2 );
+	
+	
+	bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer14;
+	bSizer14 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	bSizer14->Add( m_staticText11, 0, wxRIGHT|wxLEFT, 5 );
+	
+	wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
+	int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
+	m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
+	m_drillShapeOpt->SetSelection( 0 );
+	bSizer14->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );
+	
+	m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12->Wrap( -1 );
+	bSizer14->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
+	int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
+	m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
+	m_scaleOpt->SetSelection( 0 );
+	bSizer14->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );
+	
+	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	bSizer14->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
+	int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
+	m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
+	m_plotModeOpt->SetSelection( 0 );
+	bSizer14->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );
+	
+	m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), 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.") );
+	
+	bSizer14->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
+	
+	bSizer14->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
+	
+	
+	bSizer192->Add( bSizer14, 1, wxRIGHT|wxLEFT, 3 );
+	
+	
+	sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );
+	
+	
+	m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
+	
+	m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
+	
+	m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
+	
+	m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
+	
+	m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer from other layers"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
+	
+	m_GerberOptionsSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
+	
+	m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
+	
+	m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in Gerber files.") );
+	
+	m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
+	
+	
+	m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 );
+	
+	m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer22;
+	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer20;
+	bSizer20 = new wxBoxSizer( wxVERTICAL );
+	
+	m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_textPenSize->Wrap( -1 );
+	bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_textPenOvr->Wrap( -1 );
+	bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
+	
+	bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer21;
+	bSizer21 = new wxBoxSizer( wxVERTICAL );
+	
+	m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_textPenSpeed->Wrap( -1 );
+	bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
+	
+	bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
+	
+	
+	m_HPGLOptionsSizer->Add( bSizer22, 1, wxEXPAND, 5 );
+	
+	
+	m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL|wxEXPAND, 3 );
+	
+	m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer17;
+	bSizer17 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer18;
+	bSizer18 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText7->Wrap( -1 );
+	bSizer18->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_fineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_fineAdjustXscaleOpt->SetToolTip( _("Set global X scale adjust for exact scale postscript output.") );
+	
+	bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer19;
+	bSizer19 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText8->Wrap( -1 );
+	bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_fineAdjustYscaleOpt->SetToolTip( _("Set global Y scale adjust for exact scale postscript output.") );
+	
+	bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer191;
+	bSizer191 = new wxBoxSizer( wxVERTICAL );
+	
+	m_textPSFineAdjustWidth = new wxStaticText( this, wxID_ANY, _("Width correction"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_textPSFineAdjustWidth->Wrap( -1 );
+	bSizer191->Add( m_textPSFineAdjustWidth, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
+	
+	m_PSFineAdjustWidthOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_PSFineAdjustWidthOpt->SetToolTip( _("Set global width correction for exact width postscript output.\nThese width correction is intended to compensate tracks width and also pads and vias size errors.\nThe reasonable width correction value must be in a range of [-(MinTrackWidth-1), +(MinClearanceValue-1)] in decimils.") );
+	
+	bSizer191->Add( m_PSFineAdjustWidthOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	
+	bSizer17->Add( bSizer191, 1, wxEXPAND, 5 );
+	
+	
+	m_PSOptionsSizer->Add( bSizer17, 1, wxEXPAND, 5 );
+	
+	m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PSOptionsSizer->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
+	
+	m_forcePSA4OutputOpt = new wxCheckBox( this, wxID_ANY, _("Force A4 output"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxALL, 2 );
+	
+	
+	m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 );
+	
+	
+	bUpperSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );
+	
+	
+	bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizerMsg;
+	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
+	
+	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+	m_messagesBox->SetMinSize( wxSize( -1,70 ) );
+	
+	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );
+	
+	
+	bSizer12->Add( sbSizerMsg, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerButtons;
+	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotButton->SetDefault(); 
+	bSizerButtons->Add( m_plotButton, 0, wxALL, 5 );
+	
+	m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerButtons->Add( m_buttonDrill, 0, wxALL, 5 );
+	
+	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerButtons->Add( m_buttonQuit, 0, wxALL, 5 );
+	
+	
+	bSizer12->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );
+	
+	
+	m_MainSizer->Add( bSizer12, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( m_MainSizer );
+	this->Layout();
+	m_MainSizer->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
+	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
+	m_plotFormatOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
+	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+	m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
+	m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
+	m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
+	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
+}
+
+DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
+	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
+	m_plotFormatOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
+	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
+	m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
+	m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
+	m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
+	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_plot_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 17 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_plot_base__
-#define __dialog_plot_base__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/choice.h>
-#include <wx/sizer.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/checklst.h>
-#include <wx/statbox.h>
-#include <wx/checkbox.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PLOT_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PLOT_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
-			ID_PRINT_REF,
-			ID_MIROR_OPT,
-			ID_CREATE_DRILL_FILE,
-		};
-		
-		wxBoxSizer* m_MainSizer;
-		wxStaticText* m_staticText121;
-		wxChoice* m_plotFormatOpt;
-		wxStaticText* m_staticTextDir;
-		wxTextCtrl* m_outputDirectoryName;
-		wxButton* m_browseButton;
-		wxStaticBoxSizer* m_LayersSizer;
-		wxCheckListBox* m_layerCheckListBox;
-		wxBoxSizer* m_PlotOptionsSizer;
-		wxCheckBox* m_plotSheetRef;
-		wxCheckBox* m_plotPads_on_Silkscreen;
-		wxCheckBox* m_plotModuleValueOpt;
-		wxCheckBox* m_plotModuleRefOpt;
-		wxCheckBox* m_plotTextOther;
-		wxCheckBox* m_plotInvisibleText;
-		wxCheckBox* m_plotNoViaOnMaskOpt;
-		wxCheckBox* m_plotMirrorOpt;
-		wxStaticText* m_staticText11;
-		wxChoice* m_drillShapeOpt;
-		wxStaticText* m_staticText12;
-		wxChoice* m_scaleOpt;
-		wxStaticText* m_staticText13;
-		wxChoice* m_plotModeOpt;
-		wxStaticText* m_textDefaultPenSize;
-		wxTextCtrl* m_linesWidth;
-		wxStaticBoxSizer* m_GerberOptionsSizer;
-		wxCheckBox* m_useGerberExtensions;
-		wxCheckBox* m_excludeEdgeLayerOpt;
-		wxCheckBox* m_subtractMaskFromSilk;
-		wxCheckBox* m_useAuxOriginCheckBox;
-		wxStaticBoxSizer* m_HPGLOptionsSizer;
-		wxStaticText* m_textPenSize;
-		wxTextCtrl* m_HPGLPenSizeOpt;
-		wxStaticText* m_textPenOvr;
-		wxTextCtrl* m_HPGLPenOverlayOpt;
-		wxStaticText* m_textPenSpeed;
-		wxTextCtrl* m_HPGLPenSpeedOpt;
-		wxStaticBoxSizer* m_PSOptionsSizer;
-		wxStaticText* m_staticText7;
-		wxTextCtrl* m_fineAdjustXscaleOpt;
-		wxStaticText* m_staticText8;
-		wxTextCtrl* m_fineAdjustYscaleOpt;
-		wxStaticText* m_textPSFineAdjustWidth;
-		wxTextCtrl* m_PSFineAdjustWidthOpt;
-		wxCheckBox* m_plotPSNegativeOpt;
-		wxCheckBox* m_forcePSA4OutputOpt;
-		wxTextCtrl* m_messagesBox;
-		wxButton* m_plotButton;
-		wxButton* m_buttonDrill;
-		wxButton* m_buttonQuit;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
-		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
-		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,747 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_PLOT_BASE();
-	
-};
-
-#endif //__dialog_plot_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PLOT_BASE_H__
+#define __DIALOG_PLOT_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/choice.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/checklst.h>
+#include <wx/statbox.h>
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PLOT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PLOT_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		enum
+		{
+			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
+			ID_PRINT_REF,
+			ID_MIROR_OPT,
+			ID_CREATE_DRILL_FILE
+		};
+		
+		wxBoxSizer* m_MainSizer;
+		wxStaticText* m_staticText121;
+		wxChoice* m_plotFormatOpt;
+		wxStaticText* m_staticTextDir;
+		wxTextCtrl* m_outputDirectoryName;
+		wxButton* m_browseButton;
+		wxStaticBoxSizer* m_LayersSizer;
+		wxCheckListBox* m_layerCheckListBox;
+		wxBoxSizer* m_PlotOptionsSizer;
+		wxCheckBox* m_plotSheetRef;
+		wxCheckBox* m_plotPads_on_Silkscreen;
+		wxCheckBox* m_plotModuleValueOpt;
+		wxCheckBox* m_plotModuleRefOpt;
+		wxCheckBox* m_plotTextOther;
+		wxCheckBox* m_plotInvisibleText;
+		wxCheckBox* m_plotNoViaOnMaskOpt;
+		wxCheckBox* m_plotMirrorOpt;
+		wxStaticText* m_staticText11;
+		wxChoice* m_drillShapeOpt;
+		wxStaticText* m_staticText12;
+		wxChoice* m_scaleOpt;
+		wxStaticText* m_staticText13;
+		wxChoice* m_plotModeOpt;
+		wxStaticText* m_textDefaultPenSize;
+		wxTextCtrl* m_linesWidth;
+		wxStaticBoxSizer* m_GerberOptionsSizer;
+		wxCheckBox* m_useGerberExtensions;
+		wxCheckBox* m_excludeEdgeLayerOpt;
+		wxCheckBox* m_subtractMaskFromSilk;
+		wxCheckBox* m_useAuxOriginCheckBox;
+		wxStaticBoxSizer* m_HPGLOptionsSizer;
+		wxStaticText* m_textPenSize;
+		wxTextCtrl* m_HPGLPenSizeOpt;
+		wxStaticText* m_textPenOvr;
+		wxTextCtrl* m_HPGLPenOverlayOpt;
+		wxStaticText* m_textPenSpeed;
+		wxTextCtrl* m_HPGLPenSpeedOpt;
+		wxStaticBoxSizer* m_PSOptionsSizer;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_fineAdjustXscaleOpt;
+		wxStaticText* m_staticText8;
+		wxTextCtrl* m_fineAdjustYscaleOpt;
+		wxStaticText* m_textPSFineAdjustWidth;
+		wxTextCtrl* m_PSFineAdjustWidthOpt;
+		wxCheckBox* m_plotPSNegativeOpt;
+		wxCheckBox* m_forcePSA4OutputOpt;
+		wxTextCtrl* m_messagesBox;
+		wxButton* m_plotButton;
+		wxButton* m_buttonDrill;
+		wxButton* m_buttonQuit;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
+		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	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();
+	
+};
+
+#endif //__DIALOG_PLOT_BASE_H__

pcbnew/dialogs/dialog_print_for_modedit.cpp

-/****************************************/
+
 /* File: dialog_print_for_modedit.cpp */
-/****************************************/
+
 
 // Set this to 1 if you want to test PostScript printing under MSW.
 #define wxTEST_POSTSCRIPT_IN_MSW 1
@@ -30,23 +30,27 @@ static wxPrintData* s_PrintData;
 static wxPageSetupDialogData* s_pageSetupData = (wxPageSetupDialogData*) NULL;
 
 
-/* Dialog to print schematic. Class derived from DIALOG_PRINT_FOR_MODEDIT_BASE
- *  created by wxFormBuilder
+/**
+ * Class DIALOG_PRINT_FOR_MODEDIT
+ * is derived from DIALOG_PRINT_FOR_MODEDIT_BASE which is created by wxFormBuilder.
  */
 class DIALOG_PRINT_FOR_MODEDIT : public DIALOG_PRINT_FOR_MODEDIT_BASE
 {
-private:
-    EDA_DRAW_FRAME* m_Parent;
-    wxConfig*       m_Config;
-
 public:
-    DIALOG_PRINT_FOR_MODEDIT( EDA_DRAW_FRAME* parent );
-    ~DIALOG_PRINT_FOR_MODEDIT() {};
+    DIALOG_PRINT_FOR_MODEDIT( PCB_BASE_FRAME* parent );
 
 private:
+    PCB_BASE_FRAME* m_parent;
+    wxConfig*       m_config;
+
     void OnCloseWindow( wxCloseEvent& event );
+
+    /// Open a dialog box for printer setup (printer options, page size ...)
     void OnPrintSetup( wxCommandEvent& event );
+
     void OnPrintPreview( wxCommandEvent& event );
+
+    /// Called on activate Print button
     void OnPrintButtonClick( wxCommandEvent& event );
 
     void OnButtonCancelClick( wxCommandEvent& event ) { Close(); }
@@ -54,12 +58,7 @@ private:
 };
 
 
-/*************************************************************/
 void FOOTPRINT_EDIT_FRAME::ToPrinter( wxCommandEvent& event )
-/*************************************************************/
-/* Virtual function:
- * Display the print dialog
- */
 {
     if( s_PrintData == NULL )  // First print
     {
@@ -74,34 +73,27 @@ void FOOTPRINT_EDIT_FRAME::ToPrinter( wxCommandEvent& event )
 
     s_PrintData->SetOrientation( GetPageSettings().IsPortrait() ? wxPORTRAIT : wxLANDSCAPE );
 
-    DIALOG_PRINT_FOR_MODEDIT* frame = new DIALOG_PRINT_FOR_MODEDIT( this );
+    DIALOG_PRINT_FOR_MODEDIT dlg( this );
 
-    frame->ShowModal();
-    frame->Destroy();
+    dlg.ShowModal();
 }
 
-/*************************************************************************************/
-DIALOG_PRINT_FOR_MODEDIT::DIALOG_PRINT_FOR_MODEDIT( EDA_DRAW_FRAME* parent ) :
+
+DIALOG_PRINT_FOR_MODEDIT::DIALOG_PRINT_FOR_MODEDIT( PCB_BASE_FRAME* parent ) :
     DIALOG_PRINT_FOR_MODEDIT_BASE( parent )
-/*************************************************************************************/
 {
-    m_Parent = parent;
+    m_parent = parent;
     s_Parameters.m_ForceCentered = true;
-    m_Config = wxGetApp().GetSettings();
+    m_config = wxGetApp().GetSettings();
     InitValues();
 
     m_buttonPrint->SetDefault();
     GetSizer()->SetSizeHints( this );
-    Center();
 }
 
 
-/************************************************************************/
 void DIALOG_PRINT_FOR_MODEDIT::InitValues( )
-/************************************************************************/
 {
-    SetFocus();
-
     if( s_pageSetupData == NULL )
     {
         s_pageSetupData = new wxPageSetupDialogData;
@@ -115,13 +107,12 @@ void DIALOG_PRINT_FOR_MODEDIT::InitValues( )
 
     // Read the scale adjust option
     int scale_Select = 3; // default selected scale = ScaleList[3] = 1
-    if( m_Config )
+    if( m_config )
     {
-        m_Config->Read( OPTKEY_PRINT_MODULE_SCALE, &scale_Select );
-        m_Config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
+        m_config->Read( OPTKEY_PRINT_MODULE_SCALE, &scale_Select );
+        m_config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
     }
 
-    extern int g_DrawDefaultLineThickness;
     s_Parameters.m_PenDefaultSize = g_DrawDefaultLineThickness;
     m_ScaleOption->SetSelection( scale_Select );
 
@@ -130,25 +121,20 @@ void DIALOG_PRINT_FOR_MODEDIT::InitValues( )
 }
 
 
-/********************************************************************/
+
 void DIALOG_PRINT_FOR_MODEDIT::OnCloseWindow( wxCloseEvent& event )
-/********************************************************************/
 {
-    if( m_Config )
+    if( m_config )
     {
-        m_Config->Write( OPTKEY_PRINT_MODULE_SCALE, m_ScaleOption->GetSelection() );
-        m_Config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
+        m_config->Write( OPTKEY_PRINT_MODULE_SCALE, m_ScaleOption->GetSelection() );
+        m_config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
     }
     EndModal( 0 );
 }
 
 
-/**********************************************************/
-void DIALOG_PRINT_FOR_MODEDIT::OnPrintSetup( wxCommandEvent& event )
-/**********************************************************/
 
-/* Open a dialog box for printer setup (printer options, page size ...)
- */
+void DIALOG_PRINT_FOR_MODEDIT::OnPrintSetup( wxCommandEvent& event )
 {
     wxPrintDialogData printDialogData( *s_PrintData );
 
@@ -163,9 +149,9 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintSetup( wxCommandEvent& event )
 }
 
 
-/************************************************************/
+
 void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
-/************************************************************/
+
 
 /* Open and display a previewer frame for printing
  */
@@ -176,8 +162,8 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
     // Pass two printout objects: for preview, and possible printing.
     wxString        title   = _( "Print Preview" );
     wxPrintPreview* preview =
-        new wxPrintPreview( new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
-                            new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
+        new wxPrintPreview( new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_parent, title ),
+                            new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_parent, title ),
                             s_PrintData );
 
     if( preview == NULL )
@@ -187,9 +173,9 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
     }
 
      // Uses the parent position and size.
-    // @todo uses last position and size ans store them when exit in m_Config
-    wxPoint         WPos  = m_Parent->GetPosition();
-    wxSize          WSize = m_Parent->GetSize();
+    // @todo uses last position and size ans store them when exit in m_config
+    wxPoint         WPos  = m_parent->GetPosition();
+    wxSize          WSize = m_parent->GetSize();
 
     wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
 
@@ -198,24 +184,23 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
 }
 
 
-/***************************************************************************/
 void DIALOG_PRINT_FOR_MODEDIT::OnPrintButtonClick( wxCommandEvent& event )
-/***************************************************************************/
-
-/* Called on activate Print button
- */
 {
+    PCB_PLOT_PARAMS plot_opts = m_parent->GetPlotSettings();
+
     s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
     s_Parameters.m_PrintScale = s_ScaleList[m_ScaleOption->GetSelection()];
 
-    g_PcbPlotOptions.m_FineScaleAdjustX = s_Parameters.m_XScaleAdjust;
-    g_PcbPlotOptions.m_FineScaleAdjustY = s_Parameters.m_YScaleAdjust;
-    g_PcbPlotOptions.m_PlotScale = s_Parameters.m_PrintScale;
+    plot_opts.m_FineScaleAdjustX = s_Parameters.m_XScaleAdjust;
+    plot_opts.m_FineScaleAdjustY = s_Parameters.m_YScaleAdjust;
+    plot_opts.m_PlotScale = s_Parameters.m_PrintScale;
+
+    m_parent->SetPlotSettings( plot_opts );
 
     wxPrintDialogData printDialogData( *s_PrintData );
     wxPrinter         printer( &printDialogData );
 
-    BOARD_PRINTOUT_CONTROLER      printout( s_Parameters, m_Parent, _( "Print Footprint" ) );
+    BOARD_PRINTOUT_CONTROLER      printout( s_Parameters, m_parent, _( "Print Footprint" ) );
 
 #if !defined(__WINDOWS__) && !wxCHECK_VERSION(2,9,0)
     wxDC*             dc = printout.GetDC();
@@ -232,4 +217,6 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintButtonClick( wxCommandEvent& event )
     {
         *s_PrintData = printer.GetPrintDialogData().GetPrintData();
     }
+
+
 }

pcbnew/dialogs/dialog_print_for_modedit_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_print_for_modedit_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_PRINT_FOR_MODEDIT_BASE::DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
-	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bmiddleLeftSizer;
-	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4"), _("Scale 8"), _("Scale 16") };
-	int m_ScaleOptionNChoices = sizeof( m_ScaleOptionChoices ) / sizeof( wxString );
-	m_ScaleOption = new wxRadioBox( this, wxID_ANY, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionNChoices, m_ScaleOptionChoices, 1, wxRA_SPECIFY_COLS );
-	m_ScaleOption->SetSelection( 3 );
-	bmiddleLeftSizer->Add( m_ScaleOption, 0, wxALL, 5 );
-	
-	bMainSizer->Add( bmiddleLeftSizer, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bmiddleRightSizer;
-	bmiddleRightSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
-	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
-	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print 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") );
-	
-	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( bmiddleRightSizer, 1, 0, 5 );
-	
-	wxBoxSizer* bbuttonsSizer;
-	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( bbuttonsSizer, 0, 0, 5 );
-	
-	this->SetSizer( bMainSizer );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
-	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
-	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
-	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
-	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
-}
-
-DIALOG_PRINT_FOR_MODEDIT_BASE::~DIALOG_PRINT_FOR_MODEDIT_BASE()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
-	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
-	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
-	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
-	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_print_for_modedit_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PRINT_FOR_MODEDIT_BASE::DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bmiddleLeftSizer;
+	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4"), _("Scale 8"), _("Scale 16") };
+	int m_ScaleOptionNChoices = sizeof( m_ScaleOptionChoices ) / sizeof( wxString );
+	m_ScaleOption = new wxRadioBox( this, wxID_ANY, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionNChoices, m_ScaleOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_ScaleOption->SetSelection( 3 );
+	bmiddleLeftSizer->Add( m_ScaleOption, 0, wxALL, 5 );
+	
+	
+	bMainSizer->Add( bmiddleLeftSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bmiddleRightSizer;
+	bmiddleRightSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
+	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
+	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print 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") );
+	
+	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bmiddleRightSizer, 1, 0, 5 );
+	
+	wxBoxSizer* bbuttonsSizer;
+	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bbuttonsSizer, 0, 0, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	bMainSizer->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
+	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
+	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
+}
+
+DIALOG_PRINT_FOR_MODEDIT_BASE::~DIALOG_PRINT_FOR_MODEDIT_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnCloseWindow ) );
+	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintSetup ), NULL, this );
+	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_FOR_MODEDIT_BASE::OnButtonCancelClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_print_for_modedit_base.fbp

-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="10" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">res</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file">dialog_print_for_modedit_base</property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="internationalize">1</property>
-        <property name="name">DialogPrintModedit_base</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header"></property>
-        <property name="relative_path">1</property>
-        <property name="skip_python_events">1</property>
-        <property name="use_enum">1</property>
-        <property name="use_microsoft_bom">0</property>
-        <object class="Dialog" expanded="1">
-            <property name="BottomDockable">1</property>
-            <property name="LeftDockable">1</property>
-            <property name="RightDockable">1</property>
-            <property name="TopDockable">1</property>
-            <property name="aui_managed">0</property>
-            <property name="aui_name"></property>
-            <property name="best_size"></property>
-            <property name="bg"></property>
-            <property name="caption"></property>
-            <property name="caption_visible">1</property>
-            <property name="center"></property>
-            <property name="center_pane">0</property>
-            <property name="close_button">1</property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="default_pane">0</property>
-            <property name="dock">Dock</property>
-            <property name="dock_fixed">0</property>
-            <property name="docking">Left</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="extra_style"></property>
-            <property name="fg"></property>
-            <property name="floatable">1</property>
-            <property name="font"></property>
-            <property name="gripper">0</property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="layer"></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">-1,-1</property>
-            <property name="moveable">1</property>
-            <property name="name">DIALOG_PRINT_FOR_MODEDIT_BASE</property>
-            <property name="pane_border">1</property>
-            <property name="pane_position"></property>
-            <property name="pane_size"></property>
-            <property name="pin_button">1</property>
-            <property name="pos"></property>
-            <property name="position"></property>
-            <property name="resize">Resizable</property>
-            <property name="row"></property>
-            <property name="show">1</property>
-            <property name="size">375,254</property>
-            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
-            <property name="subclass"></property>
-            <property name="title">Print</property>
-            <property name="toolbar_pane">0</property>
-            <property name="tooltip"></property>
-            <property name="validator_data_type"></property>
-            <property name="validator_style">wxFILTER_NONE</property>
-            <property name="validator_type">wxDefaultValidator</property>
-            <property name="validator_variable"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose">OnCloseWindow</event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">bMainSizer</property>
-                <property name="orient">wxHORIZONTAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bmiddleLeftSizer</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxRadioBox" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="choices">&quot;fit in page&quot; &quot;Scale 0.5&quot; &quot;Scale 0.7&quot; &quot;Scale 1&quot; &quot;Scale 1.4&quot; &quot;Scale 2&quot; &quot;Scale 3&quot; &quot;Scale 4&quot; &quot;Scale 8&quot; &quot;Scale 16&quot;</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Approx. Scale:</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_ScaleOption</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></property>
-                                <property name="selection">3</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"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRadioBox"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag"></property>
-                    <property name="proportion">1</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bmiddleRightSizer</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxRadioBox" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="choices">&quot;Color&quot; &quot;Black and white&quot;</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_PRINT_MODE</property>
-                                <property name="label">Print Mode</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_ModeColorOption</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></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">Choose if you want to draw the sheet like it appears on screen,&#x0A;or in black and white mode, better to print it 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>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRadioBox"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag"></property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bbuttonsSizer</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default">0</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_PRINT_OPTIONS</property>
-                                <property name="label">Page Options</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_buttonOption</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick">OnPrintSetup</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default">0</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_PREVIEW</property>
-                                <property name="label">Preview</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_buttonPreview</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick">OnPrintPreview</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default">0</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_PRINT_ALL</property>
-                                <property name="label">Print</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_buttonPrint</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick">OnPrintButtonClick</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_name"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default">0</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_CANCEL</property>
-                                <property name="label">Close</property>
-                                <property name="layer"></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="moveable">1</property>
-                                <property name="name">m_buttonQuit</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="position"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="row"></property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick">OnButtonCancelClick</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="11" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_print_for_modedit_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">DialogPrintModedit_base</property>
+        <property name="namespace"></property>
+        <property name="path">.</property>
+        <property name="precompiled_header"></property>
+        <property name="relative_path">1</property>
+        <property name="skip_php_events">1</property>
+        <property name="skip_python_events">1</property>
+        <property name="use_enum">1</property>
+        <property name="use_microsoft_bom">0</property>
+        <object class="Dialog" expanded="1">
+            <property name="BottomDockable">1</property>
+            <property name="LeftDockable">1</property>
+            <property name="RightDockable">1</property>
+            <property name="TopDockable">1</property>
+            <property name="aui_layer"></property>
+            <property name="aui_managed">0</property>
+            <property name="aui_name"></property>
+            <property name="aui_position"></property>
+            <property name="aui_row"></property>
+            <property name="best_size"></property>
+            <property name="bg"></property>
+            <property name="caption"></property>
+            <property name="caption_visible">1</property>
+            <property name="center">wxBOTH</property>
+            <property name="center_pane">0</property>
+            <property name="close_button">1</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="default_pane">0</property>
+            <property name="dock">Dock</property>
+            <property name="dock_fixed">0</property>
+            <property name="docking">Left</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="floatable">1</property>
+            <property name="font"></property>
+            <property name="gripper">0</property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</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">-1,-1</property>
+            <property name="moveable">1</property>
+            <property name="name">DIALOG_PRINT_FOR_MODEDIT_BASE</property>
+            <property name="pane_border">1</property>
+            <property name="pane_position"></property>
+            <property name="pane_size"></property>
+            <property name="pin_button">1</property>
+            <property name="pos"></property>
+            <property name="resize">Resizable</property>
+            <property name="show">1</property>
+            <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">Print</property>
+            <property name="toolbar_pane">0</property>
+            <property name="tooltip"></property>
+            <property name="validator_data_type"></property>
+            <property name="validator_style">wxFILTER_NONE</property>
+            <property name="validator_type">wxDefaultValidator</property>
+            <property name="validator_variable"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose">OnCloseWindow</event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bMainSizer</property>
+                <property name="orient">wxHORIZONTAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bmiddleLeftSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="choices">&quot;fit in page&quot; &quot;Scale 0.5&quot; &quot;Scale 0.7&quot; &quot;Scale 1&quot; &quot;Scale 1.4&quot; &quot;Scale 2&quot; &quot;Scale 3&quot; &quot;Scale 4&quot; &quot;Scale 8&quot; &quot;Scale 16&quot;</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Approx. Scale:</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="moveable">1</property>
+                                <property name="name">m_ScaleOption</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="selection">3</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"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag"></property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bmiddleRightSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="choices">&quot;Color&quot; &quot;Black and white&quot;</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PRINT_MODE</property>
+                                <property name="label">Print Mode</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="moveable">1</property>
+                                <property name="name">m_ModeColorOption</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</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">Choose if you want to draw the sheet like it appears on screen,&#x0A;or in black and white mode, better to print it 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>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag"></property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bbuttonsSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default">0</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PRINT_OPTIONS</property>
+                                <property name="label">Page Options</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="moveable">1</property>
+                                <property name="name">m_buttonOption</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">OnPrintSetup</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default">0</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PREVIEW</property>
+                                <property name="label">Preview</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="moveable">1</property>
+                                <property name="name">m_buttonPreview</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">OnPrintPreview</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default">0</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PRINT_ALL</property>
+                                <property name="label">Print</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="moveable">1</property>
+                                <property name="name">m_buttonPrint</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">OnPrintButtonClick</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default">0</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_CANCEL</property>
+                                <property name="label">Close</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="moveable">1</property>
+                                <property name="name">m_buttonQuit</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">OnButtonCancelClick</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>

pcbnew/dialogs/dialog_print_for_modedit_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_PRINT_FOR_MODEDIT_BASE_H__
-#define __DIALOG_PRINT_FOR_MODEDIT_BASE_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/string.h>
-#include <wx/radiobox.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/sizer.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PRINT_FOR_MODEDIT_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PRINT_FOR_MODEDIT_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			wxID_PRINT_MODE = 1000,
-			wxID_PRINT_OPTIONS,
-			wxID_PRINT_ALL,
-		};
-		
-		wxRadioBox* m_ScaleOption;
-		wxRadioBox* m_ModeColorOption;
-		wxButton* m_buttonOption;
-		wxButton* m_buttonPreview;
-		wxButton* m_buttonPrint;
-		wxButton* m_buttonQuit;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnPrintSetup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrintPreview( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrintButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 375,254 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_PRINT_FOR_MODEDIT_BASE();
-	
-};
-
-#endif //__DIALOG_PRINT_FOR_MODEDIT_BASE_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PRINT_FOR_MODEDIT_BASE_H__
+#define __DIALOG_PRINT_FOR_MODEDIT_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/radiobox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PRINT_FOR_MODEDIT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PRINT_FOR_MODEDIT_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_PRINT_MODE = 1000,
+			wxID_PRINT_OPTIONS,
+			wxID_PRINT_ALL
+		};
+		
+		wxRadioBox* m_ScaleOption;
+		wxRadioBox* m_ModeColorOption;
+		wxButton* m_buttonOption;
+		wxButton* m_buttonPreview;
+		wxButton* m_buttonPrint;
+		wxButton* m_buttonQuit;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnPrintSetup( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintPreview( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PRINT_FOR_MODEDIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_PRINT_FOR_MODEDIT_BASE();
+	
+};
+
+#endif //__DIALOG_PRINT_FOR_MODEDIT_BASE_H__

pcbnew/dialogs/dialog_print_using_printer.cpp

@@ -42,24 +42,28 @@ static wxPageSetupDialogData* s_pageSetupData = (wxPageSetupDialogData*) NULL;
 static PRINT_PARAMETERS  s_Parameters;
 
 
-/* Dialog to print schematic. Class derived from DIALOG_PRINT_USING_PRINTER_base
+/**
+ * Dialog to print schematic. Class derived from DIALOG_PRINT_USING_PRINTER_base
  *  created by wxFormBuilder
  */
 class DIALOG_PRINT_USING_PRINTER : public DIALOG_PRINT_USING_PRINTER_base
 {
-private:
-    PCB_EDIT_FRAME* m_Parent;
-    wxConfig*       m_Config;
-    wxCheckBox*     m_BoxSelectLayer[32];
-    static bool     m_ExcludeEdgeLayer;
-    static wxPoint  s_LastPos;
-    static wxSize   s_LastSize;
-
 public:
     DIALOG_PRINT_USING_PRINTER( PCB_EDIT_FRAME* parent );
-    ~DIALOG_PRINT_USING_PRINTER() {};
+
+    bool IsMirrored() { return m_Print_Mirror->IsChecked(); }
+    bool ExcludeEdges() { return m_Exclude_Edges_Pcb->IsChecked(); }
+    bool PrintUsingSinglePage() { return m_PagesOption->GetSelection(); }
+    int SetLayerMaskFromListSelection();
+
 
 private:
+
+    PCB_EDIT_FRAME* m_parent;
+    wxConfig*       m_config;
+    wxCheckBox*     m_BoxSelectLayer[32];
+    static bool     m_ExcludeEdgeLayer;
+
     void OnCloseWindow( wxCloseEvent& event );
     void OnPageSetup( wxCommandEvent& event );
     void OnPrintPreview( wxCommandEvent& event );
@@ -70,31 +74,13 @@ private:
     void SetPrintParameters( );
     void SetPenWidth();
     void InitValues( );
-
-    bool Show( bool show );     // overload stock function
-
-public:
-    bool IsMirrored() { return m_Print_Mirror->IsChecked(); }
-    bool ExcludeEdges() { return m_Exclude_Edges_Pcb->IsChecked(); }
-    bool PrintUsingSinglePage() { return m_PagesOption->GetSelection(); }
-    int SetLayerMaskFromListSelection();
 };
 
-bool DIALOG_PRINT_USING_PRINTER::m_ExcludeEdgeLayer;
-// We want our dialog to remember its previous screen position
-wxPoint DIALOG_PRINT_USING_PRINTER::s_LastPos( -1, -1 );
-wxSize  DIALOG_PRINT_USING_PRINTER::s_LastSize;
-
 
+bool DIALOG_PRINT_USING_PRINTER::m_ExcludeEdgeLayer;
 
 
-/*******************************************************/
 void PCB_EDIT_FRAME::ToPrinter( wxCommandEvent& event )
-/*******************************************************/
-
-/* Virtual function:
- * Display the print dialog
- */
 {
     const PAGE_INFO& pageInfo = GetPageSettings();
 
@@ -136,13 +122,11 @@ void PCB_EDIT_FRAME::ToPrinter( wxCommandEvent& event )
 }
 
 
-/*************************************************************************************/
 DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( PCB_EDIT_FRAME* parent ) :
     DIALOG_PRINT_USING_PRINTER_base( parent )
-/*************************************************************************************/
 {
-    m_Parent = parent;
-    m_Config = wxGetApp().GetSettings();
+    m_parent = parent;
+    m_config = wxGetApp().GetSettings();
 
     InitValues( );
 
@@ -160,14 +144,11 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( PCB_EDIT_FRAME* parent )
 }
 
 
-/************************************************************************/
 void DIALOG_PRINT_USING_PRINTER::InitValues( )
-/************************************************************************/
 {
-    SetFocus();
     int      layer_max = NB_LAYERS;
     wxString msg;
-    BOARD*   board = m_Parent->GetBoard();
+    BOARD*   board = m_parent->GetBoard();
 
     s_Parameters.m_PageSetupData = s_pageSetupData;
 
@@ -206,7 +187,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
 
         layerKey.Printf( OPTKEY_LAYERBASE, layer );
         bool option;
-        if( m_Config->Read( layerKey, &option ) )
+        if( m_config->Read( layerKey, &option ) )
             m_BoxSelectLayer[layer]->SetValue( option );
         else
         {
@@ -222,15 +203,15 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
     // Read the scale adjust option
     int scale_idx = 4; // default selected scale = ScaleList[4] = 1.000
 
-    if( m_Config )
+    if( m_config )
     {
-        m_Config->Read( OPTKEY_PRINT_X_FINESCALE_ADJ, &s_Parameters.m_XScaleAdjust );
-        m_Config->Read( OPTKEY_PRINT_Y_FINESCALE_ADJ, &s_Parameters.m_YScaleAdjust );
-        m_Config->Read( OPTKEY_PRINT_SCALE, &scale_idx );
-        m_Config->Read( OPTKEY_PRINT_PAGE_FRAME, &s_Parameters.m_Print_Sheet_Ref, 1);
-        m_Config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
+        m_config->Read( OPTKEY_PRINT_X_FINESCALE_ADJ, &s_Parameters.m_XScaleAdjust );
+        m_config->Read( OPTKEY_PRINT_Y_FINESCALE_ADJ, &s_Parameters.m_YScaleAdjust );
+        m_config->Read( OPTKEY_PRINT_SCALE, &scale_idx );
+        m_config->Read( OPTKEY_PRINT_PAGE_FRAME, &s_Parameters.m_Print_Sheet_Ref, 1);
+        m_config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
         int tmp;
-        m_Config->Read( OPTKEY_PRINT_PADS_DRILL,  &tmp, PRINT_PARAMETERS::SMALL_DRILL_SHAPE );
+        m_config->Read( OPTKEY_PRINT_PADS_DRILL,  &tmp, PRINT_PARAMETERS::SMALL_DRILL_SHAPE );
         s_Parameters.m_DrillShapeOpt = (PRINT_PARAMETERS::DrillShapeOptT) tmp;
 
         // Test for a reasonnable scale value. Set to 1 if problem
@@ -252,7 +233,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
             layerKey.Printf( OPTKEY_LAYERBASE, layer );
 
             option = false;
-            if( m_Config->Read( layerKey, &option ) )
+            if( m_config->Read( layerKey, &option ) )
             {
                 m_BoxSelectLayer[layer]->SetValue( option );
                 if( option )
@@ -279,7 +260,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
     s_Parameters.m_PenDefaultSize = g_DrawDefaultLineThickness;
     AddUnitSymbol( *m_TextPenWidth, g_UserUnit );
     m_DialogPenWidth->SetValue(
-        ReturnStringFromValue( g_UserUnit, s_Parameters.m_PenDefaultSize, m_Parent->GetInternalUnits() ) );
+        ReturnStringFromValue( g_UserUnit, s_Parameters.m_PenDefaultSize, m_parent->GetInternalUnits() ) );
 
     // Create scale adjust option
     msg.Printf( wxT( "%f" ), s_Parameters.m_XScaleAdjust );
@@ -296,35 +277,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
 }
 
 
-/*************************************************/
-bool DIALOG_PRINT_USING_PRINTER::Show( bool show )
-/*************************************************/
-{
-    bool ret;
-
-    if( show )
-    {
-        if( s_LastPos.x != -1 )
-        {
-            SetSize( s_LastPos.x, s_LastPos.y, s_LastSize.x, s_LastSize.y, 0 );
-        }
-        ret = DIALOG_PRINT_USING_PRINTER_base::Show( show );
-    }
-    else
-    {
-        // Save the dialog's position before hiding
-        s_LastPos  = GetPosition();
-        s_LastSize = GetSize();
-
-        ret = DIALOG_PRINT_USING_PRINTER_base::Show( show );
-    }
-
-    return ret;
-}
-
-/**************************************************************/
 int DIALOG_PRINT_USING_PRINTER::SetLayerMaskFromListSelection()
-/**************************************************************/
 {
     int page_count;
     int layers_count = NB_LAYERS;
@@ -355,37 +308,35 @@ int DIALOG_PRINT_USING_PRINTER::SetLayerMaskFromListSelection()
 }
 
 
-/********************************************************************/
 void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event )
-/********************************************************************/
 {
     SetPrintParameters();
 
-    if( m_Config )
+    if( m_config )
     {
-        m_Config->Write( OPTKEY_PRINT_X_FINESCALE_ADJ, s_Parameters.m_XScaleAdjust );
-        m_Config->Write( OPTKEY_PRINT_Y_FINESCALE_ADJ, s_Parameters.m_YScaleAdjust );
-        m_Config->Write( OPTKEY_PRINT_SCALE, m_ScaleOption->GetSelection() );
-        m_Config->Write( OPTKEY_PRINT_PAGE_FRAME, s_Parameters.m_Print_Sheet_Ref);
-        m_Config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
-        m_Config->Write( OPTKEY_PRINT_PADS_DRILL, (long) s_Parameters.m_DrillShapeOpt );
+        m_config->Write( OPTKEY_PRINT_X_FINESCALE_ADJ, s_Parameters.m_XScaleAdjust );
+        m_config->Write( OPTKEY_PRINT_Y_FINESCALE_ADJ, s_Parameters.m_YScaleAdjust );
+        m_config->Write( OPTKEY_PRINT_SCALE, m_ScaleOption->GetSelection() );
+        m_config->Write( OPTKEY_PRINT_PAGE_FRAME, s_Parameters.m_Print_Sheet_Ref);
+        m_config->Write( OPTKEY_PRINT_MONOCHROME_MODE, s_Parameters.m_Print_Black_and_White);
+        m_config->Write( OPTKEY_PRINT_PADS_DRILL, (long) s_Parameters.m_DrillShapeOpt );
         wxString layerKey;
         for( int layer = 0; layer < NB_LAYERS;  ++layer )
         {
             if( m_BoxSelectLayer[layer] == NULL )
                 continue;
             layerKey.Printf( OPTKEY_LAYERBASE, layer );
-            m_Config->Write( layerKey, m_BoxSelectLayer[layer]->IsChecked() );
+            m_config->Write( layerKey, m_BoxSelectLayer[layer]->IsChecked() );
         }
     }
     EndModal( 0 );
 }
 
 
-/******************************************************************/
 void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( )
-/******************************************************************/
 {
+    PCB_PLOT_PARAMS plot_opts = m_parent->GetPlotSettings();
+
     s_Parameters.m_PrintMirror = m_Print_Mirror->GetValue();
     s_Parameters.m_Print_Sheet_Ref = m_Print_Sheet_Ref->GetValue();
     s_Parameters.m_Print_Black_and_White =
@@ -397,12 +348,11 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( )
     if( m_PagesOption )
         s_Parameters.m_OptionPrintPage = m_PagesOption->GetSelection() != 0;
 
-
     SetLayerMaskFromListSelection();
 
     int idx = m_ScaleOption->GetSelection();
     s_Parameters.m_PrintScale =  s_ScaleList[idx];
-    g_PcbPlotOptions.m_PlotScale =  s_Parameters.m_PrintScale;
+    plot_opts.m_PlotScale =  s_Parameters.m_PrintScale;
 
     if( m_FineAdjustXscaleOpt )
     {
@@ -419,20 +369,22 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( )
             DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very small value" ) );
         m_FineAdjustYscaleOpt->GetValue().ToDouble( &s_Parameters.m_YScaleAdjust );
     }
-    g_PcbPlotOptions.m_FineScaleAdjustX = s_Parameters.m_XScaleAdjust;
-    g_PcbPlotOptions.m_FineScaleAdjustY = s_Parameters.m_YScaleAdjust;
+
+    plot_opts.m_FineScaleAdjustX = s_Parameters.m_XScaleAdjust;
+    plot_opts.m_FineScaleAdjustY = s_Parameters.m_YScaleAdjust;
+
+    m_parent->SetPlotSettings( plot_opts );
+
     SetPenWidth();
 }
 
 
-/**********************************************/
 void DIALOG_PRINT_USING_PRINTER::SetPenWidth()
-/***********************************************/
 {
     // Get the new pen width value, and verify min et max value
     // NOTE: s_Parameters.m_PenDefaultSize is in internal units
 
-    s_Parameters.m_PenDefaultSize = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->GetInternalUnits() );
+    s_Parameters.m_PenDefaultSize = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_parent->GetInternalUnits() );
 
     if( s_Parameters.m_PenDefaultSize > WIDTH_MAX_VALUE )
     {
@@ -447,7 +399,7 @@ void DIALOG_PRINT_USING_PRINTER::SetPenWidth()
     g_DrawDefaultLineThickness = s_Parameters.m_PenDefaultSize;
 
     m_DialogPenWidth->SetValue(
-        ReturnStringFromValue( g_UserUnit, s_Parameters.m_PenDefaultSize, m_Parent->GetInternalUnits() ) );
+        ReturnStringFromValue( g_UserUnit, s_Parameters.m_PenDefaultSize, m_parent->GetInternalUnits() ) );
 }
 
 void DIALOG_PRINT_USING_PRINTER::OnScaleSelectionClick( wxCommandEvent& event )
@@ -462,9 +414,7 @@ void DIALOG_PRINT_USING_PRINTER::OnScaleSelectionClick( wxCommandEvent& event )
 }
 
 
-/**********************************************************/
 void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )
-/**********************************************************/
 {
     wxPageSetupDialog pageSetupDialog(this, s_pageSetupData);
     pageSetupDialog.ShowModal();
@@ -474,17 +424,15 @@ void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )
 }
 
 
-/************************************************************/
 void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
-/************************************************************/
 {
     SetPrintParameters( );
 
     // Pass two printout objects: for preview, and possible printing.
     wxString        title   = _( "Print Preview" );
     wxPrintPreview* preview =
-        new wxPrintPreview( new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
-                            new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_Parent, title ),
+        new wxPrintPreview( new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_parent, title ),
+                            new BOARD_PRINTOUT_CONTROLER( s_Parameters, m_parent, title ),
                             s_PrintData );
 
     if( preview == NULL )
@@ -504,9 +452,9 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
     }
 
     // Uses the parent position and size.
-    // @todo uses last position and size ans store them when exit in m_Config
-    wxPoint         WPos  = m_Parent->GetPosition();
-    wxSize          WSize = m_Parent->GetSize();
+    // @todo uses last position and size ans store them when exit in m_config
+    wxPoint         WPos  = m_parent->GetPosition();
+    wxSize          WSize = m_parent->GetSize();
 
     wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
 
@@ -515,9 +463,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
 }
 
 
-/***************************************************************************/
 void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event )
-/***************************************************************************/
 {
     SetPrintParameters( );
 
@@ -534,7 +480,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event )
     wxPrinter         printer( &printDialogData );
 
     wxString          title = _( "Print" );
-    BOARD_PRINTOUT_CONTROLER      printout( s_Parameters, m_Parent, title );
+    BOARD_PRINTOUT_CONTROLER      printout( s_Parameters, m_parent, title );
 
     // Alexander's patch had this removed altogether, waiting for testing.
 #if 0 && !defined(__WINDOWS__) && !wxCHECK_VERSION(2,9,0)

pcbnew/dialogs/dialog_print_using_printer_base.cpp

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_print_using_printer_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
-	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticBoxSizer* sbLayersSizer;
-	sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
-	
-	wxBoxSizer* bleftSizer;
-	bleftSizer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_CopperLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers:") ), wxVERTICAL );
-	
-	bleftSizer->Add( m_CopperLayersBoxSizer, 1, wxALL, 5 );
-	
-	m_TechnicalLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Technical Layers:") ), wxVERTICAL );
-	
-	bleftSizer->Add( m_TechnicalLayersBoxSizer, 1, wxALL, 5 );
-	
-	sbLayersSizer->Add( bleftSizer, 1, wxEXPAND, 5 );
-	
-	m_Exclude_Edges_Pcb = new wxCheckBox( this, wxID_ANY, _("Exclude Edges_Pcb Layer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_Exclude_Edges_Pcb->SetToolTip( _("Exclude contents of Edges_Pcb layer from all other layers") );
-	
-	sbLayersSizer->Add( m_Exclude_Edges_Pcb, 0, wxALL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( sbLayersSizer, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bmiddleLeftSizer;
-	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Approx. Scale 1"), _("Accurate Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4") };
-	int m_ScaleOptionNChoices = sizeof( m_ScaleOptionChoices ) / sizeof( wxString );
-	m_ScaleOption = new wxRadioBox( this, wxID_ANY, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionNChoices, m_ScaleOptionChoices, 1, wxRA_SPECIFY_COLS );
-	m_ScaleOption->SetSelection( 4 );
-	bmiddleLeftSizer->Add( m_ScaleOption, 0, wxALL, 5 );
-	
-	m_FineAdjustXscaleTitle = new wxStaticText( this, wxID_ANY, _("X Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_FineAdjustXscaleTitle->Wrap( -1 );
-	bmiddleLeftSizer->Add( m_FineAdjustXscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_FineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_FineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") );
-	
-	bmiddleLeftSizer->Add( m_FineAdjustXscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_FineAdjustYscaleTitle = new wxStaticText( this, wxID_ANY, _("Y Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_FineAdjustYscaleTitle->Wrap( -1 );
-	bmiddleLeftSizer->Add( m_FineAdjustYscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_FineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_FineAdjustYscaleOpt->SetToolTip( _("Set Y scale adjust for exact scale plotting") );
-	
-	bmiddleLeftSizer->Add( m_FineAdjustYscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bMainSizer->Add( bmiddleLeftSizer, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bmiddleRightSizer;
-	bmiddleRightSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbOptionsSizer;
-	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
-	
-	m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default pen size"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_TextPenWidth->Wrap( -1 );
-	m_TextPenWidth->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
-	
-	sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_Print_Sheet_Ref = new wxCheckBox( this, wxID_FRAME_SEL, _("Print frame ref"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_Print_Sheet_Ref->SetValue(true); 
-	m_Print_Sheet_Ref->SetToolTip( _("Print (or not) the Frame references.") );
-	
-	sbOptionsSizer->Add( m_Print_Sheet_Ref, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_Print_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbOptionsSizer->Add( m_Print_Mirror, 0, wxALL, 5 );
-	
-	bmiddleRightSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxALL, 5 );
-	
-	wxString m_Drill_Shape_OptChoices[] = { _("No drill mark"), _("Small mark"), _("Real drill") };
-	int m_Drill_Shape_OptNChoices = sizeof( m_Drill_Shape_OptChoices ) / sizeof( wxString );
-	m_Drill_Shape_Opt = new wxRadioBox( this, wxID_ANY, _("Pads Drill Opt"), wxDefaultPosition, wxDefaultSize, m_Drill_Shape_OptNChoices, m_Drill_Shape_OptChoices, 1, wxRA_SPECIFY_COLS );
-	m_Drill_Shape_Opt->SetSelection( 1 );
-	bmiddleRightSizer->Add( m_Drill_Shape_Opt, 0, wxALL|wxEXPAND, 5 );
-	
-	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
-	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
-	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print 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") );
-	
-	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
-	
-	bMainSizer->Add( bmiddleRightSizer, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bbuttonsSizer;
-	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
-	
-	wxString m_PagesOptionChoices[] = { _("1 Page per Layer"), _("Single page") };
-	int m_PagesOptionNChoices = sizeof( m_PagesOptionChoices ) / sizeof( wxString );
-	m_PagesOption = new wxRadioBox( this, wxID_PAGE_MODE, _("Page Print"), wxDefaultPosition, wxDefaultSize, m_PagesOptionNChoices, m_PagesOptionChoices, 1, wxRA_SPECIFY_COLS );
-	m_PagesOption->SetSelection( 0 );
-	bbuttonsSizer->Add( m_PagesOption, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonQuit->SetDefault(); 
-	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	
-	bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bMainSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bMainSizer );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
-	m_ScaleOption->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );
-	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
-	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
-	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
-	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
-}
-
-DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
-	m_ScaleOption->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );
-	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
-	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
-	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
-	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
-	
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_print_using_printer_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxStaticBoxSizer* sbLayersSizer;
+	sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
+	
+	wxBoxSizer* bleftSizer;
+	bleftSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_CopperLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers:") ), wxVERTICAL );
+	
+	
+	bleftSizer->Add( m_CopperLayersBoxSizer, 1, wxALL, 5 );
+	
+	m_TechnicalLayersBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Technical Layers:") ), wxVERTICAL );
+	
+	
+	bleftSizer->Add( m_TechnicalLayersBoxSizer, 1, wxALL, 5 );
+	
+	
+	sbLayersSizer->Add( bleftSizer, 1, wxEXPAND, 5 );
+	
+	m_Exclude_Edges_Pcb = new wxCheckBox( this, wxID_ANY, _("Exclude Edges_Pcb Layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_Exclude_Edges_Pcb->SetToolTip( _("Exclude contents of Edges_Pcb layer from all other layers") );
+	
+	sbLayersSizer->Add( m_Exclude_Edges_Pcb, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( sbLayersSizer, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bmiddleLeftSizer;
+	bmiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_ScaleOptionChoices[] = { _("fit in page"), _("Scale 0.5"), _("Scale 0.7"), _("Approx. Scale 1"), _("Accurate Scale 1"), _("Scale 1.4"), _("Scale 2"), _("Scale 3"), _("Scale 4") };
+	int m_ScaleOptionNChoices = sizeof( m_ScaleOptionChoices ) / sizeof( wxString );
+	m_ScaleOption = new wxRadioBox( this, wxID_ANY, _("Approx. Scale:"), wxDefaultPosition, wxDefaultSize, m_ScaleOptionNChoices, m_ScaleOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_ScaleOption->SetSelection( 4 );
+	bmiddleLeftSizer->Add( m_ScaleOption, 0, wxALL, 5 );
+	
+	m_FineAdjustXscaleTitle = new wxStaticText( this, wxID_ANY, _("X Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustXscaleTitle->Wrap( -1 );
+	bmiddleLeftSizer->Add( m_FineAdjustXscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_FineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustXscaleOpt->SetToolTip( _("Set X scale adjust for exact scale plotting") );
+	
+	bmiddleLeftSizer->Add( m_FineAdjustXscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_FineAdjustYscaleTitle = new wxStaticText( this, wxID_ANY, _("Y Scale Adjust"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustYscaleTitle->Wrap( -1 );
+	bmiddleLeftSizer->Add( m_FineAdjustYscaleTitle, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_FineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_FineAdjustYscaleOpt->SetToolTip( _("Set Y scale adjust for exact scale plotting") );
+	
+	bmiddleLeftSizer->Add( m_FineAdjustYscaleOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bmiddleLeftSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bmiddleRightSizer;
+	bmiddleRightSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbOptionsSizer;
+	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
+	
+	m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default pen size"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_TextPenWidth->Wrap( -1 );
+	m_TextPenWidth->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
+	
+	sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_Print_Sheet_Ref = new wxCheckBox( this, wxID_FRAME_SEL, _("Print frame ref"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_Print_Sheet_Ref->SetValue(true); 
+	m_Print_Sheet_Ref->SetToolTip( _("Print (or not) the Frame references.") );
+	
+	sbOptionsSizer->Add( m_Print_Sheet_Ref, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_Print_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbOptionsSizer->Add( m_Print_Mirror, 0, wxALL, 5 );
+	
+	
+	bmiddleRightSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxALL, 5 );
+	
+	wxString m_Drill_Shape_OptChoices[] = { _("No drill mark"), _("Small mark"), _("Real drill") };
+	int m_Drill_Shape_OptNChoices = sizeof( m_Drill_Shape_OptChoices ) / sizeof( wxString );
+	m_Drill_Shape_Opt = new wxRadioBox( this, wxID_ANY, _("Pads Drill Opt"), wxDefaultPosition, wxDefaultSize, m_Drill_Shape_OptNChoices, m_Drill_Shape_OptChoices, 1, wxRA_SPECIFY_COLS );
+	m_Drill_Shape_Opt->SetSelection( 1 );
+	bmiddleRightSizer->Add( m_Drill_Shape_Opt, 0, wxALL|wxEXPAND, 5 );
+	
+	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
+	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
+	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print 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") );
+	
+	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bmiddleRightSizer, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bbuttonsSizer;
+	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_PagesOptionChoices[] = { _("1 Page per Layer"), _("Single page") };
+	int m_PagesOptionNChoices = sizeof( m_PagesOptionChoices ) / sizeof( wxString );
+	m_PagesOption = new wxRadioBox( this, wxID_PAGE_MODE, _("Page Print"), wxDefaultPosition, wxDefaultSize, m_PagesOptionNChoices, m_PagesOptionChoices, 1, wxRA_SPECIFY_COLS );
+	m_PagesOption->SetSelection( 0 );
+	bbuttonsSizer->Add( m_PagesOption, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonQuit->SetDefault(); 
+	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	
+	bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	bMainSizer->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
+	m_ScaleOption->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );
+	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
+	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
+}
+
+DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );
+	m_ScaleOption->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );
+	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );
+	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
+	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
+	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_print_using_printer_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_PRINT_USING_PRINTER_BASE_H__
-#define __DIALOG_PRINT_USING_PRINTER_BASE_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/string.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/gdicmn.h>
-#include <wx/checkbox.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/radiobox.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PRINT_USING_PRINTER_base
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PRINT_USING_PRINTER_base : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			wxID_FRAME_SEL = 1000,
-			wxID_PRINT_MODE,
-			wxID_PAGE_MODE,
-			wxID_PRINT_OPTIONS,
-			wxID_PRINT_ALL,
-		};
-		
-		wxStaticBoxSizer* m_CopperLayersBoxSizer;
-		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
-		wxCheckBox* m_Exclude_Edges_Pcb;
-		wxRadioBox* m_ScaleOption;
-		wxStaticText* m_FineAdjustXscaleTitle;
-		wxTextCtrl* m_FineAdjustXscaleOpt;
-		wxStaticText* m_FineAdjustYscaleTitle;
-		wxTextCtrl* m_FineAdjustYscaleOpt;
-		wxStaticText* m_TextPenWidth;
-		wxTextCtrl* m_DialogPenWidth;
-		wxCheckBox* m_Print_Sheet_Ref;
-		wxCheckBox* m_Print_Mirror;
-		wxRadioBox* m_Drill_Shape_Opt;
-		wxRadioBox* m_ModeColorOption;
-		wxRadioBox* m_PagesOption;
-		wxButton* m_buttonOption;
-		wxButton* m_buttonPreview;
-		wxButton* m_buttonPrint;
-		wxButton* m_buttonQuit;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnScaleSelectionClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPageSetup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrintPreview( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPrintButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,315 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_PRINT_USING_PRINTER_base();
-	
-};
-
-#endif //__DIALOG_PRINT_USING_PRINTER_BASE_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 19 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PRINT_USING_PRINTER_BASE_H__
+#define __DIALOG_PRINT_USING_PRINTER_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/gdicmn.h>
+#include <wx/checkbox.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PRINT_USING_PRINTER_base
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PRINT_USING_PRINTER_base : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_FRAME_SEL = 1000,
+			wxID_PRINT_MODE,
+			wxID_PAGE_MODE,
+			wxID_PRINT_OPTIONS,
+			wxID_PRINT_ALL
+		};
+		
+		wxStaticBoxSizer* m_CopperLayersBoxSizer;
+		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;
+		wxCheckBox* m_Exclude_Edges_Pcb;
+		wxRadioBox* m_ScaleOption;
+		wxStaticText* m_FineAdjustXscaleTitle;
+		wxTextCtrl* m_FineAdjustXscaleOpt;
+		wxStaticText* m_FineAdjustYscaleTitle;
+		wxTextCtrl* m_FineAdjustYscaleOpt;
+		wxStaticText* m_TextPenWidth;
+		wxTextCtrl* m_DialogPenWidth;
+		wxCheckBox* m_Print_Sheet_Ref;
+		wxCheckBox* m_Print_Mirror;
+		wxRadioBox* m_Drill_Shape_Opt;
+		wxRadioBox* m_ModeColorOption;
+		wxRadioBox* m_PagesOption;
+		wxButton* m_buttonOption;
+		wxButton* m_buttonPreview;
+		wxButton* m_buttonPrint;
+		wxButton* m_buttonQuit;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnScaleSelectionClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPageSetup( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintPreview( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_PRINT_USING_PRINTER_base();
+	
+};
+
+#endif //__DIALOG_PRINT_USING_PRINTER_BASE_H__

pcbnew/gen_drill_report_files.cpp

@@ -37,6 +37,9 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName,
     wxPoint     offset;
     wxString    msg;
     PLOTTER*    plotter = NULL;
+
+    const PCB_PLOT_PARAMS&  plot_opts = aPcb->GetPlotOptions();
+
     LOCALE_IO   toggle;         // use standard notation for float numbers
 
     // Calculate dimensions and center of PCB
@@ -58,53 +61,53 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName,
         break;
 
     case PLOT_FORMAT_HPGL:  // Scale for HPGL format.
-    {
-        offset.x = 0;
-        offset.y = 0;
-        scale    = 1;
-        HPGL_PLOTTER* hpgl_plotter = new HPGL_PLOTTER;
-        plotter = hpgl_plotter;
-        hpgl_plotter->set_pen_number( g_PcbPlotOptions.m_HPGLPenNum );
-        hpgl_plotter->set_pen_speed( g_PcbPlotOptions.m_HPGLPenSpeed );
-        hpgl_plotter->set_pen_overlap( 0 );
-        plotter->SetPageSettings( aSheet );
-        plotter->set_viewport( offset, scale, 0 );
-    }
-    break;
+        {
+            offset.x = 0;
+            offset.y = 0;
+            scale    = 1;
+            HPGL_PLOTTER* hpgl_plotter = new HPGL_PLOTTER;
+            plotter = hpgl_plotter;
+            hpgl_plotter->set_pen_number( plot_opts.m_HPGLPenNum );
+            hpgl_plotter->set_pen_speed( plot_opts.m_HPGLPenSpeed );
+            hpgl_plotter->set_pen_overlap( 0 );
+            plotter->SetPageSettings( aSheet );
+            plotter->set_viewport( offset, scale, 0 );
+        }
+        break;
 
     case PLOT_FORMAT_POST:
-    {
-        PAGE_INFO   pageA4( wxT( "A4" ) );
-        wxSize      pageSizeIU = pageA4.GetSizeIU();
+        {
+            PAGE_INFO   pageA4( wxT( "A4" ) );
+            wxSize      pageSizeIU = pageA4.GetSizeIU();
 
-        // Keep size for drill legend
-        double Xscale = (double) ( pageSizeIU.x * 0.8 ) / dX;
-        double Yscale = (double) ( pageSizeIU.y * 0.6 ) / dY;
+            // Keep size for drill legend
+            double Xscale = (double) ( pageSizeIU.x * 0.8 ) / dX;
+            double Yscale = (double) ( pageSizeIU.y * 0.6 ) / dY;
 
-        scale = MIN( Xscale, Yscale );
+            scale = MIN( Xscale, Yscale );
 
-        offset.x  = (int) ( (double) BoardCentre.x - ( (double) pageSizeIU.x / 2.0 ) / scale );
-        offset.y  = (int) ( (double) BoardCentre.y - ( (double) pageSizeIU.y / 2.0 ) / scale );
+            offset.x  = (int) ( (double) BoardCentre.x - ( (double) pageSizeIU.x / 2.0 ) / scale );
+            offset.y  = (int) ( (double) BoardCentre.y - ( (double) pageSizeIU.y / 2.0 ) / scale );
 
-        offset.y += pageSizeIU.y / 8;      // offset to legend
-        PS_PLOTTER* ps_plotter = new PS_PLOTTER;
-        plotter = ps_plotter;
-        ps_plotter->SetPageSettings( pageA4 );
-        plotter->set_viewport( offset, scale, 0 );
+            offset.y += pageSizeIU.y / 8;      // offset to legend
+            PS_PLOTTER* ps_plotter = new PS_PLOTTER;
+            plotter = ps_plotter;
+            ps_plotter->SetPageSettings( pageA4 );
+            plotter->set_viewport( offset, scale, 0 );
+        }
         break;
-    }
 
     case PLOT_FORMAT_DXF:
-    {
-        offset.x = 0;
-        offset.y = 0;
-        scale    = 1;
-        DXF_PLOTTER* dxf_plotter = new DXF_PLOTTER;
-        plotter = dxf_plotter;
-        plotter->SetPageSettings( aSheet );
-        plotter->set_viewport( offset, scale, 0 );
+        {
+            offset.x = 0;
+            offset.y = 0;
+            scale    = 1;
+            DXF_PLOTTER* dxf_plotter = new DXF_PLOTTER;
+            plotter = dxf_plotter;
+            plotter->SetPageSettings( aSheet );
+            plotter->set_viewport( offset, scale, 0 );
+        }
         break;
-    }
 
     default:
         wxASSERT( false );
@@ -122,19 +125,19 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName,
         switch( PtStruct->Type() )
         {
         case PCB_LINE_T:
-            PlotDrawSegment( plotter, (DRAWSEGMENT*) PtStruct, EDGE_LAYER, FILLED );
+            PlotDrawSegment( plotter, plot_opts, (DRAWSEGMENT*) PtStruct, EDGE_LAYER, FILLED );
             break;
 
         case PCB_TEXT_T:
-            PlotTextePcb( plotter, (TEXTE_PCB*) PtStruct, EDGE_LAYER, FILLED );
+            PlotTextePcb( plotter, plot_opts, (TEXTE_PCB*) PtStruct, EDGE_LAYER, FILLED );
             break;
 
         case PCB_DIMENSION_T:
-            PlotDimension( plotter, (DIMENSION*) PtStruct, EDGE_LAYER, FILLED );
+            PlotDimension( plotter, plot_opts, (DIMENSION*) PtStruct, EDGE_LAYER, FILLED );
             break;
 
         case PCB_TARGET_T:
-            PlotPcbTarget( plotter, (PCB_TARGET*) PtStruct, EDGE_LAYER, FILLED );
+            PlotPcbTarget( plotter, plot_opts, (PCB_TARGET*) PtStruct, EDGE_LAYER, FILLED );
             break;
 
         case PCB_MARKER_T:     // do not draw
@@ -182,7 +185,7 @@ void GenDrillMapFile( BOARD* aPcb, FILE* aFile, const wxString& aFullFileName,
 
         plotY += intervalle;
 
-        plot_diam = (int) ( aToolListBuffer[ii].m_Diameter );
+        plot_diam = (int) aToolListBuffer[ii].m_Diameter;
         x = (int) ( (double) plotX - 200.0 * CharScale - (double)plot_diam / 2.0 );
         y = (int) ( (double) plotY + (double) CharSize * CharScale );
         plotter->marker( wxPoint( x, y ), plot_diam, ii );

pcbnew/gen_modules_placefile.cpp

@@ -59,32 +59,35 @@ public:
     int           m_Layer;          // its side (LAYER_N_BACK, or LAYER_N_FRONT)
 };
 
-/*
+
+/**
  * The dialog to create footprint position files,
  * and choose options (one or 2 files, units and force all SMD footprints in list)
  */
 class DIALOG_GEN_MODULE_POSITION : public DIALOG_GEN_MODULE_POSITION_BASE
 {
-private:
-    PCB_EDIT_FRAME* m_parent;
-	static int m_unitsOpt;
-	static int m_fileOpt;
-
 public:
-    DIALOG_GEN_MODULE_POSITION( PCB_EDIT_FRAME * parent):
-        DIALOG_GEN_MODULE_POSITION_BASE( parent )
+    DIALOG_GEN_MODULE_POSITION( PCB_EDIT_FRAME * aParent ):
+        DIALOG_GEN_MODULE_POSITION_BASE( aParent ),
+        m_parent( aParent ),
+        m_plotOpts( aParent->GetPlotSettings() )
     {
-        m_parent = parent;
     }
 
 private:
-	void OnInitDialog( wxInitDialogEvent& event );
-	void OnOutputDirectoryBrowseClicked( wxCommandEvent& event );
-	void OnCancelButton( wxCommandEvent& event )
+    PCB_EDIT_FRAME* m_parent;
+    PCB_PLOT_PARAMS m_plotOpts;
+
+    static int m_unitsOpt;
+    static int m_fileOpt;
+
+    void OnInitDialog( wxInitDialogEvent& event );
+    void OnOutputDirectoryBrowseClicked( wxCommandEvent& event );
+    void OnCancelButton( wxCommandEvent& event )
     {
         EndModal( wxID_CANCEL );
     }
-	void OnOKButton( wxCommandEvent& event );
+    void OnOKButton( wxCommandEvent& event );
 
     bool CreateFiles();
 
@@ -115,6 +118,7 @@ private:
     }
 };
 
+
 // Static members to remember choices
 int DIALOG_GEN_MODULE_POSITION::m_unitsOpt = 0;
 int DIALOG_GEN_MODULE_POSITION::m_fileOpt = 0;
@@ -122,7 +126,7 @@ int DIALOG_GEN_MODULE_POSITION::m_fileOpt = 0;
 void DIALOG_GEN_MODULE_POSITION::OnInitDialog( wxInitDialogEvent& event )
 {
     // Output directory
-    m_outputDirectoryName->SetValue( g_PcbPlotOptions.GetOutputDirectory() );
+    m_outputDirectoryName->SetValue( m_plotOpts.GetOutputDirectory() );
     m_radioBoxUnits->SetSelection( m_unitsOpt );
     m_radioBoxFilesCount->SetSelection( m_fileOpt );
 
@@ -176,11 +180,15 @@ void DIALOG_GEN_MODULE_POSITION::OnOKButton( wxCommandEvent& event )
     wxString dirStr;
     dirStr = m_outputDirectoryName->GetValue();
     dirStr.Replace( wxT( "\\" ), wxT( "/" ) );
-    g_PcbPlotOptions.SetOutputDirectory( dirStr );
+
+    m_plotOpts.SetOutputDirectory( dirStr );
+
+    m_parent->SetPlotSettings( m_plotOpts );
 
     CreateFiles();
 }
 
+
 bool DIALOG_GEN_MODULE_POSITION::CreateFiles()
 {
     BOARD * brd = m_parent->GetBoard();

pcbnew/gendrill.cpp

@@ -116,20 +116,20 @@ void DIALOG_GENDRILL::GenDrillAndReportFiles()
 
     UpdateConfig(); // set params and Save drill options
 
-    m_Parent->ClearMsgPanel();
+    m_parent->ClearMsgPanel();
 
     if( m_microViasCount || m_blindOrBuriedViasCount )
         hasBuriedVias = true;
 
     for( ; ; )
     {
-        Build_Holes_List( m_Parent->GetBoard(), s_HoleListBuffer,
+        Build_Holes_List( m_parent->GetBoard(), s_HoleListBuffer,
                           s_ToolListBuffer, layer1, layer2,
                           gen_through_holes ? false : true, gen_NPTH_holes );
 
         if( s_ToolListBuffer.size() > 0 ) //  holes?
         {
-            fn = m_Parent->GetScreen()->GetFileName();
+            fn = m_parent->GetScreen()->GetFileName();
             layer_extend.Empty();
 
             if( gen_NPTH_holes )
@@ -169,7 +169,7 @@ void DIALOG_GENDRILL::GenDrillAndReportFiles()
                 return;
             }
 
-            EXCELLON_WRITER excellonWriter( m_Parent->GetBoard(),
+            EXCELLON_WRITER excellonWriter( m_parent->GetBoard(),
                                             aFile, m_FileDrillOffset,
                                             &s_HoleListBuffer, &s_ToolListBuffer );
             excellonWriter.SetFormat( !m_UnitDrillIsInch,
@@ -226,7 +226,7 @@ void DIALOG_GENDRILL::GenDrillAndReportFiles()
                 layer1++;
                 layer2++;                      // use next layer pair
 
-                if( layer2 == m_Parent->GetBoard()->GetCopperLayerCount() - 1 )
+                if( layer2 == m_parent->GetBoard()->GetCopperLayerCount() - 1 )
                     layer2 = LAYER_N_FRONT;         // the last layer is always the
                                                     // component layer
             }
@@ -237,7 +237,7 @@ void DIALOG_GENDRILL::GenDrillAndReportFiles()
 
     if( m_Choice_Drill_Report->GetSelection() > 0 )
     {
-        fn = m_Parent->GetScreen()->GetFileName();
+        fn = m_parent->GetScreen()->GetFileName();
         GenDrillReport( fn.GetFullName() );
     }
 
@@ -628,10 +628,10 @@ void DIALOG_GENDRILL::GenDrillMap( const wxString           aFileName,
         return;
     }
 
-    GenDrillMapFile( m_Parent->GetBoard(),
+    GenDrillMapFile( m_parent->GetBoard(),
                      plotfile,
                      dlg.GetPath(),
-                     m_Parent->GetPageSettings(),
+                     m_parent->GetPageSettings(),
                      s_HoleListBuffer,
                      s_ToolListBuffer,
                      m_UnitDrillIsInch,
@@ -667,8 +667,8 @@ void DIALOG_GENDRILL::GenDrillReport( const wxString aFileName )
         return;
     }
 
-    GenDrillReportFile( report_dest, m_Parent->GetBoard(),
-                        m_Parent->GetScreen()->GetFileName(),
+    GenDrillReportFile( report_dest, m_parent->GetBoard(),
+                        m_parent->GetScreen()->GetFileName(),
                         m_UnitDrillIsInch,
                         s_HoleListBuffer,
                         s_ToolListBuffer );

pcbnew/ioascii.cpp

@@ -355,11 +355,12 @@ int PCB_BASE_FRAME::ReadSetup( LINE_READER* aReader )
 
         if( strnicmp( line, "PcbPlotParams", 13 ) == 0 )
         {
+            PCB_PLOT_PARAMS plot_opts;
             PCB_PLOT_PARAMS_PARSER parser( &line[13], aReader->GetSource() );
 
             try
             {
-                g_PcbPlotOptions.Parse( &parser );
+                plot_opts.Parse( &parser );
             }
             catch( IO_ERROR& e )
             {
@@ -370,6 +371,8 @@ int PCB_BASE_FRAME::ReadSetup( LINE_READER* aReader )
                 wxMessageBox( msg, _( "Open Board File" ), wxOK | wxICON_ERROR );
             }
 
+            GetBoard()->SetPlotOptions( plot_opts );
+
             continue;
         }
 
@@ -801,7 +804,7 @@ static int WriteSetup( FILE* aFile, PCB_EDIT_FRAME* aFrame, BOARD* aBoard )
 
     STRING_FORMATTER sf;
 
-    g_PcbPlotOptions.Format( &sf, 0 );
+    aBoard->GetPlotOptions().Format( &sf, 0 );
 
     wxString record = FROM_UTF8( sf.GetString().c_str() );
     record.Replace( wxT("\n"), wxT(""), true );

pcbnew/kicad_plugin.cpp

@@ -573,8 +573,13 @@ void KICAD_PLUGIN::loadSETUP()
 
         if( TESTLINE( "PcbPlotParams" ) )
         {
+            PCB_PLOT_PARAMS plot_opts;
+
             PCB_PLOT_PARAMS_PARSER parser( line + SZ( "PcbPlotParams" ), m_reader->GetSource() );
-            g_PcbPlotOptions.Parse( &parser );
+
+            plot_opts.Parse( &parser );
+
+            m_board->SetPlotOptions( plot_opts );
         }
 
         else if( TESTLINE( "AuxiliaryAxisOrg" ) )
@@ -2906,11 +2911,10 @@ void KICAD_PLUGIN::saveSETUP() const
 
     fprintf( m_fp, "AuxiliaryAxisOrg %s\n", fmtBIUPoint( m_board->GetOriginAxisPosition() ).c_str() );
 
-    /* @todo no globals
     {
         STRING_FORMATTER sf;
 
-        g_PcbPlotOptions.Format( &sf, 0 );
+        m_board->GetPlotOptions().Format( &sf, 0 );
 
         wxString record = FROM_UTF8( sf.GetString().c_str() );
 
@@ -2919,7 +2923,6 @@ void KICAD_PLUGIN::saveSETUP() const
 
         fprintf( m_fp, "PcbPlotParams %s\n", TO_UTF8( record ) );
     }
-    */
 
     fprintf( m_fp, "VisibleElements %X\n", bds.GetVisibleElements() );
 

pcbnew/module_editor_frame.h

@@ -6,6 +6,7 @@
 #ifndef MODULE_EDITOR_FRAME_H_
 #define MODULE_EDITOR_FRAME_H_
 
+#include <wxBasePcbFrame.h>
 
 class FOOTPRINT_EDIT_FRAME : public PCB_BASE_FRAME
 {
@@ -20,9 +21,12 @@ public:
 
     ~FOOTPRINT_EDIT_FRAME();
 
-    BOARD_DESIGN_SETTINGS& GetDesignSettings() const;       // overload PCB_BASE_FRAME, get parent's
+    BOARD_DESIGN_SETTINGS& GetDesignSettings() const;           // overload PCB_BASE_FRAME, get parent's
     void SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSettings );  // overload
 
+    const PCB_PLOT_PARAMS& GetPlotSettings() const;             // overload PCB_BASE_FRAME, get parent's
+    void SetPlotSettings( const PCB_PLOT_PARAMS& aSettings );   // overload
+
     void InstallOptionsFrame( const wxPoint& pos );
 
     void OnCloseWindow( wxCloseEvent& Event );

pcbnew/moduleframe.cpp

@@ -265,6 +265,30 @@ void FOOTPRINT_EDIT_FRAME::SetDesignSettings( const BOARD_DESIGN_SETTINGS& aSett
 }
 
 
+const PCB_PLOT_PARAMS& FOOTPRINT_EDIT_FRAME::GetPlotSettings() const
+{
+    // get the settings from the parent editor, not our BOARD.
+
+    PCB_BASE_FRAME* parentFrame = (PCB_BASE_FRAME*) GetParent();
+
+    wxASSERT( parentFrame );
+
+    return parentFrame->GetPlotSettings();
+}
+
+
+void FOOTPRINT_EDIT_FRAME::SetPlotSettings( const PCB_PLOT_PARAMS& aSettings )
+{
+    // set the settings into parent editor, not our BOARD.
+
+    PCB_BASE_FRAME* parentFrame = (PCB_BASE_FRAME*) GetParent();
+
+    wxASSERT( parentFrame );
+
+    parentFrame->SetPlotSettings( aSettings );
+}
+
+
 void FOOTPRINT_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
 {
     if( GetScreen()->IsModify() )

pcbnew/pcb_plot_params.cpp

@@ -41,9 +41,14 @@
 #define HPGL_PEN_OVERLAY_MIN      0
 #define HPGL_PEN_OVERLAY_MAX      0x100
 
-extern int g_DrawDefaultLineThickness;
 
-PCB_PLOT_PARAMS g_PcbPlotOptions;
+/**
+ * Default line thickness in PCnew units used to draw or plot items having a
+ * default thickness line value (Frame references) (i.e. = 0 ).
+ * 0 = single pixel line width.
+ */
+int g_DrawDefaultLineThickness = 60;
+
 
 using namespace PCBPLOTPARAMS_T;
 
@@ -109,7 +114,7 @@ PCB_PLOT_PARAMS::PCB_PLOT_PARAMS()
 
 
 void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
-                              int aNestLevel ) const throw( IO_ERROR )
+                              int aNestLevel, int aControl ) const throw( IO_ERROR )
 {
     const char* falseStr = getTokenName( T_false );
     const char* trueStr = getTokenName( T_true );

pcbnew/pcb_plot_params.h

@@ -28,6 +28,8 @@
 #include <base_struct.h>
 
 class PCB_PLOT_PARAMS_PARSER;
+class LINE_READER;
+
 
 /**
  * Class PCB_PLOT_PARAMS
@@ -99,7 +101,7 @@ private:
 public:
     PCB_PLOT_PARAMS();
 
-    void        Format( OUTPUTFORMATTER* aFormatter, int aNestLevel ) const throw( IO_ERROR );
+    void        Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl=0 ) const throw( IO_ERROR );
     void        Parse( PCB_PLOT_PARAMS_PARSER* aParser ) throw( IO_ERROR, PARSE_ERROR );
 
     bool        operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const;
@@ -157,6 +159,12 @@ public:
 };
 
 
-extern PCB_PLOT_PARAMS g_PcbPlotOptions;
+/**
+ * Default line thickness in PCnew units used to draw or plot items having a
+ * default thickness line value (Frame references) (i.e. = 0 ).
+ * 0 = single pixel line width.
+ */
+extern int g_DrawDefaultLineThickness;
+
 
 #endif // PCB_PLOT_PARAMS_H_

pcbnew/pcbframe.cpp

@@ -54,8 +54,6 @@
 #include <dialog_helpers.h>
 
 
-extern int g_DrawDefaultLineThickness;
-
 // Keys used in read/write config
 #define OPTKEY_DEFAULT_LINEWIDTH_VALUE  wxT( "PlotLineWidth" )
 #define PCB_SHOW_FULL_RATSNET_OPT   wxT( "PcbFulRatsnest" )

pcbnew/pcbnew.cpp

@@ -49,10 +49,6 @@
 
 // Colors for layers and items
 COLORS_DESIGN_SETTINGS g_ColorsSettings;
-int g_DrawDefaultLineThickness = 60; /* Default line thickness in PCnew units used to draw
-                                      * or plot items having a default thickness line value
-                                      * (Frame references) (i.e. = 0 ). 0 = single pixel line
-                                      * width */
 
 bool           Drc_On = true;
 bool           g_AutoDeleteOldTrack = true;

pcbnew/pcbplot.cpp

@@ -21,7 +21,7 @@
 #include <dialog_plot_base.h>
 #include <pcb_plot_params.h>
 
-/* Keywords to r/w options in m_Config */
+/* Keywords to r/w options in m_config */
 #define CONFIG_XFINESCALE_ADJ    wxT( "PlotXFineScaleAdj" )
 #define CONFIG_YFINESCALE_ADJ    wxT( "PlotYFineScaleAdj" )
 #define CONFIG_PS_FINEWIDTH_ADJ  wxT( "PSPlotFineWidthAdj" )
@@ -30,8 +30,6 @@
 #define MIN_SCALE 0.01
 #define MAX_SCALE 100.0
 
-extern int g_DrawDefaultLineThickness;
-
 
 static bool setDouble( double* aDouble, double aValue, double aMin, double aMax )
 {
@@ -51,28 +49,30 @@ static bool setDouble( double* aDouble, double aValue, double aMin, double aMax
 }
 
 
-/*******************************/
-/* Dialog box for plot control */
-/*******************************/
 
+/**
+ * Class DIALOG_PLOT
+ *
+ */
 class DIALOG_PLOT : public DIALOG_PLOT_BASE
 {
-private:
-    PCB_EDIT_FRAME*  m_Parent;
-    wxConfig*        m_Config;
-    std::vector<int> layerList;               // List to hold CheckListBox layer numbers
-    double           m_XScaleAdjust;
-    double           m_YScaleAdjust;
-    double           m_PSWidthAdjust;         // Global width correction for exact width postscript output.
-    double           m_WidthAdjustMinValue;   // Global width correction
-    double           m_WidthAdjustMaxValue;   // margins.
-    static wxPoint   prevPosition;            // Dialog position & size
-    static wxSize    prevSize;
-
 public:
     DIALOG_PLOT( PCB_EDIT_FRAME* parent );
 
+
 private:
+    PCB_EDIT_FRAME*     m_parent;
+    BOARD*              m_board;
+    wxConfig*           m_config;
+    std::vector<int>    layerList;               // List to hold CheckListBox layer numbers
+    double              m_XScaleAdjust;
+    double              m_YScaleAdjust;
+    double              m_PSWidthAdjust;         // Global width correction for exact width postscript output.
+    double              m_WidthAdjustMinValue;   // Global width correction
+    double              m_WidthAdjustMaxValue;   // margins.
+
+    PCB_PLOT_PARAMS     m_plotOpts;
+
     void Init_Dialog();
     void Plot( wxCommandEvent& event );
     void OnQuit( wxCommandEvent& event );
@@ -85,27 +85,20 @@ private:
 };
 
 
-wxPoint DIALOG_PLOT::prevPosition( -1, -1 );
-wxSize DIALOG_PLOT::prevSize;
-
 const int UNITS_MILS = 1000;
 
-
-DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* parent ) :
-    DIALOG_PLOT_BASE( parent )
+DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
+    DIALOG_PLOT_BASE( aParent ),
+    m_parent( aParent ),
+    m_board( aParent->GetBoard() ),
+    m_plotOpts( aParent->GetPlotSettings() )
 {
-    m_Parent = parent;
-    m_Config = wxGetApp().GetSettings();
+    m_config = wxGetApp().GetSettings();
 
     Init_Dialog();
 
     GetSizer()->Fit( this );
     GetSizer()->SetSizeHints( this );
-
-    if( prevPosition.x != -1 )
-        SetSize( prevPosition.x, prevPosition.y, prevSize.x, prevSize.y );
-    else
-        Center();
 }
 
 
@@ -114,42 +107,40 @@ void DIALOG_PLOT::Init_Dialog()
     wxString   msg;
     wxFileName fileName;
 
-    BOARD*     board = m_Parent->GetBoard();
-
-    m_Config->Read( CONFIG_XFINESCALE_ADJ, &m_XScaleAdjust );
-    m_Config->Read( CONFIG_YFINESCALE_ADJ, &m_YScaleAdjust );
-    m_Config->Read( CONFIG_PS_FINEWIDTH_ADJ, &m_PSWidthAdjust);
+    m_config->Read( CONFIG_XFINESCALE_ADJ, &m_XScaleAdjust );
+    m_config->Read( CONFIG_YFINESCALE_ADJ, &m_YScaleAdjust );
+    m_config->Read( CONFIG_PS_FINEWIDTH_ADJ, &m_PSWidthAdjust);
 
     // The reasonable width correction value must be in a range of
     // [-(MinTrackWidth-1), +(MinClearanceValue-1)] decimils.
-    m_WidthAdjustMinValue = -(board->GetDesignSettings().m_TrackMinWidth - 1);
-    m_WidthAdjustMaxValue = board->GetSmallestClearanceValue() - 1;
+    m_WidthAdjustMinValue = -(m_board->GetDesignSettings().m_TrackMinWidth - 1);
+    m_WidthAdjustMaxValue = m_board->GetSmallestClearanceValue() - 1;
 
-    m_plotFormatOpt->SetSelection( g_PcbPlotOptions.GetPlotFormat() );
+    m_plotFormatOpt->SetSelection( m_plotOpts.GetPlotFormat() );
 
     // Set units and value for HPGL pen size.
     AddUnitSymbol( *m_textPenSize, g_UserUnit );
-    msg = ReturnStringFromValue( g_UserUnit, g_PcbPlotOptions.GetHpglPenDiameter(), UNITS_MILS );
+    msg = ReturnStringFromValue( g_UserUnit, m_plotOpts.GetHpglPenDiameter(), UNITS_MILS );
     m_HPGLPenSizeOpt->AppendText( msg );
 
     // Set units to cm/s for standard HPGL pen speed.
-    msg = ReturnStringFromValue( UNSCALED_UNITS, g_PcbPlotOptions.GetHpglPenSpeed(), 1 );
+    msg = ReturnStringFromValue( UNSCALED_UNITS, m_plotOpts.GetHpglPenSpeed(), 1 );
     m_HPGLPenSpeedOpt->AppendText( msg );
 
     // Set units and value for HPGL pen overlay.
     AddUnitSymbol( *m_textPenOvr, g_UserUnit );
-    msg = ReturnStringFromValue( g_UserUnit, g_PcbPlotOptions.GetHpglPenOverlay(), UNITS_MILS );
+    msg = ReturnStringFromValue( g_UserUnit, m_plotOpts.GetHpglPenOverlay(), UNITS_MILS );
     m_HPGLPenOverlayOpt->AppendText( msg );
 
     AddUnitSymbol( *m_textDefaultPenSize, g_UserUnit );
-    msg = ReturnStringFromValue( g_UserUnit, g_PcbPlotOptions.GetPlotLineWidth(),
+    msg = ReturnStringFromValue( g_UserUnit, m_plotOpts.GetPlotLineWidth(),
                                  PCB_INTERNAL_UNIT );
     m_linesWidth->AppendText( msg );
 
     // Set units for PS global width correction.
     AddUnitSymbol( *m_textPSFineAdjustWidth, g_UserUnit );
 
-    m_useAuxOriginCheckBox->SetValue( g_PcbPlotOptions.GetUseAuxOrigin() );
+    m_useAuxOriginCheckBox->SetValue( m_plotOpts.GetUseAuxOrigin() );
 
     // Test for a reasonable scale value. Set to 1 if problem
     if( m_XScaleAdjust < MIN_SCALE || m_YScaleAdjust < MIN_SCALE
@@ -169,8 +160,8 @@ void DIALOG_PLOT::Init_Dialog()
     msg.Printf( wxT( "%f" ), To_User_Unit( g_UserUnit, m_PSWidthAdjust, PCB_INTERNAL_UNIT ) );
     m_PSFineAdjustWidthOpt->AppendText( msg );
 
-    m_plotPSNegativeOpt->SetValue( g_PcbPlotOptions.m_PlotPSNegative );
-    m_forcePSA4OutputOpt->SetValue( g_PcbPlotOptions.GetPsA4Output() );
+    m_plotPSNegativeOpt->SetValue( m_plotOpts.m_PlotPSNegative );
+    m_forcePSA4OutputOpt->SetValue( m_plotOpts.GetPsA4Output() );
 
     //  List layers in same order than in setup layers dialog
     // (Front or Top to Back or Bottom)
@@ -183,28 +174,28 @@ void DIALOG_PLOT::Init_Dialog()
 
         wxASSERT( layer < NB_LAYERS );
 
-        if( !board->IsLayerEnabled( layer ) )
+        if( !m_board->IsLayerEnabled( layer ) )
             continue;
 
         layerList.push_back( layer );
-        checkIndex = m_layerCheckListBox->Append( board->GetLayerName( layer ) );
+        checkIndex = m_layerCheckListBox->Append( m_board->GetLayerName( layer ) );
 
-        if( g_PcbPlotOptions.GetLayerSelection() & ( 1 << layer ) )
+        if( m_plotOpts.GetLayerSelection() & ( 1 << layer ) )
             m_layerCheckListBox->Check( checkIndex );
     }
 
     // Option for using proper Gerber extensions
-    m_useGerberExtensions->SetValue( g_PcbPlotOptions.GetUseGerberExtensions() );
+    m_useGerberExtensions->SetValue( m_plotOpts.GetUseGerberExtensions() );
 
     // Option for excluding contents of "Edges Pcb" layer
-    m_excludeEdgeLayerOpt->SetValue( g_PcbPlotOptions.m_ExcludeEdgeLayer );
+    m_excludeEdgeLayerOpt->SetValue( m_plotOpts.m_ExcludeEdgeLayer );
 
-    m_subtractMaskFromSilk->SetValue( g_PcbPlotOptions.GetSubtractMaskFromSilk() );
+    m_subtractMaskFromSilk->SetValue( m_plotOpts.GetSubtractMaskFromSilk() );
 
     // Option to plot page references:
-    if( m_Parent->GetPrintBorderAndTitleBlock() )
+    if( m_parent->GetPrintBorderAndTitleBlock() )
     {
-        m_plotSheetRef->SetValue( g_PcbPlotOptions.m_PlotFrameRef );
+        m_plotSheetRef->SetValue( m_plotOpts.m_PlotFrameRef );
     }
     else
     {
@@ -213,39 +204,36 @@ void DIALOG_PLOT::Init_Dialog()
     }
 
     // Option to plot pads on silkscreen layers or all layers
-    m_plotPads_on_Silkscreen->SetValue( g_PcbPlotOptions.m_PlotPadsOnSilkLayer );
+    m_plotPads_on_Silkscreen->SetValue( m_plotOpts.m_PlotPadsOnSilkLayer );
 
     // Options to plot texts on footprints
-    m_plotModuleValueOpt->SetValue( g_PcbPlotOptions.m_PlotValue );
-    m_plotModuleRefOpt->SetValue( g_PcbPlotOptions.m_PlotReference );
-    m_plotTextOther->SetValue( g_PcbPlotOptions.m_PlotTextOther );
-    m_plotInvisibleText->SetValue( g_PcbPlotOptions.m_PlotInvisibleTexts );
+    m_plotModuleValueOpt->SetValue( m_plotOpts.m_PlotValue );
+    m_plotModuleRefOpt->SetValue( m_plotOpts.m_PlotReference );
+    m_plotTextOther->SetValue( m_plotOpts.m_PlotTextOther );
+    m_plotInvisibleText->SetValue( m_plotOpts.m_PlotInvisibleTexts );
 
     // Options to plot pads and vias holes
-    m_drillShapeOpt->SetSelection( g_PcbPlotOptions.m_DrillShapeOpt );
+    m_drillShapeOpt->SetSelection( m_plotOpts.m_DrillShapeOpt );
 
     // Scale option
-    m_scaleOpt->SetSelection( g_PcbPlotOptions.GetScaleSelection() );
+    m_scaleOpt->SetSelection( m_plotOpts.GetScaleSelection() );
 
     // Plot mode
-    m_plotModeOpt->SetSelection( g_PcbPlotOptions.m_PlotMode );
+    m_plotModeOpt->SetSelection( m_plotOpts.m_PlotMode );
 
     // Plot mirror option
-    m_plotMirrorOpt->SetValue( g_PcbPlotOptions.m_PlotMirror );
+    m_plotMirrorOpt->SetValue( m_plotOpts.m_PlotMirror );
 
     // Put vias on mask layer
-    m_plotNoViaOnMaskOpt->SetValue( g_PcbPlotOptions.m_PlotViaOnMaskLayer );
+    m_plotNoViaOnMaskOpt->SetValue( m_plotOpts.m_PlotViaOnMaskLayer );
 
     // Output directory
-    m_outputDirectoryName->SetValue( g_PcbPlotOptions.GetOutputDirectory() );
+    m_outputDirectoryName->SetValue( m_plotOpts.GetOutputDirectory() );
 
     // Update options values:
     wxCommandEvent cmd_event;
     SetPlotFormat( cmd_event );
     OnSetScaleOpt( cmd_event );
-
-    // without this line, the ESC key does not work
-    SetFocus();
 }
 
 
@@ -257,17 +245,14 @@ void DIALOG_PLOT::OnQuit( wxCommandEvent& event )
 
 void DIALOG_PLOT::OnClose( wxCloseEvent& event )
 {
-    prevPosition = GetPosition();
-    prevSize = GetSize();
     applyPlotSettings();
-
     EndModal( 0 );
 }
 
 
 void DIALOG_PLOT::CreateDrillFile( wxCommandEvent& event )
 {
-    ( (PCB_EDIT_FRAME*) m_Parent )->InstallDrillFrame( event );
+    ( (PCB_EDIT_FRAME*) m_parent )->InstallDrillFrame( event );
 }
 
 
@@ -307,7 +292,7 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
                             wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
 
     if( dialog.ShowModal() == wxID_YES ) {
-        wxString boardFilePath = ( (wxFileName) m_Parent->GetScreen()->GetFileName()).GetPath();
+        wxString boardFilePath = ( (wxFileName) m_parent->GetScreen()->GetFileName()).GetPath();
 
         if( !dirName.MakeRelativeTo( boardFilePath ) )
             wxMessageBox( _( "Cannot make path relative (target volume different from board file volume)!" ),
@@ -525,7 +510,7 @@ void DIALOG_PLOT::applyPlotSettings()
         m_messagesBox->AppendText( msg );
     }
 
-    m_Config->Write( CONFIG_XFINESCALE_ADJ, m_XScaleAdjust );
+    m_config->Write( CONFIG_XFINESCALE_ADJ, m_XScaleAdjust );
 
     // Y scale
     msg = m_fineAdjustYscaleOpt->GetValue();
@@ -539,7 +524,7 @@ void DIALOG_PLOT::applyPlotSettings()
         m_messagesBox->AppendText( msg );
     }
 
-    m_Config->Write( CONFIG_YFINESCALE_ADJ, m_YScaleAdjust );
+    m_config->Write( CONFIG_YFINESCALE_ADJ, m_YScaleAdjust );
 
     // PS Width correction
     msg = m_PSFineAdjustWidthOpt->GetValue();
@@ -558,7 +543,7 @@ void DIALOG_PLOT::applyPlotSettings()
         m_messagesBox->AppendText( msg );
     }
 
-    m_Config->Write( CONFIG_PS_FINEWIDTH_ADJ, m_PSWidthAdjust );
+    m_config->Write( CONFIG_PS_FINEWIDTH_ADJ, m_PSWidthAdjust );
 
     tempOptions.SetUseGerberExtensions( m_useGerberExtensions->GetValue() );
 
@@ -583,10 +568,11 @@ void DIALOG_PLOT::applyPlotSettings()
     dirStr.Replace( wxT( "\\" ), wxT( "/" ) );
     tempOptions.SetOutputDirectory( dirStr );
 
-    if( g_PcbPlotOptions != tempOptions )
+    if( m_plotOpts != tempOptions )
     {
-        g_PcbPlotOptions = tempOptions;
-        m_Parent->OnModify();
+        m_parent->SetPlotSettings( tempOptions );
+        m_plotOpts = tempOptions;
+        m_parent->OnModify();
     }
 }
 
@@ -597,13 +583,11 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
     wxFileName fn;
     wxString   ext;
 
-    BOARD*     board = m_Parent->GetBoard();
-
     applyPlotSettings();
 
     // Create output directory if it does not exist
-    wxFileName outputDir = wxFileName::DirName( g_PcbPlotOptions.GetOutputDirectory() );
-    wxString boardFilePath = ( (wxFileName) m_Parent->GetScreen()->GetFileName()).GetPath();
+    wxFileName outputDir = wxFileName::DirName( m_plotOpts.GetOutputDirectory() );
+    wxString boardFilePath = ( (wxFileName) m_parent->GetScreen()->GetFileName()).GetPath();
 
     if( !outputDir.MakeAbsolute( boardFilePath ) )
     {
@@ -631,28 +615,28 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
         }
     }
 
-    g_PcbPlotOptions.m_AutoScale = false;
-    g_PcbPlotOptions.m_PlotScale = 1;
+    m_plotOpts.m_AutoScale = false;
+    m_plotOpts.m_PlotScale = 1;
 
-    switch( g_PcbPlotOptions.GetScaleSelection() )
+    switch( m_plotOpts.GetScaleSelection() )
     {
     default:
         break;
 
     case 0:
-        g_PcbPlotOptions.m_AutoScale = true;
+        m_plotOpts.m_AutoScale = true;
         break;
 
     case 2:
-        g_PcbPlotOptions.m_PlotScale = 1.5;
+        m_plotOpts.m_PlotScale = 1.5;
         break;
 
     case 3:
-        g_PcbPlotOptions.m_PlotScale = 2;
+        m_plotOpts.m_PlotScale = 2;
         break;
 
     case 4:
-        g_PcbPlotOptions.m_PlotScale = 3;
+        m_plotOpts.m_PlotScale = 3;
         break;
     }
 
@@ -662,22 +646,22 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
      * settings resulting in a divide by zero fault.
      */
     if( m_fineAdjustXscaleOpt->IsEnabled()  && m_XScaleAdjust != 0.0 )
-        g_PcbPlotOptions.m_FineScaleAdjustX = m_XScaleAdjust;
+        m_plotOpts.m_FineScaleAdjustX = m_XScaleAdjust;
 
     if( m_fineAdjustYscaleOpt->IsEnabled() && m_YScaleAdjust != 0.0 )
-        g_PcbPlotOptions.m_FineScaleAdjustY = m_YScaleAdjust;
+        m_plotOpts.m_FineScaleAdjustY = m_YScaleAdjust;
 
     if( m_PSFineAdjustWidthOpt->IsEnabled() )
-        g_PcbPlotOptions.m_FineWidthAdjust = m_PSWidthAdjust;
+        m_plotOpts.m_FineWidthAdjust = m_PSWidthAdjust;
 
-    switch( g_PcbPlotOptions.GetPlotFormat() )
+    switch( m_plotOpts.GetPlotFormat() )
     {
     case PLOT_FORMAT_POST:
         ext = wxT( "ps" );
         break;
 
     case PLOT_FORMAT_GERBER:
-        g_PcbPlotOptions.m_PlotScale = 1.0; // No scale option allowed in gerber format
+        m_plotOpts.m_PlotScale = 1.0; // No scale option allowed in gerber format
         ext = wxT( "pho" );
         break;
 
@@ -686,39 +670,41 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
         break;
 
     case PLOT_FORMAT_DXF:
-        g_PcbPlotOptions.m_PlotScale = 1.0;
+        m_plotOpts.m_PlotScale = 1.0;
         ext = wxT( "dxf" );
         break;
     }
 
     // Test for a reasonable scale value
-    if( g_PcbPlotOptions.m_PlotScale < MIN_SCALE )
+    if( m_plotOpts.m_PlotScale < MIN_SCALE )
         DisplayInfoMessage( this,
                             _( "Warning: Scale option set to a very small value" ) );
 
-    if( g_PcbPlotOptions.m_PlotScale > MAX_SCALE )
+    if( m_plotOpts.m_PlotScale > MAX_SCALE )
         DisplayInfoMessage( this,
                             _( "Warning: Scale option set to a very large value" ) );
 
+    m_parent->SetPlotSettings( m_plotOpts );
+
     long layerMask = 1;
 
     for( layer = 0; layer < NB_LAYERS; layer++, layerMask <<= 1 )
     {
         bool success = false;
 
-        if( g_PcbPlotOptions.GetLayerSelection() & layerMask )
+        if( m_plotOpts.GetLayerSelection() & layerMask )
         {
-            fn = m_Parent->GetScreen()->GetFileName();
+            fn = m_parent->GetScreen()->GetFileName();
             fn.SetPath( outputDir.GetPath() );
 
             // Create file name.
-            wxString layername = board->GetLayerName( layer );
+            wxString layername = m_board->GetLayerName( layer );
             layername.Trim( true ); layername.Trim( false );    // remove leading and trailing spaces if any
             fn.SetName( fn.GetName() + wxT( "-" ) + layername );
 
             // Use Gerber Extensions based on layer number
             // (See http://en.wikipedia.org/wiki/Gerber_File)
-            if( ( g_PcbPlotOptions.GetPlotFormat() == PLOT_FORMAT_GERBER )
+            if( ( m_plotOpts.GetPlotFormat() == PLOT_FORMAT_GERBER )
                 && m_useGerberExtensions->GetValue() )
             {
                 switch( layer )
@@ -799,28 +785,28 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
                 fn.SetExt( ext );
             }
 
-            switch( g_PcbPlotOptions.GetPlotFormat() )
+            switch( m_plotOpts.GetPlotFormat() )
             {
             case PLOT_FORMAT_POST:
-                success = m_Parent->ExportToPostScriptFile( fn.GetFullPath(), layer,
-                                                            g_PcbPlotOptions.GetPsA4Output(),
-                                                            g_PcbPlotOptions.m_PlotMode );
+                success = m_parent->ExportToPostScriptFile( fn.GetFullPath(), layer,
+                                                            m_plotOpts.GetPsA4Output(),
+                                                            m_plotOpts.m_PlotMode );
                 break;
 
             case PLOT_FORMAT_GERBER:
-                success = m_Parent->ExportToGerberFile( fn.GetFullPath(), layer,
-                                                        g_PcbPlotOptions.GetUseAuxOrigin(),
-                                                        g_PcbPlotOptions.m_PlotMode );
+                success = m_parent->ExportToGerberFile( fn.GetFullPath(), layer,
+                                                        m_plotOpts.GetUseAuxOrigin(),
+                                                        m_plotOpts.m_PlotMode );
                 break;
 
             case PLOT_FORMAT_HPGL:
-                success = m_Parent->ExportToHpglFile( fn.GetFullPath(), layer,
-                                                      g_PcbPlotOptions.m_PlotMode );
+                success = m_parent->ExportToHpglFile( fn.GetFullPath(), layer,
+                                                      m_plotOpts.m_PlotMode );
                 break;
 
             case PLOT_FORMAT_DXF:
-                success = m_Parent->ExportToDxfFile( fn.GetFullPath(), layer,
-                                                     g_PcbPlotOptions.m_PlotMode );
+                success = m_parent->ExportToDxfFile( fn.GetFullPath(), layer,
+                                                     m_plotOpts.m_PlotMode );
                 break;
             }
 
@@ -839,7 +825,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
 
     // If no layer selected, we have nothing plotted.
     // Prompt user if it happens because he could think there is a bug in Pcbnew.
-    if( !g_PcbPlotOptions.GetLayerSelection() )
+    if( !m_plotOpts.GetLayerSelection() )
         DisplayError( this, _( "No layer selected" ) );
 }
 

pcbnew/pcbplot.h

@@ -2,10 +2,10 @@
  * @file pcbnew/pcbplot.h
  */
 
-#ifndef PCBPLOT_H
-#define PCBPLOT_H
+#ifndef PCBPLOT_H_
+#define PCBPLOT_H_
 
-#include "pcb_plot_params.h"
+#include <pcb_plot_params.h>
 
 
 class PLOTTER;
@@ -29,36 +29,34 @@ class ZONE_CONTAINER;
 
 // Conversion unit constants.
 // Convert pcb dimension of 0.1 mil to PS units of inches.
-#define SCALE_PS .0001
+#define SCALE_PS    .0001
+
 // Convert dimension 0.1 mil -> HPGL units:
-#define SCALE_HPGL 0.102041
+#define SCALE_HPGL  0.102041
 
 // Small drill marks diameter value (in internal value = 1/10000 inch)
 #define SMALL_DRILL 150
 
 
-void PlotTextePcb( PLOTTER* plotter, TEXTE_PCB* pt_texte, int masque_layer,
+void PlotTextePcb( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, TEXTE_PCB* pt_texte, int masque_layer,
                    EDA_DRAW_MODE_T trace_mode );
 
-/* Plat PCB text type, ie other than text on modules
- * prepare the plot settings of text */
-void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* PtSegm, int masque_layer,
+void PlotDrawSegment( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWSEGMENT* PtSegm, int masque_layer,
                       EDA_DRAW_MODE_T trace_mode );
 
-void PlotDimension( PLOTTER* plotter, DIMENSION* Dimension, int masque_layer,
+void PlotDimension( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, DIMENSION* Dimension, int masque_layer,
                     EDA_DRAW_MODE_T trace_mode );
 
-void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* PtMire, int masque_layer,
+void PlotPcbTarget( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, PCB_TARGET* PtMire, int masque_layer,
                     EDA_DRAW_MODE_T trace_mode );
 
-void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* PtEdge,
+void Plot_1_EdgeModule( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, EDGE_MODULE* PtEdge,
                         EDA_DRAW_MODE_T trace_mode, int masque_layer );
 
-void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone,
+void PlotFilledAreas( PLOTTER* plotter, const PCB_PLOT_PARAMS& aPlotOpts, ZONE_CONTAINER* aZone,
                       EDA_DRAW_MODE_T trace_mode );
 
 // PLOTGERB.CPP
 void SelectD_CODE_For_LineDraw( PLOTTER* plotter, int aSize );
 
-
-#endif // #define PCBPLOT_H
+#endif // PCBPLOT_H_

pcbnew/plot_rtn.cpp

@@ -27,19 +27,21 @@
 #include <pcbnew.h>
 #include <pcbplot.h>
 
-static void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask,
-                                EDA_DRAW_MODE_T trace_mode );
-static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte,
-                            EDA_DRAW_MODE_T trace_mode );
+static void Plot_Edges_Modules( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts,
+                BOARD* pcb, int aLayerMask, EDA_DRAW_MODE_T trace_mode );
+
+static void PlotTextModule( PLOTTER* aPlotter, TEXTE_MODULE* pt_texte, EDA_DRAW_MODE_T trace_mode );
 
 
 /* Creates the plot for silkscreen layers
  */
-void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_MODE_T trace_mode )
+void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* aPlotter, int aLayerMask, EDA_DRAW_MODE_T trace_mode )
 {
     bool          trace_val, trace_ref;
     TEXTE_MODULE* pt_texte;
 
+    const PCB_PLOT_PARAMS&  plot_opts = GetPlotSettings();
+
     // Plot edge layer and graphic items
 
     for( EDA_ITEM*  item = m_Pcb->m_Drawings;  item;  item = item->Next() )
@@ -47,19 +49,19 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_
         switch( item->Type() )
         {
         case PCB_LINE_T:
-            PlotDrawSegment( plotter, (DRAWSEGMENT*) item, aLayerMask, trace_mode );
+            PlotDrawSegment( aPlotter, plot_opts, (DRAWSEGMENT*) item, aLayerMask, trace_mode );
             break;
 
         case PCB_TEXT_T:
-            PlotTextePcb( plotter, (TEXTE_PCB*) item, aLayerMask, trace_mode );
+            PlotTextePcb( aPlotter, plot_opts, (TEXTE_PCB*) item, aLayerMask, trace_mode );
             break;
 
         case PCB_DIMENSION_T:
-            PlotDimension( plotter, (DIMENSION*) item, aLayerMask, trace_mode );
+            PlotDimension( aPlotter, plot_opts, (DIMENSION*) item, aLayerMask, trace_mode );
             break;
 
         case PCB_TARGET_T:
-            PlotPcbTarget( plotter, (PCB_TARGET*) item, aLayerMask, trace_mode );
+            PlotPcbTarget( aPlotter, plot_opts, (PCB_TARGET*) item, aLayerMask, trace_mode );
             break;
 
         case PCB_MARKER_T:
@@ -72,13 +74,13 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_
     }
 
     // Plot footprint outlines :
-    Plot_Edges_Modules( plotter, m_Pcb, aLayerMask, trace_mode );
+    Plot_Edges_Modules( aPlotter, plot_opts, m_Pcb, aLayerMask, trace_mode );
 
     // Plot pads (creates pads outlines, for pads on silkscreen layers)
     int layersmask_plotpads = aLayerMask;
     // Calculate the mask layers of allowed layers for pads
 
-    if( !g_PcbPlotOptions.m_PlotPadsOnSilkLayer )       // Do not plot pads on silk screen layers
+    if( !plot_opts.m_PlotPadsOnSilkLayer )       // Do not plot pads on silk screen layers
         layersmask_plotpads &= ~(SILKSCREEN_LAYER_BACK | SILKSCREEN_LAYER_FRONT );
 
     if( layersmask_plotpads )
@@ -96,24 +98,24 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_
                 switch( pad->GetShape() )
                 {
                 case PAD_CIRCLE:
-                    plotter->flash_pad_circle( shape_pos, pad->GetSize().x, LINE );
+                    aPlotter->flash_pad_circle( shape_pos, pad->GetSize().x, LINE );
                     break;
 
                 case PAD_OVAL:
-                    plotter->flash_pad_oval( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE );
+                    aPlotter->flash_pad_oval( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE );
                     break;
 
                 case PAD_TRAPEZOID:
                     {
                         wxPoint coord[4];
                         pad->BuildPadPolygon( coord, wxSize(0,0), 0 );
-                        plotter->flash_pad_trapez( shape_pos, coord, pad->GetOrientation(), LINE );
+                        aPlotter->flash_pad_trapez( shape_pos, coord, pad->GetOrientation(), LINE );
                     }
                     break;
 
                 case PAD_RECT:
                 default:
-                    plotter->flash_pad_rect( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE );
+                    aPlotter->flash_pad_rect( shape_pos, pad->GetSize(), pad->GetOrientation(), LINE );
                     break;
                 }
             }
@@ -121,13 +123,13 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_
     }
 
     // Plot footprints fields (ref, value ...)
-    for( MODULE* Module = m_Pcb->m_Modules; Module; Module = Module->Next() )
+    for( MODULE* module = m_Pcb->m_Modules;  module;  module = module->Next() )
     {
         // see if we want to plot VALUE and REF fields
-        trace_val = g_PcbPlotOptions.m_PlotValue;
-        trace_ref = g_PcbPlotOptions.m_PlotReference;
+        trace_val = plot_opts.m_PlotValue;
+        trace_ref = plot_opts.m_PlotReference;
 
-        TEXTE_MODULE* text = Module->m_Reference;
+        TEXTE_MODULE* text = module->m_Reference;
         unsigned      textLayer = text->GetLayer();
 
         if( textLayer >= 32 )
@@ -136,7 +138,7 @@ void PCB_BASE_FRAME::PlotSilkScreen( PLOTTER* plotter, int aLayerMask, EDA_DRAW_
 
             errMsg.Printf( _( "Your BOARD has a bad layer number of %u for \
 module\n %s's \"reference\" text." ),
-                           textLayer, GetChars( Module->GetReference() ) );
+                           textLayer, GetChars( module->GetReference() ) );
             DisplayError( this, errMsg );
             return;
         }
@@ -144,10 +146,10 @@ module\n %s's \"reference\" text." ),
         if( ( ( 1 << textLayer ) & aLayerMask ) == 0 )
             trace_ref = false;
 
-        if( !text->IsVisible() && !g_PcbPlotOptions.m_PlotInvisibleTexts )
+        if( !text->IsVisible() && !plot_opts.m_PlotInvisibleTexts )
             trace_ref = false;
 
-        text = Module->m_Value;
+        text = module->m_Value;
         textLayer = text->GetLayer();
 
         if( textLayer > 32 )
@@ -156,7 +158,7 @@ module\n %s's \"reference\" text." ),
 
             errMsg.Printf( _( "Your BOARD has a bad layer number of %u for \
 module\n %s's \"value\" text." ),
-                           textLayer, GetChars( Module->GetReference() ) );
+                           textLayer, GetChars( module->GetReference() ) );
             DisplayError( this, errMsg );
             return;
         }
@@ -164,27 +166,27 @@ module\n %s's \"value\" text." ),
         if( ( (1 << textLayer) & aLayerMask ) == 0 )
             trace_val = false;
 
-        if( !text->IsVisible() && !g_PcbPlotOptions.m_PlotInvisibleTexts )
+        if( !text->IsVisible() && !plot_opts.m_PlotInvisibleTexts )
             trace_val = false;
 
         // Plot text fields, if allowed
         if( trace_ref )
-            PlotTextModule( plotter, Module->m_Reference, trace_mode );
+            PlotTextModule( aPlotter, module->m_Reference, trace_mode );
 
         if( trace_val )
-            PlotTextModule( plotter, Module->m_Value, trace_mode );
+            PlotTextModule( aPlotter, module->m_Value, trace_mode );
 
-        for( pt_texte = (TEXTE_MODULE*) Module->m_Drawings.GetFirst();
+        for( pt_texte = (TEXTE_MODULE*) module->m_Drawings.GetFirst();
              pt_texte != NULL;
              pt_texte = pt_texte->Next() )
         {
             if( pt_texte->Type() != PCB_MODULE_TEXT_T )
                 continue;
 
-            if( !g_PcbPlotOptions.m_PlotTextOther )
+            if( !plot_opts.m_PlotTextOther )
                 continue;
 
-            if( !pt_texte->IsVisible() && !g_PcbPlotOptions.m_PlotInvisibleTexts )
+            if( !pt_texte->IsVisible() && !plot_opts.m_PlotInvisibleTexts )
                 continue;
 
             textLayer = pt_texte->GetLayer();
@@ -195,7 +197,7 @@ module\n %s's \"value\" text." ),
 
                 errMsg.Printf( _( "Your BOARD has a bad layer number of %u \
 for module\n %s's \"module text\" text of %s." ),
-                               textLayer, GetChars( Module->GetReference() ),
+                               textLayer, GetChars( module->GetReference() ),
                                GetChars( pt_texte->m_Text ) );
                 DisplayError( this, errMsg );
                 return;
@@ -204,7 +206,7 @@ for module\n %s's \"module text\" text of %s." ),
             if( !( ( 1 << textLayer ) & aLayerMask ) )
                 continue;
 
-            PlotTextModule( plotter, pt_texte, trace_mode );
+            PlotTextModule( aPlotter, pt_texte, trace_mode );
         }
     }
 
@@ -216,7 +218,7 @@ for module\n %s's \"module text\" text of %s." ),
         if( ( ( 1 << edge_zone->GetLayer() ) & aLayerMask ) == 0 )
             continue;
 
-        PlotFilledAreas( plotter, edge_zone, trace_mode );
+        PlotFilledAreas( aPlotter, plot_opts, edge_zone, trace_mode );
     }
 
     // Plot segments used to fill zone areas (outdated, but here for old boards
@@ -226,12 +228,12 @@ for module\n %s's \"module text\" text of %s." ),
         if( ( ( 1 << seg->GetLayer() ) & aLayerMask ) == 0 )
             continue;
 
-        plotter->thick_segment( seg->m_Start, seg->m_End, seg->m_Width, trace_mode );
+        aPlotter->thick_segment( seg->m_Start, seg->m_End, seg->m_Width, trace_mode );
     }
 }
 
 
-static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte, EDA_DRAW_MODE_T trace_mode )
+static void PlotTextModule( PLOTTER* aPlotter, TEXTE_MODULE* pt_texte, EDA_DRAW_MODE_T trace_mode )
 {
     wxSize  size;
     wxPoint pos;
@@ -257,7 +259,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte, EDA_DRAW_M
     // So we set bold flag to true
     bool allow_bold = pt_texte->m_Bold || thickness;
 
-    plotter->text( pos, BLACK,
+    aPlotter->text( pos, BLACK,
                    pt_texte->m_Text,
                    orient, size,
                    pt_texte->m_HJustify, pt_texte->m_VJustify,
@@ -265,7 +267,7 @@ static void PlotTextModule( PLOTTER* plotter, TEXTE_MODULE* pt_texte, EDA_DRAW_M
 }
 
 
-void PlotDimension( PLOTTER* plotter, DIMENSION* aDim, int aLayerMask,
+void PlotDimension( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DIMENSION* aDim, int aLayerMask,
                     EDA_DRAW_MODE_T trace_mode )
 {
     if( (GetLayerMask( aDim->GetLayer() ) & aLayerMask) == 0 )
@@ -276,39 +278,39 @@ void PlotDimension( PLOTTER* plotter, DIMENSION* aDim, int aLayerMask,
     draw.SetWidth( (trace_mode==LINE) ? -1 : aDim->GetWidth() );
     draw.SetLayer( aDim->GetLayer() );
 
-    PlotTextePcb( plotter, &aDim->m_Text, aLayerMask, trace_mode );
+    PlotTextePcb( aPlotter, aPlotOpts, &aDim->m_Text, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_crossBarOx, aDim->m_crossBarOy ));
     draw.SetEnd(   wxPoint( aDim->m_crossBarFx, aDim->m_crossBarFy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_featureLineGOx, aDim->m_featureLineGOy ));
     draw.SetEnd(   wxPoint( aDim->m_featureLineGFx, aDim->m_featureLineGFy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_featureLineDOx, aDim->m_featureLineDOy ));
     draw.SetEnd(   wxPoint( aDim->m_featureLineDFx, aDim->m_featureLineDFy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_arrowD1Ox, aDim->m_arrowD1Oy ));
     draw.SetEnd(   wxPoint( aDim->m_arrowD1Fx, aDim->m_arrowD1Fy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_arrowD2Ox, aDim->m_arrowD2Oy ));
     draw.SetEnd(   wxPoint( aDim->m_arrowD2Fx, aDim->m_arrowD2Fy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_arrowG1Ox, aDim->m_arrowG1Oy ));
     draw.SetEnd(   wxPoint( aDim->m_arrowG1Fx, aDim->m_arrowG1Fy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( aDim->m_arrowG2Ox, aDim->m_arrowG2Oy ));
     draw.SetEnd(   wxPoint( aDim->m_arrowG2Fx, aDim->m_arrowG2Fy ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 }
 
 
-void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* aMire, int aLayerMask,
+void PlotPcbTarget( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, PCB_TARGET* aMire, int aLayerMask,
                     EDA_DRAW_MODE_T trace_mode )
 {
     int     dx1, dx2, dy1, dy2, radius;
@@ -324,7 +326,7 @@ void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* aMire, int aLayerMask,
 
     draw.SetStart( aMire->GetPosition() );
     draw.SetEnd( wxPoint( draw.GetStart().x + ( aMire->GetSize() / 4 ), draw.GetStart().y ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetShape( S_SEGMENT );
 
@@ -345,18 +347,18 @@ void PlotPcbTarget( PLOTTER* plotter, PCB_TARGET* aMire, int aLayerMask,
 
     draw.SetStart( wxPoint( mirePos.x - dx1, mirePos.y - dy1 ));
     draw.SetEnd(   wxPoint( mirePos.x + dx1, mirePos.y + dy1 ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 
     draw.SetStart( wxPoint( mirePos.x - dx2, mirePos.y - dy2 ));
     draw.SetEnd(   wxPoint( mirePos.x + dx2, mirePos.y + dy2 ));
-    PlotDrawSegment( plotter, &draw, aLayerMask, trace_mode );
+    PlotDrawSegment( aPlotter, aPlotOpts, &draw, aLayerMask, trace_mode );
 }
 
 
 // Plot footprints graphic items (outlines)
-void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask, EDA_DRAW_MODE_T trace_mode )
+void Plot_Edges_Modules( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, BOARD* aPcb, int aLayerMask, EDA_DRAW_MODE_T trace_mode )
 {
-    for( MODULE* module = pcb->m_Modules; module; module = module->Next() )
+    for( MODULE* module = aPcb->m_Modules;  module;  module = module->Next() )
     {
         for( EDGE_MODULE* edge = (EDGE_MODULE*) module->m_Drawings.GetFirst();
              edge;
@@ -368,14 +370,15 @@ void Plot_Edges_Modules( PLOTTER* plotter, BOARD* pcb, int aLayerMask, EDA_DRAW_
             if( ( GetLayerMask( edge->GetLayer() ) & aLayerMask ) == 0 )
                 continue;
 
-            Plot_1_EdgeModule( plotter, edge, trace_mode, aLayerMask );
+            Plot_1_EdgeModule( aPlotter, aPlotOpts, edge, trace_mode, aLayerMask );
         }
     }
 }
 
 
 //* Plot a graphic item (outline) relative to a footprint
-void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T trace_mode, int masque_layer )
+void Plot_1_EdgeModule( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts,
+        EDGE_MODULE* aEdge, EDA_DRAW_MODE_T trace_mode, int masque_layer )
 {
     int     type_trace;         // Type of item to plot.
     int     thickness;          // Segment thickness.
@@ -393,13 +396,13 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T tr
     switch( type_trace )
     {
     case S_SEGMENT:
-        plotter->thick_segment( pos, end, thickness, trace_mode );
+        aPlotter->thick_segment( pos, end, thickness, trace_mode );
         break;
 
     case S_CIRCLE:
         radius = (int) hypot( (double) ( end.x - pos.x ),
                               (double) ( end.y - pos.y ) );
-        plotter->thick_circle( pos, radius * 2, thickness, trace_mode );
+        aPlotter->thick_circle( pos, radius * 2, thickness, trace_mode );
         break;
 
     case S_ARC:
@@ -411,16 +414,16 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T tr
 
             double endAngle = startAngle + aEdge->GetAngle();
 
-            if ( ( g_PcbPlotOptions.GetPlotFormat() == PLOT_FORMAT_DXF ) &&
+            if ( ( aPlotOpts.GetPlotFormat() == PLOT_FORMAT_DXF ) &&
                ( masque_layer & ( SILKSCREEN_LAYER_BACK | DRAW_LAYER | COMMENT_LAYER ) ) )
-                plotter->thick_arc( pos,
+                aPlotter->thick_arc( pos,
                                 -startAngle,
                                 -endAngle,
                                 radius,
                                 thickness,
                                 trace_mode );
             else
-                plotter->thick_arc( pos,
+                aPlotter->thick_arc( pos,
                                 -endAngle,
                                 -startAngle,
                                 radius,
@@ -457,7 +460,7 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T tr
                 cornerList.push_back( corner );
             }
 
-            plotter->PlotPoly( cornerList, FILLED_SHAPE, thickness );
+            aPlotter->PlotPoly( cornerList, FILLED_SHAPE, thickness );
         }
         break;
     }
@@ -465,7 +468,7 @@ void Plot_1_EdgeModule( PLOTTER* plotter, EDGE_MODULE* aEdge, EDA_DRAW_MODE_T tr
 
 
 // Plot a PCB Text, i;e. a text found on a copper or technical layer
-void PlotTextePcb( PLOTTER* plotter, TEXTE_PCB* pt_texte, int aLayerMask,
+void PlotTextePcb( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, TEXTE_PCB* pt_texte, int aLayerMask,
                    EDA_DRAW_MODE_T trace_mode )
 {
     int     orient, thickness;
@@ -504,7 +507,7 @@ void PlotTextePcb( PLOTTER* plotter, TEXTE_PCB* pt_texte, int aLayerMask,
         for( unsigned i = 0; i < list->Count(); i++ )
         {
             wxString txt = list->Item( i );
-            plotter->text( pos, BLACK,
+            aPlotter->text( pos, BLACK,
                            txt,
                            orient, size,
                            pt_texte->m_HJustify, pt_texte->m_VJustify,
@@ -512,11 +515,11 @@ void PlotTextePcb( PLOTTER* plotter, TEXTE_PCB* pt_texte, int aLayerMask,
             pos += offset;
         }
 
-        delete (list);
+        delete list;
     }
     else
     {
-        plotter->text( pos, BLACK,
+        aPlotter->text( pos, BLACK,
                        pt_texte->m_Text,
                        orient, size,
                        pt_texte->m_HJustify, pt_texte->m_VJustify,
@@ -527,7 +530,7 @@ void PlotTextePcb( PLOTTER* plotter, TEXTE_PCB* pt_texte, int aLayerMask,
 
 /* Plot areas (given by .m_FilledPolysList member) in a zone
  */
-void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T trace_mode )
+void PlotFilledAreas( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T trace_mode )
 {
     unsigned        imax = aZone->m_FilledPolysList.size();
 
@@ -563,7 +566,7 @@ void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T t
                 // Plot the current filled area polygon
                 if( aZone->m_FillMode == 0 )    // We are using solid polygons
                 {                               // (if != 0: using segments )
-                    plotter->PlotPoly( cornerList, FILLED_SHAPE );
+                    aPlotter->PlotPoly( cornerList, FILLED_SHAPE );
                 }
                 else                            // We are using areas filled by
                 {                               // segments: plot them )
@@ -571,7 +574,7 @@ void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T t
                     {
                         wxPoint start = aZone->m_FillSegmList[iseg].m_Start;
                         wxPoint end   = aZone->m_FillSegmList[iseg].m_End;
-                        plotter->thick_segment( start,
+                        aPlotter->thick_segment( start,
                                                 end,
                                                 aZone->m_ZoneMinThickness,
                                                 trace_mode );
@@ -580,19 +583,19 @@ void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T t
 
                 // Plot the current filled area outline
                 if( aZone->m_ZoneMinThickness > 0 )
-                    plotter->PlotPoly( cornerList, NO_FILL, aZone->m_ZoneMinThickness );
+                    aPlotter->PlotPoly( cornerList, NO_FILL, aZone->m_ZoneMinThickness );
             }
             else
             {
                 if( aZone->m_ZoneMinThickness > 0 )
                 {
                     for( unsigned jj = 1; jj<cornerList.size(); jj++ )
-                        plotter->thick_segment( cornerList[jj -1], cornerList[jj],
+                        aPlotter->thick_segment( cornerList[jj -1], cornerList[jj],
                                                 ( trace_mode == LINE ) ? -1 : aZone->m_ZoneMinThickness,
                                                 trace_mode );
                 }
 
-                plotter->set_current_line_width( -1 );
+                aPlotter->set_current_line_width( -1 );
             }
 
             cornerList.clear();
@@ -603,7 +606,7 @@ void PlotFilledAreas( PLOTTER* plotter, ZONE_CONTAINER* aZone, EDA_DRAW_MODE_T t
 
 /* Plot items type DRAWSEGMENT on layers allowed by aLayerMask
  */
-void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* aSeg, int aLayerMask,
+void PlotDrawSegment( PLOTTER* aPlotter, const PCB_PLOT_PARAMS& aPlotOpts, DRAWSEGMENT* aSeg, int aLayerMask,
                       EDA_DRAW_MODE_T trace_mode )
 {
     int     thickness;
@@ -613,21 +616,21 @@ void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* aSeg, int aLayerMask,
         return;
 
     if( trace_mode == LINE )
-        thickness = g_PcbPlotOptions.m_PlotLineWidth;
+        thickness = aPlotOpts.m_PlotLineWidth;
     else
         thickness = aSeg->GetWidth();
 
     wxPoint start( aSeg->GetStart() );
     wxPoint end(   aSeg->GetEnd() );
 
-    plotter->set_current_line_width( thickness );
+    aPlotter->set_current_line_width( thickness );
 
     switch( aSeg->GetShape() )
     {
     case S_CIRCLE:
         radius = (int) hypot( (double) ( end.x - start.x ),
                               (double) ( end.y - start.y ) );
-        plotter->thick_circle( start, radius * 2, thickness, trace_mode );
+        aPlotter->thick_circle( start, radius * 2, thickness, trace_mode );
         break;
 
     case S_ARC:
@@ -635,7 +638,7 @@ void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* aSeg, int aLayerMask,
                               (double) ( end.y - start.y ) );
         StAngle  = ArcTangente( end.y - start.y, end.x - start.x );
         EndAngle = StAngle + aSeg->GetAngle();
-        plotter->thick_arc( start, -EndAngle, -StAngle, radius, thickness, trace_mode );
+        aPlotter->thick_arc( start, -EndAngle, -StAngle, radius, thickness, trace_mode );
         break;
 
     case S_CURVE:
@@ -643,7 +646,7 @@ void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* aSeg, int aLayerMask,
             const std::vector<wxPoint>& bezierPoints = aSeg->GetBezierPoints();
 
             for( unsigned i = 1; i < bezierPoints.size(); i++ )
-                plotter->thick_segment( bezierPoints[i - 1],
+                aPlotter->thick_segment( bezierPoints[i - 1],
                                         bezierPoints[i],
                                         thickness,
                                         trace_mode );
@@ -651,18 +654,20 @@ void PlotDrawSegment( PLOTTER* plotter, DRAWSEGMENT* aSeg, int aLayerMask,
         break;
 
     default:
-        plotter->thick_segment( start, end, thickness, trace_mode );
+        aPlotter->thick_segment( start, end, thickness, trace_mode );
     }
 }
 
 
-void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, EDA_DRAW_MODE_T trace_mode )
+void PCB_BASE_FRAME::Plot_Layer( PLOTTER* aPlotter, int Layer, EDA_DRAW_MODE_T trace_mode )
 {
+    const PCB_PLOT_PARAMS& plot_opts = GetPlotSettings();
+
     // Specify that the contents of the "Edges Pcb" layer are to be plotted
     // in addition to the contents of the currently specified layer.
     int layer_mask = GetLayerMask( Layer );
 
-    if( !g_PcbPlotOptions.m_ExcludeEdgeLayer )
+    if( !plot_opts.m_ExcludeEdgeLayer )
         layer_mask |= EDGE_LAYER;
 
     switch( Layer )
@@ -683,15 +688,15 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, EDA_DRAW_MODE_T tr
     case LAYER_N_14:
     case LAYER_N_15:
     case LAST_COPPER_LAYER:
-        Plot_Standard_Layer( plotter, layer_mask, true, trace_mode,
-                             g_PcbPlotOptions.m_SkipNPTH_Pads );
+        Plot_Standard_Layer( aPlotter, layer_mask, true, trace_mode,
+                             plot_opts.m_SkipNPTH_Pads );
 
         // Adding drill marks, if required and if the plotter is able to plot them:
-        if( g_PcbPlotOptions.m_DrillShapeOpt != PCB_PLOT_PARAMS::NO_DRILL_SHAPE )
+        if( plot_opts.m_DrillShapeOpt != PCB_PLOT_PARAMS::NO_DRILL_SHAPE )
         {
-            if( plotter->GetPlotterType() == PLOT_FORMAT_POST )
-                PlotDrillMark( plotter, trace_mode,
-                               g_PcbPlotOptions.m_DrillShapeOpt ==
+            if( aPlotter->GetPlotterType() == PLOT_FORMAT_POST )
+                PlotDrillMark( aPlotter, trace_mode,
+                               plot_opts.m_DrillShapeOpt ==
                                PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE );
         }
 
@@ -699,22 +704,22 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, EDA_DRAW_MODE_T tr
 
     case SOLDERMASK_N_BACK:
     case SOLDERMASK_N_FRONT:
-        Plot_Standard_Layer( plotter, layer_mask,
-                             g_PcbPlotOptions.m_PlotViaOnMaskLayer, trace_mode );
+        Plot_Standard_Layer( aPlotter, layer_mask,
+                             plot_opts.m_PlotViaOnMaskLayer, trace_mode );
         break;
 
     case SOLDERPASTE_N_BACK:
     case SOLDERPASTE_N_FRONT:
-        Plot_Standard_Layer( plotter, layer_mask, false, trace_mode );
+        Plot_Standard_Layer( aPlotter, layer_mask, false, trace_mode );
         break;
 
     case SILKSCREEN_N_FRONT:
     case SILKSCREEN_N_BACK:
-        PlotSilkScreen( plotter, layer_mask, trace_mode );
+        PlotSilkScreen( aPlotter, layer_mask, trace_mode );
 
         // Gerber: Subtract soldermask from silkscreen if enabled
-        if( plotter->GetPlotterType() == PLOT_FORMAT_GERBER
-            && g_PcbPlotOptions.GetSubtractMaskFromSilk() )
+        if( aPlotter->GetPlotterType() == PLOT_FORMAT_GERBER
+            && plot_opts.GetSubtractMaskFromSilk() )
         {
             if( Layer == SILKSCREEN_N_FRONT )
             {
@@ -726,16 +731,16 @@ void PCB_BASE_FRAME::Plot_Layer( PLOTTER* plotter, int Layer, EDA_DRAW_MODE_T tr
             }
 
             // Set layer polarity to negative
-            plotter->SetLayerPolarity( false );
-            Plot_Standard_Layer( plotter, layer_mask,
-                                 g_PcbPlotOptions.m_PlotViaOnMaskLayer,
+            aPlotter->SetLayerPolarity( false );
+            Plot_Standard_Layer( aPlotter, layer_mask,
+                                 plot_opts.m_PlotViaOnMaskLayer,
                                  trace_mode );
         }
 
         break;
 
     default:
-        PlotSilkScreen( plotter, layer_mask, trace_mode );
+        PlotSilkScreen( aPlotter, layer_mask, trace_mode );
         break;
     }
 }
@@ -754,25 +759,27 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER*        aPlotter,
     wxSize   size;
     wxString msg;
 
+    const PCB_PLOT_PARAMS& plot_opts = GetPlotSettings();
+
     // Plot pcb draw items.
     for( BOARD_ITEM* item = m_Pcb->m_Drawings; item; item = item->Next() )
     {
         switch( item->Type() )
         {
         case PCB_LINE_T:
-            PlotDrawSegment( aPlotter, (DRAWSEGMENT*) item, aLayerMask, aPlotMode );
+            PlotDrawSegment( aPlotter, plot_opts, (DRAWSEGMENT*) item, aLayerMask, aPlotMode );
             break;
 
         case PCB_TEXT_T:
-            PlotTextePcb( aPlotter, (TEXTE_PCB*) item, aLayerMask, aPlotMode );
+            PlotTextePcb( aPlotter, plot_opts, (TEXTE_PCB*) item, aLayerMask, aPlotMode );
             break;
 
         case PCB_DIMENSION_T:
-            PlotDimension( aPlotter, (DIMENSION*) item, aLayerMask, aPlotMode );
+            PlotDimension( aPlotter, plot_opts, (DIMENSION*) item, aLayerMask, aPlotMode );
             break;
 
         case PCB_TARGET_T:
-            PlotPcbTarget( aPlotter, (PCB_TARGET*) item, aLayerMask, aPlotMode );
+            PlotPcbTarget( aPlotter, plot_opts, (PCB_TARGET*) item, aLayerMask, aPlotMode );
             break;
 
         case PCB_MARKER_T:
@@ -785,7 +792,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER*        aPlotter,
     }
 
     // Draw footprint shapes without pads (pads will plotted later)
-    for( MODULE* module = m_Pcb->m_Modules; module; module = module->Next() )
+    for( MODULE* module = m_Pcb->m_Modules;  module;  module = module->Next() )
     {
         for( BOARD_ITEM* item = module->m_Drawings; item; item = item->Next() )
         {
@@ -793,7 +800,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER*        aPlotter,
             {
             case PCB_MODULE_EDGE_T:
                 if( aLayerMask & GetLayerMask(  item->GetLayer() ) )
-                    Plot_1_EdgeModule( aPlotter, (EDGE_MODULE*) item, aPlotMode, aLayerMask );
+                    Plot_1_EdgeModule( aPlotter, plot_opts, (EDGE_MODULE*) item, aPlotMode, aLayerMask );
 
                 break;
 
@@ -804,17 +811,17 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER*        aPlotter,
     }
 
     // Plot footprint pads
-    for( MODULE* module = m_Pcb->m_Modules; module; module = module->Next() )
+    for( MODULE* module = m_Pcb->m_Modules;  module;  module = module->Next() )
     {
-        for( D_PAD* pad = module->m_Pads; pad; pad = pad->Next() )
+        for( D_PAD* pad = module->m_Pads;  pad;  pad = pad->Next() )
         {
-            wxPoint shape_pos;
-
             if( (pad->GetLayerMask() & aLayerMask) == 0 )
                 continue;
 
-            shape_pos = pad->ReturnShapePos();
+            wxPoint shape_pos = pad->ReturnShapePos();
+
             pos = shape_pos;
+
             wxSize margin;
             double width_adj = 0;
 
@@ -973,7 +980,7 @@ void PCB_BASE_FRAME::Plot_Standard_Layer( PLOTTER*        aPlotter,
         if( ( ( 1 << edge_zone->GetLayer() ) & aLayerMask ) == 0 )
             continue;
 
-        PlotFilledAreas( aPlotter, edge_zone, aPlotMode );
+        PlotFilledAreas( aPlotter, plot_opts, edge_zone, aPlotMode );
     }
 }
 
@@ -999,6 +1006,8 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER*        aPlotter,
     D_PAD*    pad;
     TRACK*    pts;
 
+    const PCB_PLOT_PARAMS& plot_opts = GetPlotSettings();
+
     if( aTraceMode == FILLED )
     {
         aPlotter->set_color( WHITE );
@@ -1012,7 +1021,7 @@ void PCB_BASE_FRAME::PlotDrillMark( PLOTTER*        aPlotter,
         pos = pts->m_Start;
 
         // It is quite possible that the real drill value is less then small drill value.
-        if( g_PcbPlotOptions.m_DrillShapeOpt == PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE )
+        if( plot_opts.m_DrillShapeOpt == PCB_PLOT_PARAMS::SMALL_DRILL_SHAPE )
             diam.x = diam.y = MIN( SMALL_DRILL, pts->GetDrillValue() );
         else
             diam.x = diam.y = pts->GetDrillValue();

pcbnew/plotdxf.cpp

@@ -20,6 +20,8 @@ bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer,
 {
     LOCALE_IO   toggle;
 
+    const PCB_PLOT_PARAMS& plot_opts = GetPlotSettings();
+
     FILE* output_file = wxFopen( aFullFileName, wxT( "wt" ) );
 
     if( output_file == NULL )
@@ -34,7 +36,7 @@ bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer,
     plotter->set_filename( aFullFileName );
     plotter->start_plot( output_file );
 
-    if( g_PcbPlotOptions.m_PlotFrameRef )
+    if( plot_opts.m_PlotFrameRef )
         PlotWorkSheet( plotter, GetScreen() );
 
     Plot_Layer( plotter, aLayer, aTraceMode );

pcbnew/plotgerb.cpp

@@ -27,16 +27,17 @@ bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLay
                                          bool aPlotOriginIsAuxAxis, EDA_DRAW_MODE_T aTraceMode )
 {
     FILE* output_file = wxFopen( aFullFileName, wxT( "wt" ) );
-
     if( output_file == NULL )
     {
         return false;
     }
 
+    PCB_PLOT_PARAMS plot_opts = GetPlotSettings();
+
     wxPoint offset;
 
     // Calculate scaling from Pcbnew units (in 0.1 mil or 0.0001 inch) to gerber units
-    double scale = g_PcbPlotOptions.m_PlotScale;
+    double scale = plot_opts.m_PlotScale;
 
     if( aPlotOriginIsAuxAxis )
     {
@@ -54,7 +55,7 @@ bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLay
 
     // No mirror and scaling for gerbers!
     plotter->set_viewport( offset, scale, 0 );
-    plotter->set_default_line_width( g_PcbPlotOptions.m_PlotLineWidth );
+    plotter->set_default_line_width( plot_opts.m_PlotLineWidth );
     plotter->set_creator( wxT( "PCBNEW-RS274X" ) );
     plotter->set_filename( aFullFileName );
 
@@ -63,16 +64,21 @@ bool PCB_BASE_FRAME::ExportToGerberFile( const wxString& aFullFileName, int aLay
         // Skip NPTH pads on copper layers
         // ( only if hole size == pad size ):
         if( (aLayer >= LAYER_N_BACK) && (aLayer <= LAYER_N_FRONT) )
-            g_PcbPlotOptions.m_SkipNPTH_Pads = true;
+            plot_opts.m_SkipNPTH_Pads = true;
+
+        SetPlotSettings( plot_opts );
 
         // Sheet refs on gerber CAN be useful... and they're always 1:1
-        if( g_PcbPlotOptions.m_PlotFrameRef )
+        if( plot_opts.m_PlotFrameRef )
             PlotWorkSheet( plotter, GetScreen() );
 
         Plot_Layer( plotter, aLayer, aTraceMode );
+
         plotter->end_plot();
 
-        g_PcbPlotOptions.m_SkipNPTH_Pads = false;
+        plot_opts.m_SkipNPTH_Pads = false;
+
+        SetPlotSettings( plot_opts );
     }
     else    // error in start_plot( ): failed opening a temporary file
     {

pcbnew/plothpgl.cpp

@@ -26,7 +26,6 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer
     double      scale;
     wxPoint     offset;
     LOCALE_IO   toggle;
-
     FILE*       output_file = wxFopen( aFullFileName, wxT( "wt" ) );
 
     if( output_file == NULL )
@@ -34,24 +33,26 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer
         return false;
     }
 
+    PCB_PLOT_PARAMS plot_opts = GetPlotSettings();
+
     // Compute pen_dim (from g_m_HPGLPenDiam in mils) in pcb units,
     // with plot scale (if Scale is 2, pen diameter is always g_m_HPGLPenDiam
     // so apparent pen diam is real pen diam / Scale
-    int pen_diam = wxRound( (g_PcbPlotOptions.m_HPGLPenDiam * U_PCB) /
-                            g_PcbPlotOptions.m_PlotScale );
+    int pen_diam = wxRound( (plot_opts.m_HPGLPenDiam * U_PCB) /
+                            plot_opts.m_PlotScale );
 
     // compute pen_overlay (from g_m_HPGLPenOvr in mils) with plot scale
-    if( g_PcbPlotOptions.m_HPGLPenOvr < 0 )
-        g_PcbPlotOptions.m_HPGLPenOvr = 0;
+    if( plot_opts.m_HPGLPenOvr < 0 )
+        plot_opts.m_HPGLPenOvr = 0;
 
-    if( g_PcbPlotOptions.m_HPGLPenOvr >= g_PcbPlotOptions.m_HPGLPenDiam )
-        g_PcbPlotOptions.m_HPGLPenOvr = g_PcbPlotOptions.m_HPGLPenDiam - 1;
+    if( plot_opts.m_HPGLPenOvr >= plot_opts.m_HPGLPenDiam )
+        plot_opts.m_HPGLPenOvr = plot_opts.m_HPGLPenDiam - 1;
 
-    int   pen_overlay = wxRound( g_PcbPlotOptions.m_HPGLPenOvr * 10.0 /
-                                 g_PcbPlotOptions.m_PlotScale );
+    int   pen_overlay = wxRound( plot_opts.m_HPGLPenOvr * 10.0 /
+                                 plot_opts.m_PlotScale );
 
 
-    if( g_PcbPlotOptions.m_PlotScale != 1.0 || g_PcbPlotOptions.m_AutoScale )
+    if( plot_opts.m_PlotScale != 1.0 || plot_opts.m_AutoScale )
     {
         // when scale != 1.0 we must calculate the position in page
         // because actual position has no meaning
@@ -66,7 +67,7 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer
     boardSize   = bbbox.GetSize();
     boardCenter = bbbox.Centre();
 
-    if( g_PcbPlotOptions.m_AutoScale )       // Optimum scale
+    if( plot_opts.m_AutoScale )       // Optimum scale
     {
         // Fit to 80% of the page
         double Xscale = ( ( pageSizeIU.x * 0.8 ) / boardSize.x );
@@ -75,7 +76,7 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer
     }
     else
     {
-        scale = g_PcbPlotOptions.m_PlotScale;
+        scale = plot_opts.m_PlotScale;
     }
 
     // Calculate the page size offset.
@@ -96,18 +97,21 @@ bool PCB_BASE_FRAME::ExportToHpglFile( const wxString& aFullFileName, int aLayer
 
     plotter->SetPageSettings( GetPageSettings() );
 
-    plotter->set_viewport( offset, scale, g_PcbPlotOptions.m_PlotMirror );
-    plotter->set_default_line_width( g_PcbPlotOptions.m_PlotLineWidth );
+    // why did we have to change these settings above?
+    SetPlotSettings( plot_opts );
+
+    plotter->set_viewport( offset, scale, plot_opts.m_PlotMirror );
+    plotter->set_default_line_width( plot_opts.m_PlotLineWidth );
     plotter->set_creator( wxT( "PCBNEW-HPGL" ) );
     plotter->set_filename( aFullFileName );
-    plotter->set_pen_speed( g_PcbPlotOptions.m_HPGLPenSpeed );
-    plotter->set_pen_number( g_PcbPlotOptions.m_HPGLPenNum );
+    plotter->set_pen_speed( plot_opts.m_HPGLPenSpeed );
+    plotter->set_pen_number( plot_opts.m_HPGLPenNum );
     plotter->set_pen_overlap( pen_overlay );
     plotter->set_pen_diameter( pen_diam );
     plotter->start_plot( output_file );
 
     // The worksheet is not significant with scale!=1... It is with paperscale!=1, anyway
-    if( g_PcbPlotOptions.m_PlotFrameRef && !center )
+    if( plot_opts.m_PlotFrameRef && !center )
         PlotWorkSheet( plotter, GetScreen() );
 
     Plot_Layer( plotter, aLayer, aTraceMode );

pcbnew/plotps.cpp

@@ -25,6 +25,7 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
                                              bool aUseA4, EDA_DRAW_MODE_T aTraceMode )
 {
     const PAGE_INFO&    pageInfo = GetPageSettings();
+    PCB_PLOT_PARAMS     plotOpts = GetPlotSettings();
 
     wxSize      paperSizeIU;
     wxSize      boardSize;
@@ -45,7 +46,7 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
         return false;
     }
 
-    if( g_PcbPlotOptions.m_PlotScale != 1.0 || g_PcbPlotOptions.m_AutoScale )
+    if( plotOpts.m_PlotScale != 1.0 || plotOpts.m_AutoScale )
     {
         // when scale != 1.0 we must calculate the position in page
         // because actual position has no meaning
@@ -53,8 +54,8 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
     }
 
     // Set default line width
-    if( g_PcbPlotOptions.m_PlotLineWidth < 1 )
-        g_PcbPlotOptions.m_PlotLineWidth = 1;
+    if( plotOpts.m_PlotLineWidth < 1 )
+        plotOpts.m_PlotLineWidth = 1;
 
     wxSize pageSizeIU = GetPageSizeIU();
 
@@ -76,7 +77,7 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
     boardSize   = bbbox.GetSize();
     boardCenter = bbbox.Centre();
 
-    if( g_PcbPlotOptions.m_AutoScale )       // Optimum scale
+    if( plotOpts.m_AutoScale )       // Optimum scale
     {
         // Fit to 80% of the page
         double Xscale = (paperSizeIU.x * 0.8) / boardSize.x;
@@ -86,7 +87,7 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
     }
     else
     {
-        scale = g_PcbPlotOptions.m_PlotScale * paperscale;
+        scale = plotOpts.m_PlotScale * paperscale;
     }
 
     if( center )
@@ -104,23 +105,26 @@ bool PCB_BASE_FRAME::ExportToPostScriptFile( const wxString& aFullFileName, int
 
     plotter->SetPageSettings( *sheetPS );
 
-    plotter->set_scale_adjust( g_PcbPlotOptions.m_FineScaleAdjustX,
-                               g_PcbPlotOptions.m_FineScaleAdjustY );
-    plotter->set_plot_width_adj( g_PcbPlotOptions.m_FineWidthAdjust );
-    plotter->set_viewport( offset, scale, g_PcbPlotOptions.m_PlotMirror );
-    plotter->set_default_line_width( g_PcbPlotOptions.m_PlotLineWidth );
+    // why did we have to change these settings?
+    SetPlotSettings( plotOpts );
+
+    plotter->set_scale_adjust( plotOpts.m_FineScaleAdjustX,
+                               plotOpts.m_FineScaleAdjustY );
+    plotter->set_plot_width_adj( plotOpts.m_FineWidthAdjust );
+    plotter->set_viewport( offset, scale, plotOpts.m_PlotMirror );
+    plotter->set_default_line_width( plotOpts.m_PlotLineWidth );
     plotter->set_creator( wxT( "PCBNEW-PS" ) );
     plotter->set_filename( aFullFileName );
     plotter->start_plot( output_file );
 
     /* The worksheet is not significant with scale!=1... It is with paperscale!=1, anyway */
-    if( g_PcbPlotOptions.m_PlotFrameRef && !center )
+    if( plotOpts.m_PlotFrameRef && !center )
         PlotWorkSheet( plotter, GetScreen() );
 
     // If plot a negative board:
     // Draw a black rectangle (background for plot board in white)
     // and switch the current color to WHITE
-    if( g_PcbPlotOptions.m_PlotPSNegative )
+    if( plotOpts.m_PlotPSNegative )
     {
         int margin = 500;              // Add a 0.5 inch margin around the board
         plotter->set_negative( true );

pcbnew/tracepcb.cpp

@@ -46,9 +46,6 @@
 #include <wx/overlay.h>
 
 
-extern int g_DrawDefaultLineThickness; // Default line thickness, used to draw Frame references
-
-
 // Local functions:
 /* Trace the pads of a module in sketch mode.
  * Used to display pads when when the module visibility is set to not visible