Commit 146b7899 authored by Marco Mattila's avatar Marco Mattila
Browse files

Reduce pcbnew plot dialog height.

parent fd98de2d

pcbnew/dialogs/dialog_plot_base.cpp

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

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

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -28,24 +28,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	m_plotFormatOpt->SetSelection( 0 );

	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;
@@ -308,21 +290,43 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	bSizer12->Add( m_messagesBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

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

	wxBoxSizer* bSizer191;

	bSizer191 = new wxBoxSizer( wxHORIZONTAL );

	

	

	bSizer191->Add( 0, 0, 1, wxEXPAND, 5 );

	

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

	m_plotButton->SetDefault(); 

	bSizer191->Add( m_plotButton, 0, wxALL, 5 );

	

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

	bSizer191->Add( m_buttonSaveOpt, 0, wxALL, 5 );

	

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

	bSizer191->Add( m_buttonDrill, 0, wxALL, 5 );

	

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

	bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );

	

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

	

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

	

	this->SetSizer( bMainSizer );

	this->Layout();

	bMainSizer->Fit( this );

	

	// Connect Events

	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()
@@ -331,11 +335,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

+3911 −2724

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_plot_base.h

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

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

// C++ code generated with wxFormBuilder (version Nov 18 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,18 +37,14 @@ class DIALOG_PLOT_BASE : public wxDialog 
	protected:

		enum

		{

			ID_SAVE_OPT_PLOT = 1000,

			ID_CREATE_DRILL_FILE,

			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN,

			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,

			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;
@@ -88,21 +84,26 @@ class DIALOG_PLOT_BASE : public wxDialog 
		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:

		

		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,616 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_PLOT_BASE();

	

};