From e70eac296f972e8985346244b725f8fba5f6d84e Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 16 Apr 2011 17:03:21 +0200 Subject: [PATCH] Dialog design rules cosmetic enhancement --- pcbnew/dialogs/dialog_design_rules.cpp | 33 +- pcbnew/dialogs/dialog_design_rules_base.cpp | 95 +- pcbnew/dialogs/dialog_design_rules_base.fbp | 616 ++++--- pcbnew/dialogs/dialog_design_rules_base.h | 6 +- .../dialogs/dialog_exchange_modules_base.cpp | 199 +-- .../dialogs/dialog_exchange_modules_base.fbp | 1449 +++++++++++------ pcbnew/dialogs/dialog_exchange_modules_base.h | 126 +- pcbnew/xchgmod.cpp | 2 +- 8 files changed, 1478 insertions(+), 1048 deletions(-) diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index 9bc0a2f162..68417a891e 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -1,5 +1,4 @@ ///////////////////////////////////////////////////////////////////////////// - // Name: dialog_design_rules.cpp ///////////////////////////////////////////////////////////////////////////// @@ -45,6 +44,10 @@ #include "wx/generic/gridctrl.h" #include "dialog_design_rules_aux_helper_class.h" +// Column labels for net lists +#define NET_TITLE _( "Net" ) +#define CLASS_TITLE _( "Class" ) + // Field Positions on rules grid enum { GRID_CLEARANCE, @@ -161,8 +164,8 @@ DIALOG_DESIGN_RULES::DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent ) : column0.SetMask( wxLIST_MASK_TEXT ); column1.SetMask( wxLIST_MASK_TEXT ); - column0.SetText( _( "Net" ) ); - column1.SetText( _( "Class" ) ); + column0.SetText( NET_TITLE ); + column1.SetText( CLASS_TITLE ); m_leftListCtrl->InsertColumn( 0, column0 ); m_leftListCtrl->InsertColumn( 1, column1 ); @@ -429,24 +432,30 @@ void DIALOG_DESIGN_RULES::FillListBoxWithNetNames( NETS_LIST_CTRL* aListCtrl, #endif - // to speed up inserting we hide the control temporarily - aListCtrl->Hide(); - + // Add netclass info to m_Netnames and m_Classnames wxArrayString buffers + // aListCtrl uses wxLC_VIRTUAL option, so this is fast + wxClientDC sDC(aListCtrl); int row = 0; + // recompute the column widths here, after setting texts + int net_colsize = sDC.GetTextExtent( NET_TITLE ).x; + int class_colsize = sDC.GetTextExtent( CLASS_TITLE ).x; for( PNETCUPS::iterator i = ptrList.begin(); i!=ptrList.end(); ++i, ++row ) { + wxSize net_needed = sDC.GetTextExtent( (*i)->net ); + wxSize class_needed = sDC.GetTextExtent( (*i)->clazz ); + net_colsize = MAX( net_colsize, net_needed.x ); + class_colsize = MAX( class_colsize, class_needed.x ); aListCtrl->setRowItems( row, (*i)->net, (*i)->clazz ); } - // recompute the column widths here, after setting texts - aListCtrl->SetColumnWidth( 0, wxLIST_AUTOSIZE ); - aListCtrl->SetColumnWidth( 1, wxLIST_AUTOSIZE ); - - aListCtrl->Show(); + int margin = sDC.GetTextExtent( wxT("XX") ).x;; + aListCtrl->SetColumnWidth( 0, net_colsize + margin); + aListCtrl->SetColumnWidth( 1, class_colsize + margin); + aListCtrl->Refresh(); } -/* Initialize the combo boxes by the list of existing net classes +/* Populates combo boxes with the list of existing net classes */ void DIALOG_DESIGN_RULES::InitializeRulesSelectionBoxes() { diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index 8eac60edcb..b9fb6b34a7 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -153,7 +153,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer ); m_panelNetClassesEditor->Layout(); bpanelNetClassesSizer->Fit( m_panelNetClassesEditor ); - m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true ); + m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), false ); m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); wxBoxSizer* bpanelGlobRulesSizer; bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL ); @@ -172,72 +172,21 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbViasOptionSizer->Add( m_OptViaType, 0, wxALL|wxEXPAND, 5 ); - wxFlexGridSizer* fgViasMinValuesSizer; - fgViasMinValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgViasMinValuesSizer->AddGrowableCol( 1 ); - fgViasMinValuesSizer->SetFlexibleDirection( wxBOTH ); - fgViasMinValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_ViaMinTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via diameter"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaMinTitle->Wrap( -1 ); - fgViasMinValuesSizer->Add( m_ViaMinTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SetViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgViasMinValuesSizer->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxALL, 5 ); - - m_ViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via drill dia"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaMinDrillTitle->Wrap( -1 ); - fgViasMinValuesSizer->Add( m_ViaMinDrillTitle, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT, 5 ); - - m_SetViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgViasMinValuesSizer->Add( m_SetViasMinDrillCtrl, 0, wxALL|wxEXPAND, 5 ); - - sbViasOptionSizer->Add( fgViasMinValuesSizer, 0, wxEXPAND, 5 ); - - bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxALIGN_CENTER_VERTICAL, 5 ); - - wxStaticBoxSizer* sbuViasSizer; - sbuViasSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Micro Via Options:") ), wxVERTICAL ); - wxString m_AllowMicroViaCtrlChoices[] = { _("Do not allow micro vias"), _("Allow micro vias") }; int m_AllowMicroViaCtrlNChoices = sizeof( m_AllowMicroViaCtrlChoices ) / sizeof( wxString ); m_AllowMicroViaCtrl = new wxRadioBox( m_panelGolbalDesignRules, wxID_ANY, _("Micro Vias:"), wxDefaultPosition, wxDefaultSize, m_AllowMicroViaCtrlNChoices, m_AllowMicroViaCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_AllowMicroViaCtrl->SetSelection( 0 ); m_AllowMicroViaCtrl->SetToolTip( _("Allows or do not allow use of micro vias\nThey are very small vias only from an external copper layer to its near neightbour") ); - sbuViasSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 ); + sbViasOptionSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 ); - wxFlexGridSizer* fgMinMicroviasValuesSizer; - fgMinMicroviasValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgMinMicroviasValuesSizer->AddGrowableCol( 1 ); - fgMinMicroviasValuesSizer->SetFlexibleDirection( wxBOTH ); - fgMinMicroviasValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_MicroViaMinSizeTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min uvia diameter"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MicroViaMinSizeTitle->Wrap( -1 ); - fgMinMicroviasValuesSizer->Add( m_MicroViaMinSizeTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SetMicroViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SetMicroViasMinSizeCtrl->SetMaxLength( 6 ); - fgMinMicroviasValuesSizer->Add( m_SetMicroViasMinSizeCtrl, 0, wxALL|wxEXPAND, 5 ); - - m_MicroViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min uvia drill dia"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MicroViaMinDrillTitle->Wrap( -1 ); - fgMinMicroviasValuesSizer->Add( m_MicroViaMinDrillTitle, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_SetMicroViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SetMicroViasMinDrillCtrl->SetMaxLength( 6 ); - fgMinMicroviasValuesSizer->Add( m_SetMicroViasMinDrillCtrl, 0, wxALL|wxEXPAND, 5 ); - - sbuViasSizer->Add( fgMinMicroviasValuesSizer, 1, wxEXPAND, 5 ); - - bDesignRulesUpperSizer->Add( sbuViasSizer, 1, wxALIGN_CENTER_VERTICAL, 5 ); + bDesignRulesUpperSizer->Add( sbViasOptionSizer, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbMinSizesSizer; sbMinSizesSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGolbalDesignRules, wxID_ANY, _("Minimum Allowed Values:") ), wxVERTICAL ); wxFlexGridSizer* fgMinValuesSizer; - fgMinValuesSizer = new wxFlexGridSizer( 1, 2, 0, 0 ); + fgMinValuesSizer = new wxFlexGridSizer( 5, 2, 0, 0 ); fgMinValuesSizer->AddGrowableCol( 1 ); fgMinValuesSizer->SetFlexibleDirection( wxBOTH ); fgMinValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -249,9 +198,39 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_SetTrackMinWidthCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgMinValuesSizer->Add( m_SetTrackMinWidthCtrl, 0, wxALL|wxEXPAND, 5 ); - sbMinSizesSizer->Add( fgMinValuesSizer, 0, 0, 5 ); + m_ViaMinTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via diameter"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaMinTitle->Wrap( -1 ); + fgMinValuesSizer->Add( m_ViaMinTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); - bDesignRulesUpperSizer->Add( sbMinSizesSizer, 1, wxEXPAND, 5 ); + m_SetViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgMinValuesSizer->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_ViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via drill dia"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaMinDrillTitle->Wrap( -1 ); + fgMinValuesSizer->Add( m_ViaMinDrillTitle, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT, 5 ); + + m_SetViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgMinValuesSizer->Add( m_SetViasMinDrillCtrl, 0, wxALL|wxEXPAND, 5 ); + + m_MicroViaMinSizeTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min uvia diameter"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MicroViaMinSizeTitle->Wrap( -1 ); + fgMinValuesSizer->Add( m_MicroViaMinSizeTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + + m_SetMicroViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SetMicroViasMinSizeCtrl->SetMaxLength( 6 ); + fgMinValuesSizer->Add( m_SetMicroViasMinSizeCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_MicroViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min uvia drill dia"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MicroViaMinDrillTitle->Wrap( -1 ); + fgMinValuesSizer->Add( m_MicroViaMinDrillTitle, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + m_SetMicroViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SetMicroViasMinDrillCtrl->SetMaxLength( 6 ); + fgMinValuesSizer->Add( m_SetMicroViasMinDrillCtrl, 0, wxEXPAND|wxALL, 5 ); + + sbMinSizesSizer->Add( fgMinValuesSizer, 0, wxEXPAND, 5 ); + + bDesignRulesUpperSizer->Add( sbMinSizesSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bpanelGlobRulesSizer->Add( bDesignRulesUpperSizer, 0, wxEXPAND, 5 ); @@ -357,7 +336,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer ); m_panelGolbalDesignRules->Layout(); bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules ); - m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false ); + m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), true ); bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index 3379fb5233..8e1edde4d7 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -199,7 +199,7 @@ Net Classes Editor - 1 + 0 1 1 @@ -1469,7 +1469,7 @@ Global Design Rules - 0 + 1 1 1 @@ -1561,7 +1561,7 @@ none 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT 1 wxID_ANY @@ -1658,6 +1658,107 @@ + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + 1 + 0 + "Do not allow micro vias" "Allow micro vias" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Micro Vias: + + 1 + 0 + + 0 + + 1 + m_AllowMicroViaCtrl + 1 + + + protected + 1 + + + Resizable + + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + Allows or do not allow use of micro vias They are very small vias only from an external copper layer to its near neightbour + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + wxID_ANY + Minimum Allowed Values: + + sbMinSizesSizer + wxVERTICAL + none + 5 wxEXPAND @@ -1669,14 +1770,186 @@ 0 - fgViasMinValuesSizer + fgMinValuesSizer wxFLEX_GROWMODE_SPECIFIED none - 2 + 5 0 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Min track width + + 0 + + 0 + + 1 + m_TrackMinWidthTitle + 1 + + + protected + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + 0 + + 1 + m_SetTrackMinWidthCtrl + 1 + + + protected + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -1760,7 +2033,7 @@ 5 - wxEXPAND|wxALL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -2018,128 +2291,9 @@ - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 1 - - wxID_ANY - Micro Via Options: - - sbuViasSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - 1 - 0 - "Do not allow micro vias" "Allow micro vias" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Micro Vias: - - 1 - 0 - - 0 - - 1 - m_AllowMicroViaCtrl - 1 - - - protected - 1 - - - Resizable - - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - Allows or do not allow use of micro vias They are very small vias only from an external copper layer to its near neightbour - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 2 - wxBOTH - 1 - - 0 - - fgMinMicroviasValuesSizer - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 5 - wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 @@ -2223,7 +2377,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -2395,7 +2549,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxALL 0 1 @@ -2485,210 +2639,6 @@ - - 5 - wxEXPAND - 1 - - wxID_ANY - Minimum Allowed Values: - - sbMinSizesSizer - wxVERTICAL - none - - - 5 - - 0 - - 2 - wxBOTH - 1 - - 0 - - fgMinValuesSizer - wxFLEX_GROWMODE_SPECIFIED - none - 1 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Min track width - - 0 - - 0 - - 1 - m_TrackMinWidthTitle - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - 0 - - 1 - m_SetTrackMinWidthCtrl - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index d328755970..3a0014741f 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -71,17 +71,17 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog NETS_LIST_CTRL* m_rightListCtrl; wxPanel* m_panelGolbalDesignRules; wxRadioBox* m_OptViaType; + wxRadioBox* m_AllowMicroViaCtrl; + wxStaticText* m_TrackMinWidthTitle; + wxTextCtrl* m_SetTrackMinWidthCtrl; wxStaticText* m_ViaMinTitle; wxTextCtrl* m_SetViasMinSizeCtrl; wxStaticText* m_ViaMinDrillTitle; wxTextCtrl* m_SetViasMinDrillCtrl; - wxRadioBox* m_AllowMicroViaCtrl; wxStaticText* m_MicroViaMinSizeTitle; wxTextCtrl* m_SetMicroViasMinSizeCtrl; wxStaticText* m_MicroViaMinDrillTitle; wxTextCtrl* m_SetMicroViasMinDrillCtrl; - wxStaticText* m_TrackMinWidthTitle; - wxTextCtrl* m_SetTrackMinWidthCtrl; wxStaticLine* m_staticline1; wxStaticText* m_staticTextInfo; wxStaticText* m_staticText7; diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.cpp b/pcbnew/dialogs/dialog_exchange_modules_base.cpp index 2612d2900a..e51df2d29d 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_modules_base.cpp @@ -1,97 +1,102 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_exchange_modules_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_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( wxVERTICAL ); - - wxBoxSizer* bUpperSizer; - bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bLeftSizer; - bLeftSizer = new wxBoxSizer( wxVERTICAL ); - - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Current Module"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - bLeftSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_OldModule = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - bLeftSizer->Add( m_OldModule, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_staticText7 = new wxStaticText( this, wxID_ANY, _("Current Value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - bLeftSizer->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_OldValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - bLeftSizer->Add( m_OldValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_staticText8 = new wxStaticText( this, wxID_ANY, _("New Module"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText8->Wrap( -1 ); - bLeftSizer->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_NewModule = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bLeftSizer->Add( m_NewModule, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - bUpperSizer->Add( bLeftSizer, 1, 0, 5 ); - - wxBoxSizer* bMiddleSizer; - bMiddleSizer = new wxBoxSizer( wxVERTICAL ); - - wxString m_SelectionChoices[] = { _("Change module"), _("Change same modules"), _("Ch. same module+value"), _("Change all") }; - int m_SelectionNChoices = sizeof( m_SelectionChoices ) / sizeof( wxString ); - m_Selection = new wxRadioBox( this, ID_SELECTION_CLICKED, _("Browse Libs modules"), wxDefaultPosition, wxDefaultSize, m_SelectionNChoices, m_SelectionChoices, 1, wxRA_SPECIFY_COLS ); - m_Selection->SetSelection( 0 ); - bMiddleSizer->Add( m_Selection, 0, wxALL, 5 ); - - bUpperSizer->Add( bMiddleSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - m_OKbutton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_OKbutton, 0, wxALL, 5 ); - - m_Quitbutton = new wxButton( this, wxID_CANCEL, _("Quit"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_Quitbutton, 0, wxALL, 5 ); - - m_Browsebutton = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_Browsebutton, 0, wxALL, 5 ); - - bUpperSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 ); - - m_WinMessages = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); - m_WinMessages->SetMinSize( wxSize( 450,300 ) ); - - bMainSizer->Add( m_WinMessages, 1, wxALL|wxEXPAND, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - m_Selection->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnSelectionClicked ), NULL, this ); - m_OKbutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnOkClick ), NULL, this ); - m_Quitbutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); - m_Browsebutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::BrowseAndSelectFootprint ), NULL, this ); -} - -DIALOG_EXCHANGE_MODULE_BASE::~DIALOG_EXCHANGE_MODULE_BASE() -{ - // Disconnect Events - m_Selection->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnSelectionClicked ), NULL, this ); - m_OKbutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnOkClick ), NULL, this ); - m_Quitbutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); - m_Browsebutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::BrowseAndSelectFootprint ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Nov 17 2010) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_exchange_modules_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_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( wxVERTICAL ); + + wxBoxSizer* bUpperSizer; + bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bLeftSizer; + bLeftSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticText6 = new wxStaticText( this, wxID_ANY, _("Current Module"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6->Wrap( -1 ); + bLeftSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_OldModule = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + bLeftSizer->Add( m_OldModule, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_staticText7 = new wxStaticText( this, wxID_ANY, _("Current Value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7->Wrap( -1 ); + bLeftSizer->Add( m_staticText7, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_OldValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + bLeftSizer->Add( m_OldValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_staticText8 = new wxStaticText( this, wxID_ANY, _("New Module"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText8->Wrap( -1 ); + bLeftSizer->Add( m_staticText8, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_NewModule = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bLeftSizer->Add( m_NewModule, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + bUpperSizer->Add( bLeftSizer, 1, 0, 5 ); + + wxBoxSizer* bMiddleSizer; + bMiddleSizer = new wxBoxSizer( wxVERTICAL ); + + wxString m_SelectionChoices[] = { _("Change module"), _("Change same modules"), _("Ch. same module+value"), _("Change all") }; + int m_SelectionNChoices = sizeof( m_SelectionChoices ) / sizeof( wxString ); + m_Selection = new wxRadioBox( this, ID_SELECTION_CLICKED, _("Browse Libs modules"), wxDefaultPosition, wxDefaultSize, m_SelectionNChoices, m_SelectionChoices, 1, wxRA_SPECIFY_COLS ); + m_Selection->SetSelection( 0 ); + bMiddleSizer->Add( m_Selection, 0, wxALL, 5 ); + + bUpperSizer->Add( bMiddleSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + wxBoxSizer* bRightSizer; + bRightSizer = new wxBoxSizer( wxVERTICAL ); + + m_OKbutton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_OKbutton, 0, wxALL, 5 ); + + m_Quitbutton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_Quitbutton, 0, wxALL, 5 ); + + m_Browsebutton = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_Browsebutton, 0, wxALL, 5 ); + + bUpperSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 ); + + m_staticTextMsg = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextMsg->Wrap( -1 ); + bMainSizer->Add( m_staticTextMsg, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + m_WinMessages = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + m_WinMessages->SetMinSize( wxSize( 450,300 ) ); + + bMainSizer->Add( m_WinMessages, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + m_Selection->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnSelectionClicked ), NULL, this ); + m_OKbutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnOkClick ), NULL, this ); + m_Quitbutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); + m_Browsebutton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::BrowseAndSelectFootprint ), NULL, this ); +} + +DIALOG_EXCHANGE_MODULE_BASE::~DIALOG_EXCHANGE_MODULE_BASE() +{ + // Disconnect Events + m_Selection->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnSelectionClicked ), NULL, this ); + m_OKbutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnOkClick ), NULL, this ); + m_Quitbutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); + m_Browsebutton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::BrowseAndSelectFootprint ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.fbp b/pcbnew/dialogs/dialog_exchange_modules_base.fbp index f4b5980baa..d49ff4431d 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_modules_base.fbp @@ -2,9 +2,11 @@ - + C++ 1 + source_name + 0 UTF-8 connect dialog_exchange_modules_base @@ -12,66 +14,102 @@ none 1 dialog_exchange_modules_base - + . - + 1 + 1 0 0 - - - + 1 + 1 + 1 + 1 + 0 + + + + 1 + + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - - + impl_virtual + + + 1 + + 0 0 wxID_ANY - - + + 0 + + 0 + + 1 DIALOG_EXCHANGE_MODULE_BASE - + 1 + + + 1 + + + Resizable + + 1 416,469 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Exchange Modules - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -80,16 +118,16 @@ wxEXPAND 0 - + bUpperSizer wxHORIZONTAL none 5 - + 1 - + bLeftSizer wxVERTICAL none @@ -98,50 +136,83 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current Module - - + + 0 + + 0 + + 1 m_staticText6 + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -149,54 +220,87 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + 0 + + 1 m_OldModule + 1 + + protected - - + 1 + + + Resizable + + 1 + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -204,50 +308,83 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Current Value - - + + 0 + + 0 + + 1 m_staticText7 + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -255,54 +392,87 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + 0 + + 1 m_OldValue + 1 + + protected - - + 1 + + + Resizable + + 1 + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,50 +480,83 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY New Module - - + + 0 + + 0 + + 1 m_staticText8 + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -361,54 +564,87 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 - + 0 + + 1 m_NewModule + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -418,7 +654,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bMiddleSizer wxVERTICAL none @@ -427,53 +663,86 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + 1 + 0 "Change module" "Change same modules" "Ch. same module+value" "Change all" - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_SELECTION_CLICKED Browse Libs modules + 1 - - + 0 + + 0 + + 1 m_Selection + 1 + + protected - + 1 + + + Resizable + 0 - + 1 + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + OnSelectionClicked - - - - - - + + + + + + @@ -483,7 +752,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bRightSizer wxVERTICAL none @@ -492,51 +761,84 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_OK OK - - + + 0 + + 0 + + 1 m_OKbutton + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnOkClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -544,51 +846,84 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_CANCEL - Quit - - + Close + + 0 + + 0 + + 1 m_Quitbutton + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnQuit - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -596,51 +931,84 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Browse - - + + 0 + + 0 + + 1 m_Browsebutton + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + BrowseAndSelectFootprint - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -649,57 +1017,174 @@ 5 - wxALL|wxEXPAND - 1 - - - + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - - 0 - 450,300 - m_WinMessages + Messages: + + 0 + + 0 + + 1 + m_staticTextMsg + 1 + + protected - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + 0 + 450,300 + 1 + m_WinMessages + 1 + + + protected + 1 + + + Resizable + + 1 + wxTE_MULTILINE|wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.h b/pcbnew/dialogs/dialog_exchange_modules_base.h index 13e147a735..0f4fc59ab8 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.h +++ b/pcbnew/dialogs/dialog_exchange_modules_base.h @@ -1,62 +1,64 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_exchange_modules_base__ -#define __dialog_exchange_modules_base__ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_SELECTION_CLICKED 1000 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_EXCHANGE_MODULE_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_EXCHANGE_MODULE_BASE : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText6; - wxTextCtrl* m_OldModule; - wxStaticText* m_staticText7; - wxTextCtrl* m_OldValue; - wxStaticText* m_staticText8; - wxTextCtrl* m_NewModule; - wxRadioBox* m_Selection; - wxButton* m_OKbutton; - wxButton* m_Quitbutton; - wxButton* m_Browsebutton; - wxTextCtrl* m_WinMessages; - - // Virtual event handlers, overide them in your derived class - virtual void OnSelectionClicked( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); } - virtual void BrowseAndSelectFootprint( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Exchange Modules"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 416,469 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_EXCHANGE_MODULE_BASE(); - -}; - -#endif //__dialog_exchange_modules_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Nov 17 2010) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __dialog_exchange_modules_base__ +#define __dialog_exchange_modules_base__ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_SELECTION_CLICKED 1000 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_EXCHANGE_MODULE_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_EXCHANGE_MODULE_BASE : public wxDialog +{ + private: + + protected: + wxStaticText* m_staticText6; + wxTextCtrl* m_OldModule; + wxStaticText* m_staticText7; + wxTextCtrl* m_OldValue; + wxStaticText* m_staticText8; + wxTextCtrl* m_NewModule; + wxRadioBox* m_Selection; + wxButton* m_OKbutton; + wxButton* m_Quitbutton; + wxButton* m_Browsebutton; + wxStaticText* m_staticTextMsg; + wxTextCtrl* m_WinMessages; + + // Virtual event handlers, overide them in your derived class + virtual void OnSelectionClicked( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); } + virtual void BrowseAndSelectFootprint( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Exchange Modules"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 416,469 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_EXCHANGE_MODULE_BASE(); + +}; + +#endif //__dialog_exchange_modules_base__ diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp index 56a8bd648c..eb772c47b9 100644 --- a/pcbnew/xchgmod.cpp +++ b/pcbnew/xchgmod.cpp @@ -68,7 +68,7 @@ void PCB_EDIT_FRAME::InstallExchangeModuleFrame( MODULE* Module ) void DIALOG_EXCHANGE_MODULE::OnQuit( wxCommandEvent& event ) { s_SelectionMode = m_Selection->GetSelection(); - Close( true ); // true is to force the frame to close + EndModal( 0 ); }