From 9c60e618c0a5dda29aa9b9f8fae055b85fb839c0 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 30 Mar 2013 14:36:19 +0100 Subject: [PATCH] pcbnew: fix some cosmetic issues (could be very dependant on wxWidgets/Gtk versions) --- pcbnew/dialogs/dialog_layers_setup_base.cpp | 40 +- pcbnew/dialogs/dialog_layers_setup_base.fbp | 284 ++- pcbnew/dialogs/dialog_layers_setup_base.h | 12 +- pcbnew/dialogs/dialog_pad_properties_base.cpp | 70 +- pcbnew/dialogs/dialog_pad_properties_base.fbp | 137 +- pcbnew/dialogs/dialog_pad_properties_base.h | 3 +- ...ialog_pcbnew_config_libs_and_paths_fbp.cpp | 87 +- ...ialog_pcbnew_config_libs_and_paths_fbp.fbp | 1750 ++++++++++------- .../dialog_pcbnew_config_libs_and_paths_fbp.h | 18 +- template/kicad.pro | 31 +- 10 files changed, 1484 insertions(+), 948 deletions(-) diff --git a/pcbnew/dialogs/dialog_layers_setup_base.cpp b/pcbnew/dialogs/dialog_layers_setup_base.cpp index 59d55b9b0b..466b5d8976 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.cpp +++ b/pcbnew/dialogs/dialog_layers_setup_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -19,35 +19,47 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bChoicesSizer; bChoicesSizer = new wxBoxSizer( wxHORIZONTAL ); - wxStaticBoxSizer* sbPresetsSizer; - sbPresetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Preset Layer Groupings") ), wxVERTICAL ); + wxBoxSizer* bPresetsSizer; + bPresetsSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticTextGrouping = new wxStaticText( this, wxID_ANY, _("Preset Layer Groupings"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrouping->Wrap( -1 ); + bPresetsSizer->Add( m_staticTextGrouping, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxString m_PresetsChoiceChoices[] = { _("Custom"), _("Two layers, parts on Front only"), _("Two layers, parts on Back only"), _("Two layers, parts on Front and Back"), _("Four layers, parts on Front only"), _("Four layers, parts on Front and Back"), _("All layers on") }; int m_PresetsChoiceNChoices = sizeof( m_PresetsChoiceChoices ) / sizeof( wxString ); m_PresetsChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PresetsChoiceNChoices, m_PresetsChoiceChoices, 0 ); m_PresetsChoice->SetSelection( 0 ); - sbPresetsSizer->Add( m_PresetsChoice, 0, wxEXPAND, 5 ); + bPresetsSizer->Add( m_PresetsChoice, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bChoicesSizer->Add( sbPresetsSizer, 2, wxALL|wxEXPAND, 5 ); + bChoicesSizer->Add( bPresetsSizer, 1, wxEXPAND, 5 ); - wxStaticBoxSizer* sbCopperLayersSizer; - sbCopperLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Copper Layers") ), wxVERTICAL ); + wxBoxSizer* bCopperLayersSizer; + bCopperLayersSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticTextCopperLayers = new wxStaticText( this, wxID_ANY, _("Copper Layers"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextCopperLayers->Wrap( -1 ); + bCopperLayersSizer->Add( m_staticTextCopperLayers, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxString m_CopperLayersChoiceChoices[] = { _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16") }; int m_CopperLayersChoiceNChoices = sizeof( m_CopperLayersChoiceChoices ) / sizeof( wxString ); m_CopperLayersChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_CopperLayersChoiceNChoices, m_CopperLayersChoiceChoices, 0 ); m_CopperLayersChoice->SetSelection( 0 ); - sbCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND, 5 ); + bCopperLayersSizer->Add( m_CopperLayersChoice, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bChoicesSizer->Add( sbCopperLayersSizer, 1, wxALL|wxEXPAND, 5 ); + bChoicesSizer->Add( bCopperLayersSizer, 1, wxEXPAND, 5 ); bMainSizer->Add( bChoicesSizer, 0, wxEXPAND, 5 ); - wxStaticBoxSizer* sbLayersSizer; - sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxVERTICAL ); + wxBoxSizer* b_layersListSizer; + b_layersListSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticTextLayers = new wxStaticText( this, wxID_ANY, _("Layers"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextLayers->Wrap( -1 ); + b_layersListSizer->Add( m_staticTextLayers, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bCaptionsSizer; bCaptionsSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -59,7 +71,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID bCaptionsSizer->Add( m_TitlePanel, 1, wxEXPAND, 5 ); - sbLayersSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND, 5 ); + b_layersListSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL ); m_LayersListPanel->SetScrollRate( 0, 5 ); @@ -834,10 +846,10 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID m_LayersListPanel->SetSizer( m_LayerListFlexGridSizer ); m_LayersListPanel->Layout(); m_LayerListFlexGridSizer->Fit( m_LayersListPanel ); - sbLayersSizer->Add( m_LayersListPanel, 1, wxALL|wxEXPAND, 5 ); + b_layersListSizer->Add( m_LayersListPanel, 1, wxALL|wxEXPAND, 5 ); - bMainSizer->Add( sbLayersSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); + bMainSizer->Add( b_layersListSizer, 1, wxEXPAND, 5 ); m_sdbSizer2 = new wxStdDialogButtonSizer(); m_sdbSizer2OK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_layers_setup_base.fbp b/pcbnew/dialogs/dialog_layers_setup_base.fbp index 7594bc8510..4fd892ccf1 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.fbp +++ b/pcbnew/dialogs/dialog_layers_setup_base.fbp @@ -102,19 +102,99 @@ none 5 - wxALL|wxEXPAND - 2 - - wxID_ANY - Preset Layer Groupings + wxEXPAND + 1 + - sbPresetsSizer + bPresetsSizer wxVERTICAL none - 5 - wxEXPAND + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Preset Layer Groupings + + 0 + + + 0 + + 1 + m_staticTextGrouping + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -204,19 +284,99 @@ 5 - wxALL|wxEXPAND + wxEXPAND 1 - - wxID_ANY - Copper Layers + - sbCopperLayersSizer + bCopperLayersSizer wxVERTICAL none - 5 - wxEXPAND + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Copper Layers + + 0 + + + 0 + + 1 + m_staticTextCopperLayers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -308,19 +468,99 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxEXPAND 1 - - wxID_ANY - Layers + - sbLayersSizer + b_layersListSizer wxVERTICAL none - 5 - wxALIGN_CENTER|wxEXPAND + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Layers + + 0 + + + 0 + + 1 + m_staticTextLayers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER|wxEXPAND|wxRIGHT|wxLEFT 0 diff --git a/pcbnew/dialogs/dialog_layers_setup_base.h b/pcbnew/dialogs/dialog_layers_setup_base.h index e0962b4b63..48f4dafa67 100644 --- a/pcbnew/dialogs/dialog_layers_setup_base.h +++ b/pcbnew/dialogs/dialog_layers_setup_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,17 +11,18 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include -#include +#include #include #include #include #include +#include #include -#include #include -#include #include #include #include @@ -126,8 +127,11 @@ class DIALOG_LAYERS_SETUP_BASE : public DIALOG_SHIM private: protected: + wxStaticText* m_staticTextGrouping; wxChoice* m_PresetsChoice; + wxStaticText* m_staticTextCopperLayers; wxChoice* m_CopperLayersChoice; + wxStaticText* m_staticTextLayers; wxPanel* m_TitlePanel; wxScrolledWindow* m_LayersListPanel; wxFlexGridSizer* m_LayerListFlexGridSizer; diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 21e66b3dac..2088cf454c 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -221,25 +221,8 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_LeftBoxSizer->Add( fgSizerShapeType, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - wxBoxSizer* bMiddleUpperSizer; - bMiddleUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_DrillShapeBoxSizer = new wxBoxSizer( wxVERTICAL ); - - - bMiddleUpperSizer->Add( m_DrillShapeBoxSizer, 0, wxBOTTOM, 5 ); - - wxBoxSizer* m_MiddleRightBoxSizer; - m_MiddleRightBoxSizer = new wxBoxSizer( wxVERTICAL ); - - - bMiddleUpperSizer->Add( m_MiddleRightBoxSizer, 0, wxBOTTOM, 5 ); - - - m_LeftBoxSizer->Add( bMiddleUpperSizer, 0, wxEXPAND, 5 ); - wxStaticBoxSizer* sbSizeModuleInfo; - sbSizeModuleInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Footprint Orientation") ), wxVERTICAL ); + sbSizeModuleInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Parent footprint orientation") ), wxVERTICAL ); wxFlexGridSizer* fgSizer4; fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 ); @@ -264,13 +247,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizer4->Add( m_staticModuleSideValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - sbSizeModuleInfo->Add( fgSizer4, 1, wxEXPAND, 5 ); + sbSizeModuleInfo->Add( fgSizer4, 0, 0, 5 ); - m_LeftBoxSizer->Add( sbSizeModuleInfo, 0, wxEXPAND|wxBOTTOM, 5 ); + m_LeftBoxSizer->Add( sbSizeModuleInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - bGeneralSizer->Add( m_LeftBoxSizer, 0, wxALL|wxEXPAND, 5 ); + bGeneralSizer->Add( m_LeftBoxSizer, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxVERTICAL ); @@ -280,6 +263,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind wxFlexGridSizer* fgSizerGeometry; fgSizerGeometry = new wxFlexGridSizer( 14, 3, 0, 0 ); + fgSizerGeometry->AddGrowableCol( 1 ); fgSizerGeometry->SetFlexibleDirection( wxBOTH ); fgSizerGeometry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -322,10 +306,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizerGeometry->Add( m_PadDrill_Y_Unit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - sbSizer2->Add( fgSizerGeometry, 1, wxEXPAND, 5 ); + sbSizer2->Add( fgSizerGeometry, 0, wxEXPAND, 5 ); - bSizer10->Add( sbSizer2, 0, wxALL, 5 ); + bSizer10->Add( sbSizer2, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* m_LayersSizer; m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Layers") ), wxVERTICAL ); @@ -386,7 +370,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_LayersSizer->Add( sbSizerTechlayers, 0, wxALL|wxEXPAND, 5 ); - bSizer10->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 5 ); + bSizer10->Add( m_LayersSizer, 0, wxALL|wxEXPAND, 5 ); bGeneralSizer->Add( bSizer10, 0, wxALL|wxEXPAND, 5 ); @@ -397,8 +381,8 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bGeneralSizer->Fit( m_panelGeneral ); m_notebook->AddPage( m_panelGeneral, _("General"), true ); m_localSettingsPanel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* bSizer14; - bSizer14 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizerPanelClearance; + bSizerPanelClearance = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* bSizerClearance; bSizerClearance = new wxBoxSizer( wxVERTICAL ); @@ -408,6 +392,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind wxFlexGridSizer* fgClearancesGridSizer; fgClearancesGridSizer = new wxFlexGridSizer( 4, 3, 0, 0 ); + fgClearancesGridSizer->AddGrowableCol( 1 ); fgClearancesGridSizer->SetFlexibleDirection( wxBOTH ); fgClearancesGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -468,16 +453,17 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgClearancesGridSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - sbClearancesSizer->Add( fgClearancesGridSizer, 1, wxEXPAND, 5 ); + sbClearancesSizer->Add( fgClearancesGridSizer, 0, wxEXPAND, 5 ); - bSizerClearance->Add( sbClearancesSizer, 0, wxEXPAND|wxALL, 5 ); + bSizerClearance->Add( sbClearancesSizer, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerZonesSettings; sbSizerZonesSettings = new wxStaticBoxSizer( new wxStaticBox( m_localSettingsPanel, wxID_ANY, _("Copper Zones") ), wxVERTICAL ); wxFlexGridSizer* fgSizer41; fgSizer41 = new wxFlexGridSizer( 3, 3, 0, 0 ); + fgSizer41->AddGrowableCol( 1 ); fgSizer41->SetFlexibleDirection( wxBOTH ); fgSizer41->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -489,7 +475,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString ); m_ZoneConnectionChoice = new wxChoice( m_localSettingsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 ); m_ZoneConnectionChoice->SetSelection( 0 ); - fgSizer41->Add( m_ZoneConnectionChoice, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); + fgSizer41->Add( m_ZoneConnectionChoice, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxEXPAND, 5 ); m_staticText53 = new wxStaticText( m_localSettingsPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticText53->Wrap( -1 ); @@ -520,10 +506,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizer41->Add( m_ThermalGapUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - sbSizerZonesSettings->Add( fgSizer41, 1, wxEXPAND, 5 ); + sbSizerZonesSettings->Add( fgSizer41, 0, wxEXPAND, 5 ); - bSizerClearance->Add( sbSizerZonesSettings, 0, wxEXPAND|wxALL, 5 ); + bSizerClearance->Add( sbSizerZonesSettings, 0, wxALL|wxEXPAND, 5 ); m_staticTextWarning = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Set fields to 0 to use parent or global values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextWarning->Wrap( -1 ); @@ -532,29 +518,26 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bSizerClearance->Add( m_staticTextWarning, 0, wxALL, 5 ); - bSizer14->Add( bSizerClearance, 0, wxALL, 5 ); + bSizerPanelClearance->Add( bSizerClearance, 0, wxALL|wxEXPAND, 5 ); - bSizer14->Add( 0, 0, 1, wxEXPAND, 5 ); - - - m_localSettingsPanel->SetSizer( bSizer14 ); + m_localSettingsPanel->SetSizer( bSizerPanelClearance ); m_localSettingsPanel->Layout(); - bSizer14->Fit( m_localSettingsPanel ); + bSizerPanelClearance->Fit( m_localSettingsPanel ); m_notebook->AddPage( m_localSettingsPanel, _("Local Clearance and Settings"), false ); - bSizerUpper->Add( m_notebook, 0, wxALL|wxEXPAND, 5 ); + bSizerUpper->Add( m_notebook, 0, wxALL, 5 ); - wxBoxSizer* bSizer13x; - bSizer13x = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizerDisplayPad; + bSizerDisplayPad = new wxBoxSizer( wxVERTICAL ); m_panelShowPad = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( 200,200 ), wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER ); m_panelShowPad->SetBackgroundColour( wxColour( 0, 0, 0 ) ); - bSizer13x->Add( m_panelShowPad, 1, wxRIGHT|wxTOP, 5 ); + bSizerDisplayPad->Add( m_panelShowPad, 1, wxRIGHT|wxTOP|wxEXPAND, 5 ); - bSizerUpper->Add( bSizer13x, 1, wxALL, 5 ); + bSizerUpper->Add( bSizerDisplayPad, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_MainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 ); @@ -572,12 +555,11 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - m_MainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + m_MainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); this->SetSizer( m_MainSizer ); this->Layout(); - m_MainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index a4561cdf35..299fe40396 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -42,7 +42,7 @@ -1,-1 DIALOG_PAD_PROPERTIES_BASE - -1,-1 + 745,725 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Pad Properties @@ -102,7 +102,7 @@ none 5 - wxALL|wxEXPAND + wxALL 0 1 @@ -265,11 +265,11 @@ bGeneralSizer wxHORIZONTAL none - + 5 wxALL|wxEXPAND - 0 - + 1 + m_LeftBoxSizer wxVERTICAL @@ -3821,56 +3821,23 @@ - + 5 - wxEXPAND + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - - bMiddleUpperSizer - wxHORIZONTAL - none - - 5 - wxBOTTOM - 0 - - - m_DrillShapeBoxSizer - wxVERTICAL - protected - - - - 5 - wxBOTTOM - 0 - - - m_MiddleRightBoxSizer - wxVERTICAL - none - - - - - - 5 - wxEXPAND|wxBOTTOM - 0 - + wxID_ANY - Footprint Orientation + Parent footprint orientation sbSizeModuleInfo wxVERTICAL none - + 5 - wxEXPAND - 1 - + + 0 + 2 wxBOTH 1 @@ -4220,20 +4187,20 @@ - + 5 wxALL|wxEXPAND 0 - + bSizer10 wxVERTICAL none - + 5 - wxALL + wxALL|wxEXPAND 0 - + wxID_ANY Drill @@ -4241,14 +4208,14 @@ wxVERTICAL none - + 5 wxEXPAND - 1 - + 0 + 3 wxBOTH - + 1 0 @@ -5029,11 +4996,11 @@ - + 5 wxALL|wxEXPAND - 1 - + 0 + wxID_ANY Layers @@ -6290,25 +6257,25 @@ - + - bSizer14 + bSizerPanelClearance wxVERTICAL none - + 5 - wxALL + wxALL|wxEXPAND 0 - + bSizerClearance wxVERTICAL none - + 5 - wxEXPAND|wxALL + wxALL|wxEXPAND 0 - + wxID_ANY Clearances @@ -6319,11 +6286,11 @@ 5 wxEXPAND - 1 + 0 3 wxBOTH - + 1 0 @@ -7364,11 +7331,11 @@ - + 5 - wxEXPAND|wxALL + wxALL|wxEXPAND 0 - + wxID_ANY Copper Zones @@ -7376,14 +7343,14 @@ wxVERTICAL none - + 5 wxEXPAND - 1 - + 0 + 3 wxBOTH - + 1 0 @@ -7477,7 +7444,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP + wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxEXPAND 0 1 @@ -8249,16 +8216,6 @@ - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - @@ -8266,16 +8223,16 @@ 5 - wxALL + wxEXPAND|wxTOP|wxBOTTOM 1 - bSizer13x + bSizerDisplayPad wxVERTICAL none 5 - wxRIGHT|wxTOP + wxRIGHT|wxTOP|wxEXPAND 1 1 @@ -8442,7 +8399,7 @@ 5 - wxALL|wxEXPAND + wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT 0 0 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index 501a1db753..13782e4627 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -93,7 +93,6 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_staticText23; wxChoice* m_trapDeltaDirChoice; wxStaticText* m_staticText521; - wxBoxSizer* m_DrillShapeBoxSizer; wxStaticText* m_staticTitleModuleRot; wxStaticText* m_staticModuleRotValue; wxStaticText* m_staticTitleModuleSide; @@ -163,7 +162,7 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER ); + DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 745,725 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER ); ~DIALOG_PAD_PROPERTIES_BASE(); }; diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp index ca98f5acfe..03eadd2a36 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -16,20 +16,21 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbLibsChoiceSizer; - sbLibsChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint library files") ), wxHORIZONTAL ); + wxBoxSizer* bLibsChoiceSizer; + bLibsChoiceSizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bLibsButtonsSizer; - bLibsButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); + m_staticTextLibs = new wxStaticText( this, wxID_ANY, _("Footprint library files"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextLibs->Wrap( -1 ); + bLibsChoiceSizer->Add( m_staticTextLibs, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - sbLibsChoiceSizer->Add( bLibsButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); + wxBoxSizer* bLibsChoiceListSizer; + bLibsChoiceListSizer = new wxBoxSizer( wxHORIZONTAL ); m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); m_ListLibr->SetToolTip( _("List of active library files.\nOnly library files in this list are loaded by Pcbnew.\nThe order of this list is important:\nPcbnew searchs for a given footprint using this list order priority.") ); m_ListLibr->SetMinSize( wxSize( 400,90 ) ); - sbLibsChoiceSizer->Add( m_ListLibr, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bLibsChoiceListSizer->Add( m_ListLibr, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -56,37 +57,51 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, bRightSizer->Add( m_buttonDown, 0, wxALL, 5 ); - sbLibsChoiceSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bLibsChoiceListSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - bMainSizer->Add( sbLibsChoiceSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bLibsChoiceSizer->Add( bLibsChoiceListSizer, 1, wxEXPAND, 5 ); - wxStaticBoxSizer* sbModulesDocSizer; - sbModulesDocSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint documentation file") ), wxHORIZONTAL ); + + bMainSizer->Add( bLibsChoiceSizer, 1, wxEXPAND, 5 ); + + wxBoxSizer* bModulesDocSizer; + bModulesDocSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticTextModulesDoc = new wxStaticText( this, wxID_ANY, _("Footprint documentation file"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextModulesDoc->Wrap( -1 ); + bModulesDocSizer->Add( m_staticTextModulesDoc, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizerDoc; + bSizerDoc = new wxBoxSizer( wxHORIZONTAL ); m_TextHelpModulesFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - sbModulesDocSizer->Add( m_TextHelpModulesFileName, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + m_TextHelpModulesFileName->SetMaxLength( 0 ); + bSizerDoc->Add( m_TextHelpModulesFileName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_buttonModDoc = new wxButton( this, wxID_BROWSE_MOD_DOC, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); - sbModulesDocSizer->Add( m_buttonModDoc, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); + bSizerDoc->Add( m_buttonModDoc, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); - bMainSizer->Add( sbModulesDocSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bModulesDocSizer->Add( bSizerDoc, 1, wxEXPAND, 5 ); - wxStaticBoxSizer* sbSizer4; - sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User defined search paths") ), wxHORIZONTAL ); - sbSizer4->SetMinSize( wxSize( 400,70 ) ); - wxBoxSizer* bUserListSizer; - bUserListSizer = new wxBoxSizer( wxVERTICAL ); + bMainSizer->Add( bModulesDocSizer, 0, wxEXPAND, 5 ); + + wxBoxSizer* bSizerPaths; + bSizerPaths = new wxBoxSizer( wxVERTICAL ); + + m_staticTextPaths = new wxStaticText( this, wxID_ANY, _("User defined search paths"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPaths->Wrap( -1 ); + bSizerPaths->Add( m_staticTextPaths, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizerPathsChoice; + bSizerPathsChoice = new wxBoxSizer( wxHORIZONTAL ); m_listUserPaths = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_listUserPaths->SetToolTip( _("Additional paths used in this project. The priority is higher than default KiCad paths.") ); - bUserListSizer->Add( m_listUserPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - sbSizer4->Add( bUserListSizer, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerPathsChoice->Add( m_listUserPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bUserPathsButtonsSizer; bUserPathsButtonsSizer = new wxBoxSizer( wxVERTICAL ); @@ -101,28 +116,29 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, bUserPathsButtonsSizer->Add( m_buttonRemovePath, 0, wxALL|wxBOTTOM, 5 ); - sbSizer4->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + bSizerPathsChoice->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bMainSizer->Add( sbSizer4, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxStaticBoxSizer* sbLibPathSizer; - sbLibPathSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current search path list") ), wxVERTICAL ); - - wxBoxSizer* bUserLibPathSizer; - bUserLibPathSizer = new wxBoxSizer( wxHORIZONTAL ); + bSizerPaths->Add( bSizerPathsChoice, 0, wxEXPAND, 5 ); - sbLibPathSizer->Add( bUserLibPathSizer, 1, wxEXPAND, 5 ); + bMainSizer->Add( bSizerPaths, 0, wxEXPAND, 5 ); + + wxBoxSizer* bLibPathSizer; + bLibPathSizer = new wxBoxSizer( wxVERTICAL ); + + m_staticTextPathList = new wxStaticText( this, wxID_ANY, _("Current search path list"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPathList->Wrap( -1 ); + bLibPathSizer->Add( m_staticTextPathList, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_DefaultLibraryPathslistBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); m_DefaultLibraryPathslistBox->SetToolTip( _("System and user paths used to search and load library files and component doc files.\nSorted by decreasing priority order.") ); m_DefaultLibraryPathslistBox->SetMinSize( wxSize( -1,70 ) ); - sbLibPathSizer->Add( m_DefaultLibraryPathslistBox, 0, wxALL|wxEXPAND, 5 ); + bLibPathSizer->Add( m_DefaultLibraryPathslistBox, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bMainSizer->Add( sbLibPathSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( bLibPathSizer, 0, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -139,7 +155,6 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, this->SetSizer( bMainSizer ); this->Layout(); - bMainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp index 8afce21b01..0c059fd230 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp @@ -42,7 +42,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP - -1,-1 + 530,540 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h @@ -93,32 +93,662 @@ none 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND 1 - - wxID_ANY - Footprint library files + - sbLibsChoiceSizer - wxHORIZONTAL + bLibsChoiceSizer + wxVERTICAL none - 5 - wxALIGN_CENTER_HORIZONTAL + wxTOP|wxRIGHT|wxLEFT 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Footprint library files + + 0 + + + 0 + + 1 + m_staticTextLibs + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 - bLibsButtonsSizer + bLibsChoiceListSizer wxHORIZONTAL none + + 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 + 400,90 + 1 + m_ListLibr + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE + + 0 + List of active library files. Only library files in this list are loaded by Pcbnew. The order of this list is important: Pcbnew searchs for a given footprint using this list order priority. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_ADD_LIB + Add + + 0 + + + 0 + + 1 + m_buttonAddLib + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Add a new library after the selected library, and load it + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddOrInsertLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Insert + + 0 + + + 0 + + 1 + m_buttonIns + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Add a new library before the selected library, and load it + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddOrInsertLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_REMOVE_LIB + Remove + + 0 + + + 0 + + 1 + m_buttonRemoveLib + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Unload the selected library + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Up + + 0 + + + 0 + + 1 + m_buttonUp + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnButtonUpClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Down + + 0 + + + 0 + + 1 + m_buttonDown + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnButtonDownClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bModulesDocSizer + wxVERTICAL + none 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - + wxTOP|wxRIGHT|wxLEFT + 0 + 1 1 1 @@ -132,7 +762,6 @@ 1 0 - 1 1 @@ -147,14 +776,15 @@ 0 0 wxID_ANY + Footprint documentation file 0 0 - 400,90 + 1 - m_ListLibr + m_staticTextModulesDoc 1 @@ -164,17 +794,14 @@ Resizable 1 - wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE + 0 - List of active library files. Only library files in this list are loaded by Pcbnew. The order of this list is important: Pcbnew searchs for a given footprint using this list order priority. - - wxFILTER_NONE - wxDefaultValidator - + + -1 @@ -185,8 +812,6 @@ - - @@ -204,18 +829,18 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 + wxEXPAND + 1 - bRightSizer - wxVERTICAL + bSizerDoc + wxHORIZONTAL none 5 - wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT - 0 - + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + 1 + 1 1 1 @@ -232,95 +857,6 @@ 1 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_ADD_LIB - Add - - 0 - - - 0 - - 1 - m_buttonAddLib - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Add a new library after the selected library, and load it - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddOrInsertLibClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 0 Dock 0 @@ -332,15 +868,15 @@ 0 0 wxID_ANY - Insert 0 + 0 0 1 - m_buttonIns + m_TextHelpModulesFileName 1 @@ -353,15 +889,15 @@ 0 - Add a new library before the selected library, and load it + wxFILTER_NONE wxDefaultValidator + - OnAddOrInsertLibClick @@ -384,12 +920,16 @@ + + + + - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + 10 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -419,8 +959,8 @@ 0 0 - ID_REMOVE_LIB - Remove + wxID_BROWSE_MOD_DOC + Browse 0 @@ -428,95 +968,7 @@ 0 1 - m_buttonRemoveLib - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Unload the selected library - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveLibClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Up - - 0 - - - 0 - - 1 - m_buttonUp + m_buttonModDoc 1 @@ -537,95 +989,7 @@ - OnButtonUpClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Down - - 0 - - - 0 - - 1 - m_buttonDown - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnButtonDownClick + OnBrowseModDocFile @@ -657,21 +1021,18 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND 0 - - wxID_ANY - Footprint documentation file + - sbModulesDocSizer - wxHORIZONTAL + bSizerPaths + wxVERTICAL none - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 1 - + wxTOP|wxRIGHT|wxLEFT + 0 + 1 1 1 @@ -699,15 +1060,15 @@ 0 0 wxID_ANY + User defined search paths 0 - 0 0 1 - m_TextHelpModulesFileName + m_staticTextPaths 1 @@ -721,106 +1082,10 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_BROWSE_MOD_DOC - Browse - - 0 - - - 0 - - 1 - m_buttonModDoc - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnBrowseModDocFile + -1 @@ -846,28 +1111,14 @@ - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - wxID_ANY - User defined search paths - 400,70 - sbSizer4 - wxHORIZONTAL - none - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 + wxEXPAND + 0 - bUserListSizer - wxVERTICAL + bSizerPathsChoice + wxHORIZONTAL none 5 @@ -957,279 +1208,279 @@ - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - - bUserPathsButtonsSizer - wxVERTICAL - none 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_LIB_PATH_SEL - Add - - 0 - - - 0 + - 1 - m_buttonAddPath - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddOrInsertPath - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_INSERT_PATH - Insert - - 0 - - - 0 - - 1 - m_buttonInsPath - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddOrInsertPath - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_REMOVE_PATH - Remove - - 0 - - - 0 - - 1 - m_buttonRemovePath - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveUserPath - - - - - - - - - - - - - - - - - - - - - - - + bUserPathsButtonsSizer + wxVERTICAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_LIB_PATH_SEL + Add + + 0 + + + 0 + + 1 + m_buttonAddPath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddOrInsertPath + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_INSERT_PATH + Insert + + 0 + + + 0 + + 1 + m_buttonInsPath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddOrInsertPath + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_REMOVE_PATH + Remove + + 0 + + + 0 + + 1 + m_buttonRemovePath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveUserPath + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1238,30 +1489,99 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND 0 - - wxID_ANY - Current search path list + - sbLibPathSizer + bLibPathSizer wxVERTICAL none - 5 - wxEXPAND - 1 - + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Current search path list + + 0 + + + 0 - bUserLibPathSizer - wxHORIZONTAL - none + 1 + m_staticTextPathList + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h index 9a52a9bffa..913f452512 100644 --- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h +++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,16 +11,18 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" -#include -#include #include -#include +#include +#include #include #include #include +#include #include -#include +#include #include #include #include @@ -45,18 +47,22 @@ class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public DIALOG_SHIM wxID_REMOVE_PATH }; + wxStaticText* m_staticTextLibs; wxListBox* m_ListLibr; wxButton* m_buttonAddLib; wxButton* m_buttonIns; wxButton* m_buttonRemoveLib; wxButton* m_buttonUp; wxButton* m_buttonDown; + wxStaticText* m_staticTextModulesDoc; wxTextCtrl* m_TextHelpModulesFileName; wxButton* m_buttonModDoc; + wxStaticText* m_staticTextPaths; wxListBox* m_listUserPaths; wxButton* m_buttonAddPath; wxButton* m_buttonInsPath; wxButton* m_buttonRemovePath; + wxStaticText* m_staticTextPathList; wxListBox* m_DefaultLibraryPathslistBox; wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer1; @@ -78,7 +84,7 @@ class DIALOG_PCBNEW_CONFIG_LIBS_FBP : public DIALOG_SHIM public: - DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 530,540 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_PCBNEW_CONFIG_LIBS_FBP(); }; diff --git a/template/kicad.pro b/template/kicad.pro index a186ec4ffb..6f3b21352f 100644 --- a/template/kicad.pro +++ b/template/kicad.pro @@ -1,4 +1,4 @@ -update=21/03/2013 14:06:30 +update=30/03/2013 13:45:59 version=1 last_client=pcbnew [general] @@ -53,20 +53,21 @@ LibName30=valves version=1 LastNetListRead= UseCmpFile=1 -PadDrill=0.6 -PadSizeH=1 -PadSizeV=1 -PcbTextSizeV=1 -PcbTextSizeH=1 -PcbTextThickness=0.3 -ModuleTextSizeV=1 -ModuleTextSizeH=1 -ModuleTextSizeThickness=0.15 -SolderMaskClearance=0 -SolderMaskMinWidth=0 -DrawSegmentWidth=0.2 -BoardOutlineThickness=0.15 -ModuleOutlineThickness=0.15 +PadDrill=0.600000000000 +PadDrillOvalY=0.600000000000 +PadSizeH=1.500000000000 +PadSizeV=1.500000000000 +PcbTextSizeV=1.500000000000 +PcbTextSizeH=1.500000000000 +PcbTextThickness=0.300000000000 +ModuleTextSizeV=1.000000000000 +ModuleTextSizeH=1.000000000000 +ModuleTextSizeThickness=0.150000000000 +SolderMaskClearance=0.000000000000 +SolderMaskMinWidth=0.000000000000 +DrawSegmentWidth=0.200000000000 +BoardOutlineThickness=0.100000000000 +ModuleOutlineThickness=0.150000000000 [pcbnew/libraries] LibDir= LibName1=sockets