EEschema: fix minor issue (cursoe shape lost when aborting a block command by popup menu)
Pcbnew: dialog plot: make message window resizable, add tool tip and remove unused sizers.
This commit is contained in:
jean-pierre charras
parent
c07b677a20
commit
2f47b3f464
|
|
@ -6,7 +6,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef KICAD_BUILD_VERSION
|
#ifndef KICAD_BUILD_VERSION
|
||||||
#define KICAD_BUILD_VERSION "(2011-03-03 BZR 2875)"
|
#define KICAD_BUILD_VERSION "(2011-03-11 BZR 2884)"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#define VERSION_STABILITY "stable"
|
//#define VERSION_STABILITY "stable"
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,9 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
|
||||||
// If needed, stop the current command and deselect current tool
|
// If needed, stop the current command and deselect current tool
|
||||||
switch( id )
|
switch( id )
|
||||||
{
|
{
|
||||||
|
case wxID_CUT:
|
||||||
|
case wxID_COPY:
|
||||||
|
case ID_POPUP_CANCEL_CURRENT_COMMAND:
|
||||||
case ID_POPUP_SCH_ENTRY_SELECT_SLASH:
|
case ID_POPUP_SCH_ENTRY_SELECT_SLASH:
|
||||||
case ID_POPUP_SCH_ENTRY_SELECT_ANTISLASH:
|
case ID_POPUP_SCH_ENTRY_SELECT_ANTISLASH:
|
||||||
case ID_POPUP_END_LINE:
|
case ID_POPUP_END_LINE:
|
||||||
|
|
@ -74,8 +77,6 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
|
||||||
case ID_POPUP_MIRROR_Y_BLOCK:
|
case ID_POPUP_MIRROR_Y_BLOCK:
|
||||||
case ID_POPUP_SCH_DELETE_NODE:
|
case ID_POPUP_SCH_DELETE_NODE:
|
||||||
case ID_POPUP_SCH_DELETE_CONNECTION:
|
case ID_POPUP_SCH_DELETE_CONNECTION:
|
||||||
case wxID_CUT:
|
|
||||||
case wxID_COPY:
|
|
||||||
case ID_POPUP_SCH_ENTER_SHEET:
|
case ID_POPUP_SCH_ENTER_SHEET:
|
||||||
case ID_POPUP_SCH_LEAVE_SHEET:
|
case ID_POPUP_SCH_LEAVE_SHEET:
|
||||||
case ID_POPUP_SCH_ADD_JUNCTION:
|
case ID_POPUP_SCH_ADD_JUNCTION:
|
||||||
|
|
@ -134,7 +135,13 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ID_POPUP_CANCEL_CURRENT_COMMAND:
|
case ID_POPUP_CANCEL_CURRENT_COMMAND:
|
||||||
SetToolID( ID_NO_TOOL_SELECTED, DrawPanel->GetDefaultCursor(), wxEmptyString );
|
if( DrawPanel->IsMouseCaptured() )
|
||||||
|
{
|
||||||
|
DrawPanel->EndMouseCapture();
|
||||||
|
SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
SetToolID( ID_NO_TOOL_SELECTED, DrawPanel->GetDefaultCursor(), wxEmptyString );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ID_POPUP_END_LINE:
|
case ID_POPUP_END_LINE:
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
; General Product Description Definitions
|
; General Product Description Definitions
|
||||||
!define PRODUCT_NAME "KiCad"
|
!define PRODUCT_NAME "KiCad"
|
||||||
!define PRODUCT_VERSION "2011.03.03"
|
!define PRODUCT_VERSION "2011.03.11"
|
||||||
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
|
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
|
||||||
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
|
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
|
||||||
!define COMPANY_NAME ""
|
!define COMPANY_NAME ""
|
||||||
|
|
|
||||||
|
|
@ -1,353 +1,338 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Nov 18 2010)
|
// C++ code generated with wxFormBuilder (version Nov 17 2010)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "dialog_plot_base.h"
|
#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 )
|
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 );
|
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
|
||||||
|
|
||||||
m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
|
m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer12;
|
wxBoxSizer* bSizer12;
|
||||||
bSizer12 = new wxBoxSizer( wxVERTICAL );
|
bSizer12 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer26;
|
wxBoxSizer* bSizer26;
|
||||||
bSizer26 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer26 = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer27;
|
wxBoxSizer* bSizer27;
|
||||||
bSizer27 = new wxBoxSizer( wxVERTICAL );
|
bSizer27 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_staticText121 = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText121 = new wxStaticText( this, wxID_ANY, _("Plot format:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText121->Wrap( -1 );
|
m_staticText121->Wrap( -1 );
|
||||||
bSizer27->Add( m_staticText121, 0, wxTOP, 5 );
|
bSizer27->Add( m_staticText121, 0, wxTOP, 5 );
|
||||||
|
|
||||||
wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("DXF") };
|
wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("DXF") };
|
||||||
int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
|
int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
|
||||||
m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 );
|
m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 );
|
||||||
m_plotFormatOpt->SetSelection( 0 );
|
m_plotFormatOpt->SetSelection( 0 );
|
||||||
bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );
|
bSizer27->Add( m_plotFormatOpt, 0, 0, 5 );
|
||||||
|
|
||||||
bSizer26->Add( bSizer27, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
bSizer26->Add( bSizer27, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizer28;
|
wxBoxSizer* bSizer28;
|
||||||
bSizer28 = new wxBoxSizer( wxVERTICAL );
|
bSizer28 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticTextDir->Wrap( -1 );
|
m_staticTextDir->Wrap( -1 );
|
||||||
bSizer28->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
|
bSizer28->Add( m_staticTextDir, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizer29;
|
wxBoxSizer* bSizer29;
|
||||||
bSizer29 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer29 = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );
|
m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );
|
||||||
|
|
||||||
bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
bSizer29->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
|
m_browseButton = new wxButton( this, wxID_ANY, _("Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
bSizer29->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
||||||
|
|
||||||
bSizer28->Add( bSizer29, 1, wxEXPAND, 5 );
|
bSizer28->Add( bSizer29, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
bSizer26->Add( bSizer28, 1, 0, 5 );
|
bSizer26->Add( bSizer28, 1, 0, 5 );
|
||||||
|
|
||||||
bSizer12->Add( bSizer26, 0, wxEXPAND, 5 );
|
bSizer12->Add( bSizer26, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bUpperSizer;
|
wxBoxSizer* bUpperSizer;
|
||||||
bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
|
bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
|
m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL );
|
||||||
|
|
||||||
wxArrayString m_layerCheckListBoxChoices;
|
wxArrayString m_layerCheckListBoxChoices;
|
||||||
m_layerCheckListBox = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );
|
m_layerCheckListBox = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );
|
||||||
m_LayersSizer->Add( m_layerCheckListBox, 1, wxALL|wxEXPAND, 5 );
|
m_LayersSizer->Add( m_layerCheckListBox, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
bUpperSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 );
|
bUpperSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
|
m_PlotOptionsSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxStaticBoxSizer* sbOptionsSizer;
|
wxStaticBoxSizer* sbOptionsSizer;
|
||||||
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
|
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer192;
|
wxBoxSizer* bSizer192;
|
||||||
bSizer192 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer192 = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer201;
|
wxBoxSizer* bSizerPlotItems;
|
||||||
bSizer201 = new wxBoxSizer( wxVERTICAL );
|
bSizerPlotItems = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer201->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
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 = 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") );
|
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") );
|
||||||
|
|
||||||
bSizer201->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
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 );
|
m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer201->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
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 );
|
m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer201->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
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 = 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") );
|
m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );
|
||||||
|
|
||||||
bSizer201->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
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 = 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") );
|
m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );
|
||||||
|
|
||||||
bSizer201->Add( m_plotInvisibleText, 0, wxALL, 2 );
|
bSizerPlotItems->Add( m_plotInvisibleText, 0, wxALL, 2 );
|
||||||
|
|
||||||
m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias.") );
|
m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias.") );
|
||||||
|
|
||||||
bSizer201->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
|
bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );
|
||||||
|
|
||||||
m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer201->Add( m_plotMirrorOpt, 0, wxALL, 2 );
|
bSizerPlotItems->Add( m_plotMirrorOpt, 0, wxALL, 2 );
|
||||||
|
|
||||||
bSizer192->Add( bSizer201, 0, wxEXPAND, 5 );
|
bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizer14;
|
wxBoxSizer* bSizer14;
|
||||||
bSizer14 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer14 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer15;
|
m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer15 = new wxBoxSizer( wxVERTICAL );
|
m_staticText11->Wrap( -1 );
|
||||||
|
bSizer14->Add( m_staticText11, 0, wxRIGHT|wxLEFT, 5 );
|
||||||
m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText11->Wrap( -1 );
|
wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
|
||||||
bSizer15->Add( m_staticText11, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
|
||||||
|
m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
|
||||||
wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };
|
m_drillShapeOpt->SetSelection( 0 );
|
||||||
int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );
|
bSizer14->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );
|
||||||
m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );
|
|
||||||
m_drillShapeOpt->SetSelection( 0 );
|
m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer15->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );
|
m_staticText12->Wrap( -1 );
|
||||||
|
bSizer14->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText12->Wrap( -1 );
|
wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
|
||||||
bSizer15->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
|
||||||
|
m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
|
||||||
wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };
|
m_scaleOpt->SetSelection( 0 );
|
||||||
int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );
|
bSizer14->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );
|
||||||
m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );
|
|
||||||
m_scaleOpt->SetSelection( 0 );
|
m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer15->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );
|
m_staticText13->Wrap( -1 );
|
||||||
|
bSizer14->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText13->Wrap( -1 );
|
wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
|
||||||
bSizer15->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
|
||||||
|
m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
|
||||||
wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };
|
m_plotModeOpt->SetSelection( 0 );
|
||||||
int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );
|
bSizer14->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );
|
||||||
m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );
|
|
||||||
m_plotModeOpt->SetSelection( 0 );
|
m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer15->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );
|
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.") );
|
||||||
m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_textDefaultPenSize->Wrap( -1 );
|
bSizer14->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
|
|
||||||
|
m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer15->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
|
||||||
|
|
||||||
m_linesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer14->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
|
||||||
m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );
|
|
||||||
|
bSizer192->Add( bSizer14, 1, wxRIGHT|wxLEFT, 3 );
|
||||||
bSizer15->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
|
|
||||||
|
sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );
|
||||||
bSizer14->Add( bSizer15, 1, wxALL, 3 );
|
|
||||||
|
m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
||||||
bSizer192->Add( bSizer14, 1, wxALL, 3 );
|
|
||||||
|
m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
|
||||||
sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );
|
|
||||||
|
m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
|
||||||
|
|
||||||
m_GerberOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Gerber Options") ), wxVERTICAL );
|
m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
|
||||||
|
|
||||||
m_useGerberExtensions = new wxCheckBox( this, wxID_ANY, _("Use proper filename extensions"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer from other layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_useGerberExtensions->SetToolTip( _("Use proper Gerber extensions - .GBL, .GTL, etc...") );
|
m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
|
||||||
|
|
||||||
m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
|
m_GerberOptionsSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
||||||
|
|
||||||
m_excludeEdgeLayerOpt = new wxCheckBox( this, wxID_ANY, _("Exclude PCB edge layer from other layers"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_excludeEdgeLayerOpt->SetToolTip( _("Exclude contents of the pcb edge layer from all other layers") );
|
m_subtractMaskFromSilk->SetValue(true);
|
||||||
|
m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
|
||||||
m_GerberOptionsSizer->Add( m_excludeEdgeLayerOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
|
||||||
|
m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
||||||
m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_subtractMaskFromSilk->SetValue(true);
|
m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
|
m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in Gerber files.") );
|
||||||
|
|
||||||
m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
|
m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
|
||||||
|
|
||||||
m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
||||||
m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
|
|
||||||
|
m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
|
||||||
m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
|
||||||
|
wxBoxSizer* bSizer22;
|
||||||
m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
|
bSizer22 = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer22;
|
wxBoxSizer* bSizer20;
|
||||||
bSizer22 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer20 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer20;
|
m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer20 = new wxBoxSizer( wxVERTICAL );
|
m_textPenSize->Wrap( -1 );
|
||||||
|
bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
|
||||||
m_textPenSize = new wxStaticText( this, wxID_ANY, _("Pen size"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_textPenSize->Wrap( -1 );
|
m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer20->Add( m_textPenSize, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
|
bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_HPGLPenSizeOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer20->Add( m_HPGLPenSizeOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
m_textPenOvr->Wrap( -1 );
|
||||||
|
bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_textPenOvr = new wxStaticText( this, wxID_ANY, _("Pen overlay"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_textPenOvr->Wrap( -1 );
|
m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer20->Add( m_textPenOvr, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
|
||||||
|
|
||||||
m_HPGLPenOverlayOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
m_HPGLPenOverlayOpt->SetToolTip( _("Set plot overlay for filling") );
|
|
||||||
|
bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
|
||||||
bSizer20->Add( m_HPGLPenOverlayOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
|
||||||
|
wxBoxSizer* bSizer21;
|
||||||
bSizer22->Add( bSizer20, 1, wxEXPAND, 5 );
|
bSizer21 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer21;
|
m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer21 = new wxBoxSizer( wxVERTICAL );
|
m_textPenSpeed->Wrap( -1 );
|
||||||
|
bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_textPenSpeed = new wxStaticText( this, wxID_ANY, _("Pen speed (cm/s):"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_textPenSpeed->Wrap( -1 );
|
m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer21->Add( m_textPenSpeed, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
|
||||||
|
|
||||||
m_HPGLPenSpeedOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
||||||
m_HPGLPenSpeedOpt->SetToolTip( _("Set pen speed in cm/s") );
|
|
||||||
|
bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
|
||||||
bSizer21->Add( m_HPGLPenSpeedOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
|
|
||||||
|
m_HPGLOptionsSizer->Add( bSizer22, 1, wxEXPAND, 5 );
|
||||||
bSizer22->Add( bSizer21, 1, wxEXPAND, 5 );
|
|
||||||
|
m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
||||||
m_HPGLOptionsSizer->Add( bSizer22, 1, wxEXPAND, 5 );
|
|
||||||
|
m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
|
||||||
m_PlotOptionsSizer->Add( m_HPGLOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
|
||||||
|
wxBoxSizer* bSizer17;
|
||||||
m_PSOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Postscript Options") ), wxVERTICAL );
|
bSizer17 = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer17;
|
wxBoxSizer* bSizer18;
|
||||||
bSizer17 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer18 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer18;
|
m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer18 = new wxBoxSizer( wxVERTICAL );
|
m_staticText7->Wrap( -1 );
|
||||||
|
bSizer18->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_staticText7 = new wxStaticText( this, wxID_ANY, _("X scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText7->Wrap( -1 );
|
m_fineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer18->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_fineAdjustXscaleOpt->SetToolTip( _("Set global X scale adjust for exact scale postscript output.") );
|
||||||
|
|
||||||
m_fineAdjustXscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
m_fineAdjustXscaleOpt->SetToolTip( _("Set global X scale adjust for exact scale postscript output.") );
|
|
||||||
|
bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
|
||||||
bSizer18->Add( m_fineAdjustXscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
wxBoxSizer* bSizer19;
|
||||||
bSizer17->Add( bSizer18, 1, wxEXPAND, 5 );
|
bSizer19 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer19;
|
m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer19 = new wxBoxSizer( wxVERTICAL );
|
m_staticText8->Wrap( -1 );
|
||||||
|
bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
m_staticText8 = new wxStaticText( this, wxID_ANY, _("Y scale:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText8->Wrap( -1 );
|
m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer19->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
m_fineAdjustYscaleOpt->SetToolTip( _("Set global Y scale adjust for exact scale postscript output.") );
|
||||||
|
|
||||||
m_fineAdjustYscaleOpt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
m_fineAdjustYscaleOpt->SetToolTip( _("Set global Y scale adjust for exact scale postscript output.") );
|
|
||||||
|
bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
|
||||||
bSizer19->Add( m_fineAdjustYscaleOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
m_PSOptionsSizer->Add( bSizer17, 1, wxEXPAND, 5 );
|
||||||
bSizer17->Add( bSizer19, 1, wxEXPAND, 5 );
|
|
||||||
|
m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_PSOptionsSizer->Add( bSizer17, 1, wxEXPAND, 5 );
|
m_PSOptionsSizer->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
|
||||||
|
|
||||||
m_plotPSNegativeOpt = new wxCheckBox( this, wxID_ANY, _("Negative plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_forcePSA4OutputOpt = new wxCheckBox( this, wxID_ANY, _("Force A4 output"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_PSOptionsSizer->Add( m_plotPSNegativeOpt, 0, wxALL, 2 );
|
m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxALL, 2 );
|
||||||
|
|
||||||
m_forcePSA4OutputOpt = new wxCheckBox( this, wxID_ANY, _("Force A4 output"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
||||||
m_PSOptionsSizer->Add( m_forcePSA4OutputOpt, 0, wxALL, 2 );
|
|
||||||
|
bUpperSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );
|
||||||
m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 );
|
|
||||||
|
bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
|
||||||
bUpperSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );
|
|
||||||
|
wxStaticBoxSizer* sbSizerMsg;
|
||||||
bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );
|
sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizerDirChoice;
|
m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
|
||||||
bSizerDirChoice = new wxBoxSizer( wxVERTICAL );
|
m_messagesBox->SetMinSize( wxSize( -1,70 ) );
|
||||||
|
|
||||||
wxBoxSizer* bSizerDirNmae;
|
sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );
|
||||||
bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );
|
|
||||||
|
bSizer12->Add( sbSizerMsg, 1, wxEXPAND, 5 );
|
||||||
bSizerDirChoice->Add( bSizerDirNmae, 0, wxEXPAND, 5 );
|
|
||||||
|
wxBoxSizer* bSizerButtons;
|
||||||
bSizer12->Add( bSizerDirChoice, 0, wxEXPAND, 5 );
|
bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText2->Wrap( -1 );
|
m_plotButton->SetDefault();
|
||||||
bSizer12->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
|
bSizerButtons->Add( m_plotButton, 0, wxALL, 5 );
|
||||||
|
|
||||||
m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
|
m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_messagesBox->SetMinSize( wxSize( -1,70 ) );
|
bSizerButtons->Add( m_buttonDrill, 0, wxALL, 5 );
|
||||||
|
|
||||||
bSizer12->Add( m_messagesBox, 1, wxALL|wxEXPAND, 5 );
|
m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizerButtons->Add( m_buttonQuit, 0, wxALL, 5 );
|
||||||
wxBoxSizer* bSizer191;
|
|
||||||
bSizer191 = new wxBoxSizer( wxHORIZONTAL );
|
bSizer12->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
|
m_MainSizer->Add( bSizer12, 1, wxALL|wxEXPAND, 5 );
|
||||||
bSizer191->Add( 0, 0, 1, wxEXPAND, 5 );
|
|
||||||
|
this->SetSizer( m_MainSizer );
|
||||||
m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );
|
this->Layout();
|
||||||
m_plotButton->SetDefault();
|
|
||||||
bSizer191->Add( m_plotButton, 0, wxALL, 5 );
|
// Connect Events
|
||||||
|
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
|
||||||
m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );
|
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
|
||||||
bSizer191->Add( m_buttonDrill, 0, wxALL, 5 );
|
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_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
|
||||||
bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );
|
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 );
|
||||||
bSizer12->Add( bSizer191, 0, wxALL|wxEXPAND|wxRIGHT, 5 );
|
m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
|
||||||
|
}
|
||||||
m_MainSizer->Add( bSizer12, 1, wxALL, 5 );
|
|
||||||
|
DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
|
||||||
this->SetSizer( m_MainSizer );
|
{
|
||||||
this->Layout();
|
// Disconnect Events
|
||||||
|
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
|
||||||
// Connect Events
|
this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
|
||||||
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_BASE::OnClose ) );
|
m_plotFormatOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
|
||||||
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_PLOT_BASE::OnInitDialog ) );
|
m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
|
||||||
m_plotFormatOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
|
m_scaleOpt->Disconnect( 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->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
|
||||||
m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
|
m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
|
||||||
m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
|
m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), 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 );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,115 +1,113 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Nov 18 2010)
|
// C++ code generated with wxFormBuilder (version Nov 17 2010)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef __dialog_plot_base__
|
#ifndef __dialog_plot_base__
|
||||||
#define __dialog_plot_base__
|
#define __dialog_plot_base__
|
||||||
|
|
||||||
#include <wx/intl.h>
|
#include <wx/intl.h>
|
||||||
|
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/font.h>
|
#include <wx/font.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/choice.h>
|
#include <wx/choice.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/statbox.h>
|
||||||
#include <wx/checkbox.h>
|
#include <wx/checkbox.h>
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class DIALOG_PLOT_BASE
|
/// Class DIALOG_PLOT_BASE
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
class DIALOG_PLOT_BASE : public wxDialog
|
class DIALOG_PLOT_BASE : public wxDialog
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
|
ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
|
||||||
ID_PRINT_REF,
|
ID_PRINT_REF,
|
||||||
ID_MIROR_OPT,
|
ID_MIROR_OPT,
|
||||||
ID_CREATE_DRILL_FILE,
|
ID_CREATE_DRILL_FILE,
|
||||||
};
|
};
|
||||||
|
|
||||||
wxBoxSizer* m_MainSizer;
|
wxBoxSizer* m_MainSizer;
|
||||||
wxStaticText* m_staticText121;
|
wxStaticText* m_staticText121;
|
||||||
wxChoice* m_plotFormatOpt;
|
wxChoice* m_plotFormatOpt;
|
||||||
wxStaticText* m_staticTextDir;
|
wxStaticText* m_staticTextDir;
|
||||||
wxTextCtrl* m_outputDirectoryName;
|
wxTextCtrl* m_outputDirectoryName;
|
||||||
wxButton* m_browseButton;
|
wxButton* m_browseButton;
|
||||||
wxStaticBoxSizer* m_LayersSizer;
|
wxStaticBoxSizer* m_LayersSizer;
|
||||||
wxCheckListBox* m_layerCheckListBox;
|
wxCheckListBox* m_layerCheckListBox;
|
||||||
wxBoxSizer* m_PlotOptionsSizer;
|
wxBoxSizer* m_PlotOptionsSizer;
|
||||||
wxCheckBox* m_plotSheetRef;
|
wxCheckBox* m_plotSheetRef;
|
||||||
wxCheckBox* m_plotPads_on_Silkscreen;
|
wxCheckBox* m_plotPads_on_Silkscreen;
|
||||||
wxCheckBox* m_plotModuleValueOpt;
|
wxCheckBox* m_plotModuleValueOpt;
|
||||||
wxCheckBox* m_plotModuleRefOpt;
|
wxCheckBox* m_plotModuleRefOpt;
|
||||||
wxCheckBox* m_plotTextOther;
|
wxCheckBox* m_plotTextOther;
|
||||||
wxCheckBox* m_plotInvisibleText;
|
wxCheckBox* m_plotInvisibleText;
|
||||||
wxCheckBox* m_plotNoViaOnMaskOpt;
|
wxCheckBox* m_plotNoViaOnMaskOpt;
|
||||||
wxCheckBox* m_plotMirrorOpt;
|
wxCheckBox* m_plotMirrorOpt;
|
||||||
wxStaticText* m_staticText11;
|
wxStaticText* m_staticText11;
|
||||||
wxChoice* m_drillShapeOpt;
|
wxChoice* m_drillShapeOpt;
|
||||||
wxStaticText* m_staticText12;
|
wxStaticText* m_staticText12;
|
||||||
wxChoice* m_scaleOpt;
|
wxChoice* m_scaleOpt;
|
||||||
wxStaticText* m_staticText13;
|
wxStaticText* m_staticText13;
|
||||||
wxChoice* m_plotModeOpt;
|
wxChoice* m_plotModeOpt;
|
||||||
wxStaticText* m_textDefaultPenSize;
|
wxStaticText* m_textDefaultPenSize;
|
||||||
wxTextCtrl* m_linesWidth;
|
wxTextCtrl* m_linesWidth;
|
||||||
wxStaticBoxSizer* m_GerberOptionsSizer;
|
wxStaticBoxSizer* m_GerberOptionsSizer;
|
||||||
wxCheckBox* m_useGerberExtensions;
|
wxCheckBox* m_useGerberExtensions;
|
||||||
wxCheckBox* m_excludeEdgeLayerOpt;
|
wxCheckBox* m_excludeEdgeLayerOpt;
|
||||||
wxCheckBox* m_subtractMaskFromSilk;
|
wxCheckBox* m_subtractMaskFromSilk;
|
||||||
wxCheckBox* m_useAuxOriginCheckBox;
|
wxCheckBox* m_useAuxOriginCheckBox;
|
||||||
wxStaticBoxSizer* m_HPGLOptionsSizer;
|
wxStaticBoxSizer* m_HPGLOptionsSizer;
|
||||||
wxStaticText* m_textPenSize;
|
wxStaticText* m_textPenSize;
|
||||||
wxTextCtrl* m_HPGLPenSizeOpt;
|
wxTextCtrl* m_HPGLPenSizeOpt;
|
||||||
wxStaticText* m_textPenOvr;
|
wxStaticText* m_textPenOvr;
|
||||||
wxTextCtrl* m_HPGLPenOverlayOpt;
|
wxTextCtrl* m_HPGLPenOverlayOpt;
|
||||||
wxStaticText* m_textPenSpeed;
|
wxStaticText* m_textPenSpeed;
|
||||||
wxTextCtrl* m_HPGLPenSpeedOpt;
|
wxTextCtrl* m_HPGLPenSpeedOpt;
|
||||||
wxStaticBoxSizer* m_PSOptionsSizer;
|
wxStaticBoxSizer* m_PSOptionsSizer;
|
||||||
wxStaticText* m_staticText7;
|
wxStaticText* m_staticText7;
|
||||||
wxTextCtrl* m_fineAdjustXscaleOpt;
|
wxTextCtrl* m_fineAdjustXscaleOpt;
|
||||||
wxStaticText* m_staticText8;
|
wxStaticText* m_staticText8;
|
||||||
wxTextCtrl* m_fineAdjustYscaleOpt;
|
wxTextCtrl* m_fineAdjustYscaleOpt;
|
||||||
wxCheckBox* m_plotPSNegativeOpt;
|
wxCheckBox* m_plotPSNegativeOpt;
|
||||||
wxCheckBox* m_forcePSA4OutputOpt;
|
wxCheckBox* m_forcePSA4OutputOpt;
|
||||||
wxStaticText* m_staticText2;
|
wxTextCtrl* m_messagesBox;
|
||||||
wxTextCtrl* m_messagesBox;
|
wxButton* m_plotButton;
|
||||||
|
wxButton* m_buttonDrill;
|
||||||
wxButton* m_plotButton;
|
wxButton* m_buttonQuit;
|
||||||
wxButton* m_buttonDrill;
|
|
||||||
wxButton* m_buttonQuit;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
||||||
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
|
virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& 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 OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
|
virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
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();
|
||||||
DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,723 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
|
||||||
~DIALOG_PLOT_BASE();
|
};
|
||||||
|
|
||||||
};
|
#endif //__dialog_plot_base__
|
||||||
|
|
||||||
#endif //__dialog_plot_base__
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
release version:
|
release version:
|
||||||
2011 mar 03
|
2011 mar 11
|
||||||
files (.zip,.tgz):
|
files (.zip,.tgz):
|
||||||
kicad-2011-03-03
|
kicad-2011-03-11
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue