Some cleanup and libraries update

change_log.txt

@@ -5,6 +5,11 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2008-Nov-22 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
+++pcbnew
+    Some cleanup in dialog pad edition.
+
 
 2008-Nov-19 UPDATE Jerry Jacobs <jerkejacobs@gmail.com>
 ================================================================================

eeschema/classes_body_items.cpp

@@ -195,11 +195,11 @@ void LibDrawSquare::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, const wxPoint& aO
 
     if( fill == FILLED_WITH_BG_BODYCOLOR && !aData )
         GRFilledRect( &aPanel->m_ClipBox, aDC, pos1.x, pos1.y, pos2.x, pos2.y,
-            color, linewidth,
+            linewidth, color,
             ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) );
     else if( m_Fill == FILLED_SHAPE  && !aData )
         GRFilledRect( &aPanel->m_ClipBox, aDC, pos1.x, pos1.y, pos2.x, pos2.y,
-            color, color );
+            linewidth, color, color );
     else
         GRRect( &aPanel->m_ClipBox, aDC, pos1.x, pos1.y, pos2.x, pos2.y,
             linewidth, color );

eeschema/menubar.cpp

@@ -39,20 +39,20 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
         // Menu File:
         wxMenuItem* item = new wxMenuItem( m_FilesMenu, ID_NEW_PROJECT,
                                           _( "&New" ),
-                                          _( "New schematic sheet" ) );
+                                          _( "New schematic project" ) );
         item->SetBitmap( new_xpm );
         m_FilesMenu->Append( item );
 
         item = new wxMenuItem( m_FilesMenu, ID_LOAD_PROJECT,
                               _( "&Open" ),
-                              _( "Open a schematic sheet" ) );
+                              _( "Open an existing schematic project" ) );
         item->SetBitmap( open_xpm );
         m_FilesMenu->Append( item );
 
         m_FilesMenu->AppendSeparator();
         item = new wxMenuItem( m_FilesMenu, ID_SAVE_PROJECT,
                               _( "&Save Project" ),
-                              _( "Save project" ) );
+                              _( "Save all sheets in the schematic project" ) );
         item->SetBitmap( save_project_xpm );
         m_FilesMenu->Append( item );
 

eeschema/tool_sch.cpp

@@ -153,28 +153,28 @@ void WinEDA_SchematicFrame::ReCreateVToolbar()
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_COMPONENT_BUTT, wxEmptyString,
                          BITMAP( add_component_xpm ),
-                         _( "Place the component" ), wxITEM_CHECK );
+                         _( "Place a component" ), wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_PLACE_POWER_BUTT, wxEmptyString,
                          BITMAP( add_power_xpm ),
-                         _( "Place the power port" ), wxITEM_CHECK );
+                         _( "Place a power port" ), wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_WIRE_BUTT, wxEmptyString,
                          BITMAP( add_line_xpm ),
-                         _( "Place the wire" ), wxITEM_CHECK );
+                         _( "Place a wire" ), wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_BUS_BUTT, wxEmptyString,
                          BITMAP( add_bus_xpm ),
-                         _( "Place bus" ), wxITEM_CHECK );
+                         _( "Place a bus" ), wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_WIRETOBUS_ENTRY_BUTT, wxEmptyString,
                          BITMAP( add_line2bus_xpm ),
-                         _( "Place the wire to bus entry" ), wxITEM_CHECK );
+                         _( "Place a wire to bus entry" ), wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString,
                          BITMAP( add_bus2bus_xpm ),
-                         _( "Place bus to bus entry" ), wxITEM_CHECK );
+                         _( "Place a bus to bus entry" ), wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString,
@@ -187,17 +187,17 @@ void WinEDA_SchematicFrame::ReCreateVToolbar()
 
     m_VToolBar->AddTool( ID_GLABEL_BUTT, wxEmptyString,
                          BITMAP( add_glabel_xpm ),
-                         _( "Place the global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ),
+                         _( "Place a global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ),
 						 wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_JUNCTION_BUTT, wxEmptyString,
                          BITMAP( add_junction_xpm ),
-                         _( "Place junction" ), wxITEM_CHECK );
+                         _( "Place a junction" ), wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
 	m_VToolBar->AddTool( ID_HIERLABEL_BUTT, wxEmptyString,
 						 BITMAP( add_hierarchical_label_xpm ),
-								 _( "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
+								 _( "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ),
 								 wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_SHEET_SYMBOL_BUTT, wxEmptyString,

pcbnew/CMakeLists.txt

@@ -57,7 +57,8 @@ set(PCBNEW_SRCS
 #   dialog_netlist.cpp
     zones_non_copper_type_functions.cpp
     dialog_non_copper_zones_properties_base.cpp
-#   dialog_pad_edit.cpp
+    dialog_pad_properties.cpp
+    dialog_pad_properties_base.cpp
     dialog_setup_libs.cpp
     dialog_orient_footprints.cpp
 #   dialog_track_options.cpp
@@ -70,7 +71,6 @@ set(PCBNEW_SRCS
     edit.cpp
     editedge.cpp
     editmod.cpp
-    editpads.cpp
     editrack.cpp
     editrack-part2.cpp
     edit_track_width.cpp

pcbnew/dialog_copper_zones.cpp

@@ -40,11 +40,12 @@ dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* z
 /************************************************************************************************/
 {
     m_Parent = parent;
+    m_Config = m_Parent->m_Parent->m_EDA_Config;
     m_Zone_Setting = zone_setting;
     m_NetSorting   = 1;     // 0 = alphabetic sort, 1 = pad count sort
-    if( m_Parent->m_Parent->m_EDA_Config )
+    if( m_Config )
     {
-        m_NetSorting = m_Parent->m_Parent->m_EDA_Config->Read( ZONE_NET_SORT_OPTION_KEY, 1l );
+        m_NetSorting = m_Config->Read( ZONE_NET_SORT_OPTION_KEY, 1l );
     }
 
     SetReturnCode( ZONE_ABORT ); // Will be changed on buttons click
@@ -70,8 +71,8 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
     m_GridCtrl->SetLabel( msg );
 
     msg = ReturnStringFromValue( g_UnitMetric,
-                                 m_Zone_Setting->m_ZoneClearance,
-                                 m_Parent->m_InternalUnits );
+        m_Zone_Setting->m_ZoneClearance,
+        m_Parent->m_InternalUnits );
     m_ZoneClearanceCtrl->SetValue( msg );
 
     if( g_Zone_45_Only )
@@ -85,8 +86,8 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
     for( unsigned ii = 0; ii < 4; ii++ )
     {
         msg = ReturnStringFromValue( g_UnitMetric,
-                                     GridList[ii],
-                                     m_Parent->m_InternalUnits );
+            GridList[ii],
+            m_Parent->m_InternalUnits );
         m_GridCtrl->SetString( ii, msg );
         if( grid_routing == GridList[ii] )
             selection = ii;
@@ -98,8 +99,8 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
     m_GridCtrl->SetSelection( selection );
 
     msg = ReturnStringFromValue( g_UnitMetric,
-                                 m_Zone_Setting->m_ZoneClearance,
-                                 m_Parent->m_InternalUnits );
+        m_Zone_Setting->m_ZoneClearance,
+        m_Parent->m_InternalUnits );
     m_ZoneClearanceCtrl->SetValue( msg );
 
     switch( m_Zone_Setting->m_Zone_Pad_Options )
@@ -135,11 +136,11 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
     AddUnitSymbol( *m_AntipadSizeText, g_UnitMetric );
     AddUnitSymbol( *m_CopperBridgeWidthText, g_UnitMetric );
     PutValueInLocalUnits( *m_AntipadSizeValue,
-                          m_Zone_Setting->m_ThermalReliefGapValue,
-                          PCB_INTERNAL_UNIT );
+        m_Zone_Setting->m_ThermalReliefGapValue,
+        PCB_INTERNAL_UNIT );
     PutValueInLocalUnits( *m_CopperWidthValue,
-                          m_Zone_Setting->m_ThermalReliefCopperBridgeValue,
-                          PCB_INTERNAL_UNIT );
+        m_Zone_Setting->m_ThermalReliefCopperBridgeValue,
+        PCB_INTERNAL_UNIT );
 
     switch( m_Zone_Setting->m_Zone_HatchingStyle )
     {
@@ -180,19 +181,17 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event )
 
     m_NetSortingOption->SetSelection( m_NetSorting );
 
-    wxString      NetNameFilter;
-    if( m_Parent->m_Parent->m_EDA_Config )
+    wxString      NetNameFilter = wxT( "N_0*" );
+    if( m_Config )
     {
         NetNameFilter =
-            m_Parent->m_Parent->m_EDA_Config->Read( ZONE_NET_FILTER_STRING_KEY, wxT( "N_0*" ) );
+            m_Config->Read( ZONE_NET_FILTER_STRING_KEY );
     }
 
     m_NetNameFilter->SetValue( NetNameFilter );
     wxArrayString ListNetName;
-    m_Parent->m_Pcb->ReturnSortedNetnamesList(
-        ListNetName,
-        m_NetSorting ==
-        0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );
+    m_Parent->m_Pcb->ReturnSortedNetnamesList( ListNetName,
+        m_NetSorting == 0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );
 
     if( m_NetSorting != 0 )
     {
@@ -286,10 +285,12 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab
 
     m_Zone_Setting->m_ArcToSegmentsCount = m_ArcApproximationOpt->GetSelection() == 1 ? 32 : 16;
 
-    if( m_Parent->m_Parent->m_EDA_Config )
+    if( m_Config )
     {
-        m_Parent->m_Parent->m_EDA_Config->Write( ZONE_NET_OUTLINES_HATCH_OPTION_KEY,
-                                                 (long) m_Zone_Setting->m_Zone_HatchingStyle );
+        m_Config->Write( ZONE_NET_OUTLINES_HATCH_OPTION_KEY,
+            (long) m_Zone_Setting->m_Zone_HatchingStyle );
+        wxString Filter = m_NetNameFilter->GetValue();
+        m_Config->Write( ZONE_NET_FILTER_STRING_KEY, Filter );
     }
 
     switch( m_GridCtrl->GetSelection() )
@@ -315,7 +316,7 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab
         m_Zone_Setting->m_GridFillValue = 0;
 #if 0   // I hope this feature works fine ( JP Charras)
         DisplayInfo( this, wxT(
-                        "You are using No grid for filling zones\nThis is currently in development and for tests only.\n Do not use for production" ) );
+                "You are using No grid for filling zones\nThis is currently in development and for tests only.\n Do not use for production" ) );
 #endif
         break;
     }
@@ -331,14 +332,14 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab
     m_Zone_Setting->m_FilledAreasShowMode = m_ShowFilledAreasInSketchOpt->IsChecked() ? 1 : 0;
 
     m_Zone_Setting->m_ThermalReliefGapValue = ReturnValueFromTextCtrl( *m_AntipadSizeValue,
-                                                                       PCB_INTERNAL_UNIT );
+        PCB_INTERNAL_UNIT );
     m_Zone_Setting->m_ThermalReliefCopperBridgeValue = ReturnValueFromTextCtrl(
         *m_CopperWidthValue,
         PCB_INTERNAL_UNIT );
 
-    m_Parent->m_Parent->m_EDA_Config->Write( ZONE_THERMAL_RELIEF_GAP_STRING_KEY,
-                                             (long) m_Zone_Setting->m_ThermalReliefGapValue );
-    m_Parent->m_Parent->m_EDA_Config->Write(
+    m_Config->Write( ZONE_THERMAL_RELIEF_GAP_STRING_KEY,
+        (long) m_Zone_Setting->m_ThermalReliefGapValue );
+    m_Config->Write(
         ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY,
         (long) m_Zone_Setting->
         m_ThermalReliefCopperBridgeValue );
@@ -410,11 +411,11 @@ void dialog_copper_zone::OnNetSortingOptionSelected( wxCommandEvent& event )
     }
     m_ListNetNameSelection->Clear();
     m_ListNetNameSelection->InsertItems( ListNetName, 0 );
-    if( m_Parent->m_Parent->m_EDA_Config )
+    if( m_Config )
     {
-        m_Parent->m_Parent->m_EDA_Config->Write( ZONE_NET_SORT_OPTION_KEY, (long) m_NetSorting );
-        m_Parent->m_Parent->m_EDA_Config->Write( ZONE_NET_FILTER_STRING_KEY,
-                                                m_NetNameFilter->GetValue() );
+        m_Config->Write( ZONE_NET_SORT_OPTION_KEY, (long) m_NetSorting );
+        wxString Filter = m_NetNameFilter->GetValue();
+        m_Config->Write( ZONE_NET_FILTER_STRING_KEY, Filter );
     }
 
     // Select and isplay current zone net name in listbox:

pcbnew/dialog_copper_zones.h

@@ -11,6 +11,7 @@ class dialog_copper_zone: public dialog_copper_zone_base
 {
 public:
     WinEDA_PcbFrame* m_Parent;
+    wxConfig*  m_Config;            // Current config
     ZONE_SETTING * m_Zone_Setting;
     long m_NetSorting;
 	int m_LayerId[LAYER_COUNT];		// Handle the real layer number from layer name position in m_LayerSelectionCtrl

pcbnew/dialog_module_edit.rc

-#include "wx/msw/wx.rc"

pcbnew/dialog_pad_edit.h

-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_pad_edit.h
-// Purpose:
-// Author:      jean-pierre Charras
-// Modified by:
-// Created:     28/02/2006 13:34:48
-// RCS-ID:
-// Copyright:   License GNU
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// Generated by DialogBlocks (unregistered), 28/02/2006 13:34:48
-
-#ifndef _DIALOG_PAD_EDIT_H_
-#define _DIALOG_PAD_EDIT_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dialog_pad_edit.h"
-#endif
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10000
-#define ID_TEXTCTRL_PADNUM 10001
-#define ID_TEXTCTRL_NETNAME 10002
-#define ID_RADIOBOX_DRILL_SHAPE 10019
-#define ID_LISTBOX_ORIENT_PAD 10003
-#define ID_LISTBOX_SHAPE_PAD 10004
-#define ID_LISTBOX_TYPE_PAD 10005
-#define ID_CHECKBOX 10006
-#define ID_CHECKBOX1 10007
-#define ID_CHECKBOX2 10008
-#define ID_CHECKBOX3 10009
-#define ID_CHECKBOX4 10010
-#define ID_CHECKBOX5 10011
-#define ID_CHECKBOX6 10012
-#define ID_CHECKBOX7 10013
-#define ID_CHECKBOX8 10014
-#define ID_CHECKBOX9 10015
-#define ID_CHECKBOX10 10016
-#define ID_CHECKBOX11 10017
-#define ID_CHECKBOX12 10018
-#define SYMBOL_WINEDA_PADPROPERTIESFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_PADPROPERTIESFRAME_TITLE _("Pad properties")
-#define SYMBOL_WINEDA_PADPROPERTIESFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_PADPROPERTIESFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_PADPROPERTIESFRAME_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-/*!
- * WinEDA_PadPropertiesFrame class declaration
- */
-
-class WinEDA_PadPropertiesFrame: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS( WinEDA_PadPropertiesFrame )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    WinEDA_PadPropertiesFrame( );
-    WinEDA_PadPropertiesFrame( WinEDA_BasePcbFrame* parent,
-            D_PAD * Pad,wxDC * DC,
-            wxWindowID id = SYMBOL_WINEDA_PADPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PADPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PADPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PADPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_PADPROPERTIESFRAME_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PADPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PADPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PADPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PADPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_PADPROPERTIESFRAME_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin WinEDA_PadPropertiesFrame event handler declarations
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX_DRILL_SHAPE
-    void OnRadioboxDrillShapeSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_ORIENT_PAD
-    void OnListboxOrientPadSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_SHAPE_PAD
-    void OnListboxShapePadSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_TYPE_PAD
-    void OnListboxTypePadSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
-    void OnOkClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
-    void OnCancelClick( wxCommandEvent& event );
-
-////@end WinEDA_PadPropertiesFrame event handler declarations
-
-////@begin WinEDA_PadPropertiesFrame member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end WinEDA_PadPropertiesFrame member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-	void PadPropertiesAccept(wxCommandEvent& event);
-	void PadTypeSelected();
-	void PadOrientEvent(wxCommandEvent& event);
-	void SetPadLayersList(long layer_mask);
-	void SetOthersControls();
-
-////@begin WinEDA_PadPropertiesFrame member variables
-    wxBoxSizer* m_LeftBoxSizer;
-    wxTextCtrl* m_PadNumCtrl;
-    wxTextCtrl* m_PadNetNameCtrl;
-    wxBoxSizer* m_PadPositionBoxSizer;
-    wxBoxSizer* m_DrillShapeBoxSizer;
-    wxRadioBox* m_DrillShapeCtrl;
-    wxBoxSizer* m_PadOptSizer;
-    wxRadioBox* m_PadOrient;
-    wxRadioBox* m_PadShape;
-    wxRadioBox* m_PadType;
-    wxCheckBox* m_PadLayerCu;
-    wxCheckBox* m_PadLayerCmp;
-    wxCheckBox* m_PadLayerAdhCmp;
-    wxCheckBox* m_PadLayerAdhCu;
-    wxCheckBox* m_PadLayerPateCmp;
-    wxCheckBox* m_PadLayerPateCu;
-    wxCheckBox* m_PadLayerSilkCmp;
-    wxCheckBox* m_PadLayerSilkCu;
-    wxCheckBox* m_PadLayerMaskCmp;
-    wxCheckBox* m_PadLayerMaskCu;
-    wxCheckBox* m_PadLayerECO1;
-    wxCheckBox* m_PadLayerECO2;
-    wxCheckBox* m_PadLayerDraft;
-////@end WinEDA_PadPropertiesFrame member variables
-	WinEDA_BasePcbFrame * m_Parent;
-	wxDC * m_DC;
-	MODULE * m_Module;
-	D_PAD * CurrentPad;
-
-	WinEDA_SizeCtrl * m_PadSizeCtrl;
-	WinEDA_PositionCtrl * m_PadPositionCtrl;
-	WinEDA_SizeCtrl * m_PadDeltaSizeCtrl;
-	WinEDA_SizeCtrl * m_PadOffsetCtrl;
-	WinEDA_SizeCtrl * m_PadDrillCtrl;
-	WinEDA_ValueCtrl * m_PadOrientCtrl;	// Pour orientation a 0.1 degre pres
-
-};
-
-#endif
-    // _DIALOG_PAD_EDIT_H_

pcbnew/dialog_pad_edit.rc

-#include "wx/msw/wx.rc"

pcbnew/dialog_pad_properties_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_pad_properties_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DialogPadPropertiesBase::DialogPadPropertiesBase( 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* m_MainSizer;
+	m_MainSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* m_LeftBoxSizer;
+	m_LeftBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_PadNumText = new wxStaticText( this, wxID_ANY, _("Pad Num :"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PadNumText->Wrap( -1 );
+	m_LeftBoxSizer->Add( m_PadNumText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadNumCtrl = new wxTextCtrl( this, wxID_PADNUMCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_LeftBoxSizer->Add( m_PadNumCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_PadNameText = new wxStaticText( this, wxID_ANY, _("Pad Net Name :"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PadNameText->Wrap( -1 );
+	m_LeftBoxSizer->Add( m_PadNameText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadNetNameCtrl = new wxTextCtrl( this, wxID_PADNETNAMECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_LeftBoxSizer->Add( m_PadNetNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadPositionBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_LeftBoxSizer->Add( m_PadPositionBoxSizer, 0, wxEXPAND, 5 );
+	
+	m_MainSizer->Add( m_LeftBoxSizer, 0, wxBOTTOM|wxLEFT, 5 );
+	
+	m_DrillShapeBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_PadShapeChoices[] = { _("Circle"), _("Oval"), _("Rect"), _("Trapezoidal") };
+	int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString );
+	m_PadShape = new wxRadioBox( this, ID_LISTBOX_SHAPE_PAD, _("Pad Shape:"), wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 1, wxRA_SPECIFY_COLS );
+	m_PadShape->SetSelection( 0 );
+	m_DrillShapeBoxSizer->Add( m_PadShape, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_DrillShapeBoxSizer->Add( 0, 8, 1, wxEXPAND, 5 );
+	
+	wxString m_DrillShapeCtrlChoices[] = { _("Circle"), _("Oval") };
+	int m_DrillShapeCtrlNChoices = sizeof( m_DrillShapeCtrlChoices ) / sizeof( wxString );
+	m_DrillShapeCtrl = new wxRadioBox( this, ID_RADIOBOX_DRILL_SHAPE, _("Drill Shape:"), wxDefaultPosition, wxDefaultSize, m_DrillShapeCtrlNChoices, m_DrillShapeCtrlChoices, 1, wxRA_SPECIFY_COLS );
+	m_DrillShapeCtrl->SetSelection( 1 );
+	m_DrillShapeBoxSizer->Add( m_DrillShapeCtrl, 0, wxALL|wxEXPAND, 5 );
+	
+	m_MainSizer->Add( m_DrillShapeBoxSizer, 1, wxBOTTOM, 5 );
+	
+	wxBoxSizer* m_MiddleRightBoxSizer;
+	m_MiddleRightBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxString m_PadOrientChoices[] = { _("0"), _("90"), _("-90"), _("180"), _("User") };
+	int m_PadOrientNChoices = sizeof( m_PadOrientChoices ) / sizeof( wxString );
+	m_PadOrient = new wxRadioBox( this, ID_LISTBOX_ORIENT_PAD, _("Pad Orient:"), wxDefaultPosition, wxDefaultSize, m_PadOrientNChoices, m_PadOrientChoices, 1, wxRA_SPECIFY_COLS );
+	m_PadOrient->SetSelection( 0 );
+	m_MiddleRightBoxSizer->Add( m_PadOrient, 0, wxALL|wxEXPAND, 5 );
+	
+	m_PadOrientText = new wxStaticText( this, wxID_ANY, _("Pad Orient (0.1 deg)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PadOrientText->Wrap( -1 );
+	m_MiddleRightBoxSizer->Add( m_PadOrientText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadOrientCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_MiddleRightBoxSizer->Add( m_PadOrientCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	m_MiddleRightBoxSizer->Add( 0, 8, 1, wxEXPAND, 5 );
+	
+	wxString m_PadTypeChoices[] = { _("Standard"), _("SMD"), _("Conn") };
+	int m_PadTypeNChoices = sizeof( m_PadTypeChoices ) / sizeof( wxString );
+	m_PadType = new wxRadioBox( this, ID_LISTBOX_TYPE_PAD, _("Pad Type:"), wxDefaultPosition, wxDefaultSize, m_PadTypeNChoices, m_PadTypeChoices, 1, wxRA_SPECIFY_COLS );
+	m_PadType->SetSelection( 0 );
+	m_MiddleRightBoxSizer->Add( m_PadType, 0, wxALL|wxEXPAND, 5 );
+	
+	m_MainSizer->Add( m_MiddleRightBoxSizer, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* m_RightBoxSizer;
+	m_RightBoxSizer = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonOk = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonOk->SetDefault(); 
+	m_buttonOk->SetForegroundColour( wxColour( 209, 26, 5 ) );
+	
+	m_RightBoxSizer->Add( m_buttonOk, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonCancel->SetForegroundColour( wxColour( 14, 2, 164 ) );
+	
+	m_RightBoxSizer->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	
+	m_RightBoxSizer->Add( 0, 8, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* m_LayersSizer;
+	m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers:") ), wxVERTICAL );
+	
+	m_PadLayerCu = new wxCheckBox( this, wxID_ANY, _("Copper layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerCmp = new wxCheckBox( this, wxID_ANY, _("Component layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerCmp, 0, wxALL, 5 );
+	
+	
+	m_LayersSizer->Add( 0, 8, 1, wxEXPAND, 5 );
+	
+	m_PadLayerAdhCmp = new wxCheckBox( this, wxID_ANY, _("Adhesive Cmp"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerAdhCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerAdhCu = new wxCheckBox( this, wxID_ANY, _("Adhesive Copper"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerAdhCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerPateCmp = new wxCheckBox( this, wxID_ANY, _("Solder paste Cmp"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerPateCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerPateCu = new wxCheckBox( this, wxID_ANY, _("Solder paste Copper"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerPateCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerSilkCmp = new wxCheckBox( this, wxID_ANY, _("Silkscreen Cmp"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerSilkCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerSilkCu = new wxCheckBox( this, wxID_ANY, _("Silkscreen Copper"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerSilkCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerMaskCmp = new wxCheckBox( this, wxID_ANY, _("Solder mask Cmp"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerMaskCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerMaskCu = new wxCheckBox( this, wxID_ANY, _("Solder mask Copper"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerMaskCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerECO1 = new wxCheckBox( this, wxID_ANY, _("E.C.O.1 layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerECO1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerECO2 = new wxCheckBox( this, wxID_ANY, _("E.C.O.2 layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerECO2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_PadLayerDraft = new wxCheckBox( this, wxID_ANY, _("Draft layer"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_LayersSizer->Add( m_PadLayerDraft, 0, wxALL, 5 );
+	
+	m_RightBoxSizer->Add( m_LayersSizer, 0, 0, 5 );
+	
+	m_MainSizer->Add( m_RightBoxSizer, 0, wxBOTTOM|wxRIGHT, 5 );
+	
+	this->SetSizer( m_MainSizer );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogPadPropertiesBase::InitDialog ) );
+	m_PadShape->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::OnPadShapeSelection ), NULL, this );
+	m_DrillShapeCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::OnDrillShapeSelected ), NULL, this );
+	m_PadOrient->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::PadOrientEvent ), NULL, this );
+	m_PadType->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::PadTypeSelected ), NULL, this );
+	m_buttonOk->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogPadPropertiesBase::PadPropertiesAccept ), NULL, this );
+}
+
+DialogPadPropertiesBase::~DialogPadPropertiesBase()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogPadPropertiesBase::InitDialog ) );
+	m_PadShape->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::OnPadShapeSelection ), NULL, this );
+	m_DrillShapeCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::OnDrillShapeSelected ), NULL, this );
+	m_PadOrient->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::PadOrientEvent ), NULL, this );
+	m_PadType->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogPadPropertiesBase::PadTypeSelected ), NULL, this );
+	m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogPadPropertiesBase::PadPropertiesAccept ), NULL, this );
+}

pcbnew/dialog_pad_properties_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_pad_properties_base__
+#define __dialog_pad_properties_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/radiobox.h>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/statbox.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DialogPadPropertiesBase
+///////////////////////////////////////////////////////////////////////////////
+class DialogPadPropertiesBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			wxID_DIALOG_EDIT_PAD = 1000,
+			wxID_PADNUMCTRL,
+			wxID_PADNETNAMECTRL,
+			ID_LISTBOX_SHAPE_PAD,
+			ID_RADIOBOX_DRILL_SHAPE,
+			ID_LISTBOX_ORIENT_PAD,
+			ID_LISTBOX_TYPE_PAD,
+		};
+		
+		wxStaticText* m_PadNumText;
+		wxTextCtrl* m_PadNumCtrl;
+		wxStaticText* m_PadNameText;
+		wxTextCtrl* m_PadNetNameCtrl;
+		wxBoxSizer* m_PadPositionBoxSizer;
+		wxBoxSizer* m_DrillShapeBoxSizer;
+		wxRadioBox* m_PadShape;
+		
+		wxRadioBox* m_DrillShapeCtrl;
+		wxRadioBox* m_PadOrient;
+		wxStaticText* m_PadOrientText;
+		wxTextCtrl* m_PadOrientCtrl;
+		
+		wxRadioBox* m_PadType;
+		wxButton* m_buttonOk;
+		wxButton* m_buttonCancel;
+		
+		wxCheckBox* m_PadLayerCu;
+		wxCheckBox* m_PadLayerCmp;
+		
+		wxCheckBox* m_PadLayerAdhCmp;
+		wxCheckBox* m_PadLayerAdhCu;
+		wxCheckBox* m_PadLayerPateCmp;
+		wxCheckBox* m_PadLayerPateCu;
+		wxCheckBox* m_PadLayerSilkCmp;
+		wxCheckBox* m_PadLayerSilkCu;
+		wxCheckBox* m_PadLayerMaskCmp;
+		wxCheckBox* m_PadLayerMaskCu;
+		wxCheckBox* m_PadLayerECO1;
+		wxCheckBox* m_PadLayerECO2;
+		wxCheckBox* m_PadLayerDraft;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void InitDialog( wxInitDialogEvent& event ){ event.Skip(); }
+		virtual void OnPadShapeSelection( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnDrillShapeSelected( wxCommandEvent& event ){ event.Skip(); }
+		virtual void PadOrientEvent( wxCommandEvent& event ){ event.Skip(); }
+		virtual void PadTypeSelected( wxCommandEvent& event ){ event.Skip(); }
+		virtual void PadPropertiesAccept( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
+		DialogPadPropertiesBase( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 520,396 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER );
+		~DialogPadPropertiesBase();
+	
+};
+
+#endif //__dialog_pad_properties_base__

pcbnew/makefile.include

@@ -30,6 +30,8 @@ OBJECTS=	$(TARGET).o classpcb.o\
 		dialog_freeroute_exchange.o\
 		modedit_undo_redo.o\
 		block_module_editor.o\
+        dialog_pad_properties.o\
+        dialog_pad_properties_base.o\
 		onrightclick.o\
 		onleftclick.o\
 		modedit_onclick.o\
@@ -87,7 +89,6 @@ OBJECTS=	$(TARGET).o classpcb.o\
 		editrack-part2.o \
 		deltrack.o edit_track_width.o \
 		editmod.o\
-		editpads.o \
 		move-drag_pads.o\
 		globaleditpad.o \
 		editedge.o\
@@ -245,8 +246,6 @@ edit_track_width.o: edit_track_width.cpp $(COMMON)
 
 editmod.o: editmod.cpp dialog_edit_module.cpp dialog_edit_module.h $(COMMON)
 
-editpads.o: editpads.cpp dialog_pad_edit.cpp dialog_pad_edit.h $(COMMON)
-
 move-drag_pads.o: move-drag_pads.cpp drag.h $(COMMON)
 
 editedge.o: editedge.cpp $(COMMON)

pcbnew/pcbcfg.h

@@ -56,21 +56,6 @@ static PARAM_CFG_INT PadDimVCfg
 );
 
 
-static PARAM_CFG_INT PadFormeCfg
-(
-    wxT( "PadForm" ),               /* Keyword */
-    &g_Pad_Master.m_PadShape,       /* Parameter address */
-    PAD_CIRCLE,                     /* Default value */
-    0, 0x7F                         /* Min and max values*/
-);
-
-static PARAM_CFG_INT PadMasqueLayerCfg
-(
-    wxT( "PadMask" ),                   /* Keyword */
-    &g_Pad_Master.m_Masque_Layer,       /* Parameter address */
-    0x0000FFFF                          /* Default value */
-);
-
 static PARAM_CFG_INT ViaDiametreCfg
 (
     wxT( "ViaDiam" ),                           /* Keyword */
@@ -770,6 +755,7 @@ static PARAM_CFG_INT DivGrillePcbCfg
 
 static PARAM_CFG_INT TimeOutCfg     //Duree entre Sauvegardes auto en secondes
 (
+    INSETUP,
     wxT( "TimeOut" ),               /* Keyword */
     &g_TimeOut,                     /* Parameter address */
     600,                            /* Default value */
@@ -804,6 +790,7 @@ static PARAM_CFG_INT PrmMaxLinksShowed
 
 static PARAM_CFG_BOOL ShowRatsnestCfg
 (
+    INSETUP,
     wxT( "ShowRat" ),               /* Keyword */
     &g_Show_Ratsnest,               /* Parameter address */
     FALSE                           /* Default value */
@@ -811,6 +798,7 @@ static PARAM_CFG_BOOL ShowRatsnestCfg
 
 static PARAM_CFG_BOOL ShowModuleRatsnestCfg
 (
+    INSETUP,
     wxT( "ShowMRa" ),               /* Keyword */
     &g_Show_Module_Ratsnest,        /* Parameter address */
     TRUE                            /* Default value */
@@ -831,8 +819,6 @@ PARAM_CFG_BASE* ParamCfgList[] =
     &PadDrillCfg,
     &PadDimHCfg,
     &PadDimVCfg,
-    &PadFormeCfg,
-    &PadMasqueLayerCfg,
     &ViaDiametreCfg,
     &ViaDrillCfg,
     &MicroViaDiametreCfg,

template/kicad.pro

-update=23/9/2008-19:07:03
+update=20/11/2008-19:07:03
 version=1
 last_client=eeschema
 [general]
@@ -71,7 +71,7 @@ ShowRat=0
 ShowMRa=1
 [pcbnew/libraries]
 LibDir=
-LibName1=supports
+LibName1=sockets
 LibName2=connect
 LibName3=discret
 LibName4=pin_array
@@ -145,4 +145,3 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=valves
-LibName31=atmel