Commit fd98de2d authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Minor change: reduce Pcbnew dialog plot width, too large when strings are translated.

parent 44e474c2

pcbnew/dialogs/dialog_plot_base.cpp

+341 −336
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov 18 2010)

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -19,11 +19,34 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	wxBoxSizer* bSizer12;

	bSizer12 = new wxBoxSizer( wxVERTICAL );

	

	wxBoxSizer* bSizer181;

	bSizer181 = new wxBoxSizer( wxHORIZONTAL );

	

	wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };

	int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );

	m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, 0 );

	m_plotFormatOpt->SetSelection( 0 );

	bSizer12->Add( m_plotFormatOpt, 0, wxEXPAND, 5 );

	bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bButtonsSizer;

	bButtonsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotButton->SetDefault(); 

	bButtonsSizer->Add( m_plotButton, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Apply Settings"), wxDefaultPosition, wxDefaultSize, 0 );

	bButtonsSizer->Add( m_buttonSaveOpt, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );

	bButtonsSizer->Add( m_buttonDrill, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );

	bButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	bSizer181->Add( bButtonsSizer, 0, wxALIGN_BOTTOM|wxALL, 3 );

	

	bSizer12->Add( bSizer181, 0, wxEXPAND, 5 );

	

	wxBoxSizer* bUpperSizer;

	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -87,7 +110,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11->Wrap( -1 );

	bSizer15->Add( m_staticText11, 0, wxALL, 5 );

	bSizer15->Add( m_staticText11, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };

	int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
@@ -97,7 +120,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12->Wrap( -1 );

	bSizer15->Add( m_staticText12, 0, wxALL, 5 );

	bSizer15->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 );
@@ -112,7 +135,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText13->Wrap( -1 );

	bSizer16->Add( m_staticText13, 0, wxALL, 5 );

	bSizer16->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };

	int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
@@ -120,7 +143,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	m_plotModeOpt->SetSelection( 0 );

	bSizer16->Add( m_plotModeOpt, 0, wxEXPAND, 5 );

	

	m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default\nlinewidth"), wxDefaultPosition, wxDefaultSize, 0 );

	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.") );
@@ -222,7 +245,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText7->Wrap( -1 );

	bSizer18->Add( m_staticText7, 0, wxALL, 5 );

	bSizer18->Add( m_staticText7, 0, wxTOP|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") );
@@ -236,7 +259,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText8->Wrap( -1 );

	bSizer19->Add( m_staticText8, 0, wxALL, 5 );

	bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -287,24 +310,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	bMainSizer->Add( bSizer12, 1, wxALL|wxEXPAND, 5 );

	

	wxBoxSizer* bButtonsSizer;

	bButtonsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotButton->SetDefault(); 

	bButtonsSizer->Add( m_plotButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonSaveOpt = new wxButton( this, ID_SAVE_OPT_PLOT, _("Apply Settings"), wxDefaultPosition, wxDefaultSize, 0 );

	bButtonsSizer->Add( m_buttonSaveOpt, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );

	bButtonsSizer->Add( m_buttonDrill, 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, wxALIGN_BOTTOM|wxALL, 3 );

	

	this->SetSizer( bMainSizer );

	this->Layout();
@@ -312,12 +317,12 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );

	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );

	m_plotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );

	m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );

	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );

	m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );

	m_buttonSaveOpt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), 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 );

	m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );

	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );

}



DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
@@ -326,11 +331,11 @@ DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE() 
	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnCloseWindow ) );

	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );

	m_plotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );

	m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );

	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );

	m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );

	m_buttonSaveOpt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::applyPlotSettings ), 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 );

	m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );

	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );

	

}

pcbnew/dialogs/dialog_plot_base.fbp

+2724 −3890

File changed.

File size exceeds preview limit.

View original file
View changed file

pcbnew/dialogs/dialog_plot_base.h

+110 −110
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov 18 2010)

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -16,13 +16,13 @@ 
#include <wx/font.h>

#include <wx/colour.h>

#include <wx/settings.h>

#include <wx/button.h>

#include <wx/sizer.h>

#include <wx/statbox.h>

#include <wx/checkbox.h>

#include <wx/stattext.h>

#include <wx/choice.h>

#include <wx/textctrl.h>

#include <wx/button.h>

#include <wx/dialog.h>



///////////////////////////////////////////////////////////////////////////
@@ -37,14 +37,18 @@ class DIALOG_PLOT_BASE : public wxDialog 
	protected:

		enum

		{

			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,

			ID_SAVE_OPT_PLOT = 1000,

			ID_CREATE_DRILL_FILE,

			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN,

			ID_PRINT_REF,

			ID_MIROR_OPT,

			ID_SAVE_OPT_PLOT,

			ID_CREATE_DRILL_FILE,

		};

		

		wxRadioBox* m_plotFormatOpt;

		wxButton* m_plotButton;

		wxButton* m_buttonSaveOpt;

		wxButton* m_buttonDrill;

		wxButton* m_buttonQuit;

		wxStaticBoxSizer* m_CopperLayersBoxSizer;

		wxStaticBoxSizer* m_TechnicalLayersBoxSizer;

		wxCheckBox* m_plotSheetRef;
@@ -83,21 +87,17 @@ class DIALOG_PLOT_BASE : public wxDialog 
		wxButton* m_browseButton;

		wxStaticText* m_staticText2;

		wxTextCtrl* m_messagesBox;

		wxButton* m_plotButton;

		wxButton* m_buttonSaveOpt;

		wxButton* m_buttonDrill;

		wxButton* m_buttonQuit;

		

		// Virtual event handlers, overide them in your derived class

		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }

		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }

		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }

		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }

		virtual void applyPlotSettings( wxCommandEvent& event ) { event.Skip(); }

		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }

		

	

	public: