enhancements in dialogs (edit component in libedit and zones properties)

eeschema/CMakeLists.txt

@@ -44,7 +44,8 @@ set(EESCHEMA_SRCS
     dialog_build_BOM_base.cpp
 #   dialog_cmp_graphic_properties.cpp
     dialog_create_component.cpp
-#   dialog_edit_component_in_lib.cpp
+    dialog_edit_component_in_lib.cpp
+    dialog_edit_component_in_lib_base.cpp
     dialog_edit_component_in_schematic_fbp.cpp
     dialog_edit_component_in_schematic.cpp
     dialog_edit_label.cpp

eeschema/dialog_edit_component_in_lib.h

 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog_edit_component_in_lib.h
-// Purpose:
 // Author:      jean-pierre Charras
-// Modified by:
-// Created:     02/03/2006 08:51:09
-// RCS-ID:
-// Copyright:   License GNU
-// Licence:
+// Licence:     GPL
 /////////////////////////////////////////////////////////////////////////////
 
-// Generated by DialogBlocks (unregistered), 02/03/2006 08:51:09
 
 #ifndef _DIALOG_EDIT_COMPONENT_IN_LIB_H_
 #define _DIALOG_EDIT_COMPONENT_IN_LIB_H_
 
-/*!
- * Includes
- */
+#include "dialog_edit_component_in_lib_base.h"
 
-////@begin includes
-#include "wx/notebook.h"
-#include "wx/spinctrl.h"
-////@end includes
 
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-class wxNotebook;
-class wxSpinCtrl;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10000
-#define ID_LIBEDIT_NOTEBOOK 10001
-#define ID_PANEL_BASIC 10002
-#define ID_SPINCTRL1 10010
-#define ID_SPINCTRL 10009
-#define ID_CHECKBOX 10007
-#define ID_CHECKBOX1 10008
-#define ID_PANEL_DOC 10004
-#define ID_TEXTCTRL 10011
-#define ID_TEXTCTRL1 10012
-#define ID_TEXTCTRL2 10013
-#define ID_COPY_DOC_TO_ALIAS 10014
-#define ID_BROWSE_DOC_FILES 10005
-#define ID_PANEL_ALIAS 10003
-#define SYMBOL_WINEDA_PARTPROPERTIESFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_PARTPROPERTIESFRAME_TITLE _("Lib Component Properties")
-#define SYMBOL_WINEDA_PARTPROPERTIESFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_PARTPROPERTIESFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_PARTPROPERTIESFRAME_POSITION wxDefaultPosition
-////@end control identifiers
-#define ID_DELETE_ONE_FOOTPRINT_FILTER 10020
-#define ID_DELETE_ALL_FOOTPRINT_FILTER 10021
-#define ID_ADD_FOOTPRINT_FILTER 10022
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-/*!
- * WinEDA_PartPropertiesFrame class declaration
- */
-
-class WinEDA_PartPropertiesFrame: public wxDialog
+class DIALOG_EDIT_COMPONENT_IN_LIBRARY: public DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE
 {
-    DECLARE_DYNAMIC_CLASS( WinEDA_PartPropertiesFrame )
-    DECLARE_EVENT_TABLE()
+public:
+	WinEDA_LibeditFrame * m_Parent;
+	bool m_RecreateToolbar;
+	int m_AliasLocation;
 
 public:
     /// Constructors
-    WinEDA_PartPropertiesFrame( );
-    WinEDA_PartPropertiesFrame( WinEDA_LibeditFrame* parent, wxWindowID id = SYMBOL_WINEDA_PARTPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PARTPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PARTPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PARTPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_PARTPROPERTIESFRAME_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PARTPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PARTPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PARTPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PARTPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_PARTPROPERTIESFRAME_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin WinEDA_PartPropertiesFrame event handler declarations
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_COPY_DOC_TO_ALIAS
-    void OnCopyDocToAliasClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BROWSE_DOC_FILES
-    void OnBrowseDocFilesClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
-    void OnCancelClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
-    void OnOkClick( wxCommandEvent& event );
-
-////@end WinEDA_PartPropertiesFrame event handler declarations
-
-////@begin WinEDA_PartPropertiesFrame member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end WinEDA_PartPropertiesFrame member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-	void InitBuffers();
-	void BuildPanelBasic();
-	void BuildPanelDoc();
-	void BuildPanelAlias();
-	void PartPropertiesAccept(wxCommandEvent& event);
-	void OnQuit(wxCommandEvent& event);
+    DIALOG_EDIT_COMPONENT_IN_LIBRARY( WinEDA_LibeditFrame* parent);
+    ~DIALOG_EDIT_COMPONENT_IN_LIBRARY();
+
+private:
+    void Init();
+    void InitPanelDoc();
+    void InitBasicPanel();
+	void OnCancelClick( wxCommandEvent& event );
+	void OnOkClick(wxCommandEvent& event);
 	void DeleteAllAliasOfPart(wxCommandEvent& event);
 	void DeleteAliasOfPart(wxCommandEvent& event);
 	void AddAliasOfPart(wxCommandEvent& event);
@@ -132,50 +37,10 @@ public:
 	void CopyDocToAlias(wxCommandEvent& event);
 	void BrowseAndSelectDocFile(wxCommandEvent& event);
 
-	void BuildPanelFootprintFilter();
 	void DeleteAllFootprintFilter(wxCommandEvent& event);
 	void DeleteOneFootprintFilter(wxCommandEvent& event);
 	void AddFootprintFilter(wxCommandEvent& event);
 
-////@begin WinEDA_PartPropertiesFrame member variables
-    wxBoxSizer* m_GeneralBoxSizer;
-    wxNotebook* m_NoteBook;
-    wxPanel* m_PanelBasic;
-    wxBoxSizer* m_PanelBasicBoxSizer;
-    wxStaticBoxSizer* m_OptionsBoxSizer;
-    wxSpinCtrl* SelNumberOfUnits;
-    wxSpinCtrl* m_SetSkew;
-    wxCheckBox* m_OptionPower;
-    wxCheckBox* m_OptionPartsLocked;
-    wxPanel* m_PanelDoc;
-    wxBoxSizer* m_PanelDocBoxSizer;
-    wxTextCtrl* m_Doc;
-    wxTextCtrl* m_Keywords;
-    wxTextCtrl* m_Docfile;
-    wxButton* m_ButtonCopyDoc;
-    wxPanel* m_PanelAlias;
-    wxButton* m_btClose;
-////@end WinEDA_PartPropertiesFrame member variables
-
-	WinEDA_LibeditFrame * m_Parent;
-	wxString m_Title;
-
-	wxPanel * m_PanelFootprintFilter;
-	wxButton * m_ButtonDeleteOneAlias;
-	wxButton * m_ButtonDeleteAllAlias;
-	wxButton * m_ButtonDeleteAllFootprintFilter;
-	wxButton * m_ButtonDeleteOneFootprintFilter;
-
-	wxCheckBox * AsConvertButt;
-	wxCheckBox * ShowPinNumButt;
-	wxCheckBox * ShowPinNameButt;
-	wxCheckBox * m_PinsNameInsideButt;
-
-	wxListBox * m_PartAliasList;
-	wxListBox * m_FootprintFilterListBox;
-	bool m_RecreateToolbar;
-	int m_AliasLocation;
-
 };
 
 #endif

eeschema/dialog_edit_component_in_lib_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_edit_component_in_lib_base__
+#define __dialog_edit_component_in_lib_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/checkbox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/statline.h>
+#include <wx/stattext.h>
+#include <wx/spinctrl.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/notebook.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+#define ID_LIBEDIT_NOTEBOOK 1000
+#define ID_COPY_DOC_TO_ALIAS 1001
+#define ID_BROWSE_DOC_FILES 1002
+#define ID_ADD_ALIAS 1003
+#define ID_DELETE_ONE_ALIAS 1004
+#define ID_DELETE_ALL_ALIAS 1005
+#define ID_ADD_FOOTPRINT_FILTER 1006
+#define ID_DELETE_ONE_FOOTPRINT_FILTER 1007
+#define ID_DELETE_ALL_FOOTPRINT_FILTER 1008
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxNotebook* m_NoteBook;
+		wxPanel* m_PanelBasic;
+		wxCheckBox* m_AsConvertButt;
+		wxCheckBox* m_ShowPinNumButt;
+		wxCheckBox* m_ShowPinNameButt;
+		wxCheckBox* m_PinsNameInsideButt;
+		wxStaticLine* m_staticline3;
+		wxStaticText* m_staticTextNbUnits;
+		wxSpinCtrl* m_SelNumberOfUnits;
+		wxStaticText* m_staticTextskew;
+		wxSpinCtrl* m_SetSkew;
+		wxStaticLine* m_staticline1;
+		wxCheckBox* m_OptionPower;
+		wxCheckBox* m_OptionPartsLocked;
+		wxPanel* m_PanelDoc;
+		wxStaticText* m_staticTextDescription;
+		wxTextCtrl* m_Doc;
+		wxStaticText* m_staticTextKeywords;
+		wxTextCtrl* m_Keywords;
+		wxStaticText* m_staticTextDocFileName;
+		wxTextCtrl* m_Docfile;
+		wxButton* m_ButtonCopyDoc;
+		wxButton* m_buttonBrowseDocFiles;
+		wxPanel* m_PanelAlias;
+		wxStaticText* m_staticTextAlias;
+		wxListBox* m_PartAliasList;
+		wxButton* m_ButtonAddeAlias;
+		wxButton* m_ButtonDeleteOneAlias;
+		wxButton* m_ButtonDeleteAllAlias;
+		wxPanel* m_PanelFootprintFilter;
+		wxStaticText* m_staticTextFootprints;
+		wxListBox* m_FootprintFilterListBox;
+		wxButton* m_buttonAddFpF;
+		wxButton* m_ButtonDeleteOneFootprintFilter;
+		wxButton* m_ButtonDeleteAllFootprintFilter;
+		wxStdDialogButtonSizer* m_sdbSizer2;
+		wxButton* m_sdbSizer2OK;
+		wxButton* m_sdbSizer2Cancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void CopyDocToAlias( wxCommandEvent& event ){ event.Skip(); }
+		virtual void BrowseAndSelectDocFile( wxCommandEvent& event ){ event.Skip(); }
+		virtual void AddAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
+		virtual void DeleteAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
+		virtual void DeleteAllAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
+		virtual void AddFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
+		virtual void DeleteOneFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
+		virtual void DeleteAllFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
+		DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 546,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE();
+	
+};
+
+#endif //__dialog_edit_component_in_lib_base__

pcbnew/class_board.cpp

@@ -893,7 +893,7 @@ MODULE* BOARD::FindModuleByReference( const wxString& aReference ) const
 // Sort nets by decreasing pad count
 static bool s_SortByNodes( const NETINFO_ITEM* a, const NETINFO_ITEM* b )
 {
-    return a->GetNodesCount() < b->GetNodesCount();
+    return b->GetNodesCount() < a->GetNodesCount();
 }
 
 

pcbnew/dialog_copper_zones_base.cpp

@@ -40,7 +40,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	wxString m_FillModeCtrlChoices[] = { _("Use polygons"), _("Use segments") };
 	int m_FillModeCtrlNChoices = sizeof( m_FillModeCtrlChoices ) / sizeof( wxString );
 	m_FillModeCtrl = new wxRadioBox( this,  ID_RADIOBOX_FILL_MODE_SELECTION, _("Filling Mode:"), wxDefaultPosition, wxDefaultSize, m_FillModeCtrlNChoices, m_FillModeCtrlChoices, 1, wxRA_SPECIFY_COLS );
-	m_FillModeCtrl->SetSelection( 1 );
+	m_FillModeCtrl->SetSelection( 0 );
 	m_FillModeCtrl->SetToolTip( _("Filled areas can use solid polygons or segments.\nDepending on the complexity and the size of the zone,\nsometimes polygons are better and sometimes segments are better.") );
 	
 	m_FillOptionsBox->Add( m_FillModeCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -48,7 +48,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	wxString m_ArcApproximationOptChoices[] = { _("16 segments / 360 deg"), _("32 segments / 360 deg") };
 	int m_ArcApproximationOptNChoices = sizeof( m_ArcApproximationOptChoices ) / sizeof( wxString );
 	m_ArcApproximationOpt = new wxRadioBox( this, wxID_ARC_APPROX, _("Arcs Approximation:"), wxDefaultPosition, wxDefaultSize, m_ArcApproximationOptNChoices, m_ArcApproximationOptChoices, 1, wxRA_SPECIFY_COLS );
-	m_ArcApproximationOpt->SetSelection( 1 );
+	m_ArcApproximationOpt->SetSelection( 0 );
 	m_ArcApproximationOpt->SetToolTip( _("Number of segments to approximate a circle in filling calculations.\n16 segment is faster to calculate and when redraw screen.\n32 segment give a better quality") );
 	
 	m_FillOptionsBox->Add( m_ArcApproximationOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -56,7 +56,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	wxString m_PadInZoneOptChoices[] = { _("Include pads"), _("Thermal relief"), _("Exclude pads") };
 	int m_PadInZoneOptNChoices = sizeof( m_PadInZoneOptChoices ) / sizeof( wxString );
 	m_PadInZoneOpt = new wxRadioBox( this, wxID_PADS_IN_ZONE_OPTIONS, _("Pad in Zone:"), wxDefaultPosition, wxDefaultSize, m_PadInZoneOptNChoices, m_PadInZoneOptChoices, 1, wxRA_SPECIFY_COLS );
-	m_PadInZoneOpt->SetSelection( 0 );
+	m_PadInZoneOpt->SetSelection( 1 );
 	m_FillOptionsBox->Add( m_PadInZoneOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	wxStaticBoxSizer* m_ThermalShapesParamsSizer;
@@ -69,25 +69,25 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	m_AntipadSizeValue = new wxTextCtrl( this, wxID_ANTIPAD_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	m_AntipadSizeValue->SetToolTip( _("Define the gap around the pad") );
 	
-	m_ThermalShapesParamsSizer->Add( m_AntipadSizeValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_ThermalShapesParamsSizer->Add( m_AntipadSizeValue, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 	
 	m_CopperBridgeWidthText = new wxStaticText( this, wxID_ANY, _("Copper Width"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_CopperBridgeWidthText->Wrap( -1 );
-	m_ThermalShapesParamsSizer->Add( m_CopperBridgeWidthText, 0, wxRIGHT|wxLEFT, 5 );
+	m_ThermalShapesParamsSizer->Add( m_CopperBridgeWidthText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_CopperWidthValue = new wxTextCtrl( this, wxID_COPPER_BRIDGE_VALUE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	m_CopperWidthValue->SetToolTip( _("Define the tickness of copper in thermal reliefs") );
 	
-	m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 	
 	m_FillOptionsBox->Add( m_ThermalShapesParamsSizer, 0, wxEXPAND, 5 );
 	
 	m_LeftBoxSizer->Add( m_FillOptionsBox, 1, wxEXPAND, 5 );
 	
-	m_ExportableSetupSizer->Add( m_LeftBoxSizer, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	m_ExportableSetupSizer->Add( m_LeftBoxSizer, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	
-	m_ExportableSetupSizer->Add( 5, 5, 0, wxEXPAND, 5 );
+	m_ExportableSetupSizer->Add( 20, 20, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* m_MiddleBox;
 	m_MiddleBox = new wxBoxSizer( wxVERTICAL );
@@ -135,14 +135,14 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	
 	m_MiddleBoxSizer->Add( m_OutilinesBoxOpt, 1, wxEXPAND, 5 );
 	
-	m_MiddleBox->Add( m_MiddleBoxSizer, 0, 0, 5 );
+	m_MiddleBox->Add( m_MiddleBoxSizer, 0, wxEXPAND, 5 );
 	
 	m_ExportableSetupSizer->Add( m_MiddleBox, 1, wxEXPAND, 5 );
 	
 	m_OptionsBoxSizer->Add( m_ExportableSetupSizer, 1, wxEXPAND, 5 );
 	
 	
-	m_OptionsBoxSizer->Add( 0, 0, 0, wxEXPAND, 5 );
+	m_OptionsBoxSizer->Add( 20, 20, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* m_RightBoxSizer;
 	m_RightBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -160,7 +160,7 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	m_RightBoxSizer->Add( m_ButtonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
 	
-	m_RightBoxSizer->Add( 5, 20, 0, wxEXPAND, 5 );
+	m_RightBoxSizer->Add( 20, 20, 0, wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* m_NetSortOptSizer;
 	m_NetSortOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Nets Display Options:") ), wxVERTICAL );
@@ -184,28 +184,40 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
 	
 	m_RightBoxSizer->Add( m_NetSortOptSizer, 1, wxEXPAND, 5 );
 	
-	m_OptionsBoxSizer->Add( m_RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_OptionsBoxSizer->Add( m_RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 	
-	m_MainBoxSize->Add( m_OptionsBoxSizer, 0, 0, 5 );
+	m_MainBoxSize->Add( m_OptionsBoxSizer, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* m_NetAndLayersLiastBoxSizer;
-	m_NetAndLayersLiastBoxSizer = new wxBoxSizer( wxVERTICAL );
+	m_NetAndLayersLiastBoxSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizerNets;
+	bSizerNets = new wxBoxSizer( wxVERTICAL );
 	
 	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Net:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText2->Wrap( -1 );
-	m_NetAndLayersLiastBoxSizer->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizerNets->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_ListNetNameSelection = new wxListBox( this, ID_NETNAME_SELECTION, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	m_NetAndLayersLiastBoxSizer->Add( m_ListNetNameSelection, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_ListNetNameSelection->SetMinSize( wxSize( -1,150 ) );
+	
+	bSizerNets->Add( m_ListNetNameSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_NetAndLayersLiastBoxSizer->Add( bSizerNets, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerLayers;
+	bSizerLayers = new wxBoxSizer( wxVERTICAL );
 	
 	m_staticText3 = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3->Wrap( -1 );
-	m_NetAndLayersLiastBoxSizer->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizerLayers->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_LayerSelectionCtrl = new wxListBox( this, ID_LAYER_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	m_NetAndLayersLiastBoxSizer->Add( m_LayerSelectionCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizerLayers->Add( m_LayerSelectionCtrl, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_NetAndLayersLiastBoxSizer->Add( bSizerLayers, 1, wxEXPAND, 5 );
 	
-	m_MainBoxSize->Add( m_NetAndLayersLiastBoxSizer, 0, wxEXPAND, 5 );
+	m_MainBoxSize->Add( m_NetAndLayersLiastBoxSizer, 1, wxEXPAND, 5 );
 	
 	this->SetSizer( m_MainBoxSize );
 	this->Layout();