diff --git a/change_log.txt b/change_log.txt
index ee3b79f955..2de3af2b4e 100644
--- a/change_log.txt
+++ b/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>
 ================================================================================
diff --git a/eeschema/classes_body_items.cpp b/eeschema/classes_body_items.cpp
index 617ba724d7..761f468340 100644
--- a/eeschema/classes_body_items.cpp
+++ b/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 );
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index c7f5da6061..8f564fccc4 100644
--- a/eeschema/menubar.cpp
+++ b/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 );
 
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index 588a62ddf9..22a0bd69ef 100644
--- a/eeschema/tool_sch.cpp
+++ b/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,
diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo
index 8680db5589..fc8da2929f 100644
Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ
diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po
index 9cf49af8fd..31b7803c36 100644
--- a/internat/fr/kicad.po
+++ b/internat/fr/kicad.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 12:50+0100\n"
-"PO-Revision-Date: 2008-11-16 12:53+0100\n"
+"POT-Creation-Date: 2008-11-22 11:36+0100\n"
+"PO-Revision-Date: 2008-11-22 11:37+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -286,7 +286,7 @@ msgstr "dimension"
 #: pcbnew/class_drawsegment.cpp:311
 #: pcbnew/class_marker.cpp:133
 #: pcbnew/class_text_mod.cpp:503
-#: pcbnew/class_track.cpp:853
+#: pcbnew/class_track.cpp:850
 #: pcbnew/class_zone.cpp:789
 msgid "Type"
 msgstr "Type"
@@ -300,16 +300,16 @@ msgid "Angle"
 msgstr "Angle"
 
 #: pcbnew/class_drawsegment.cpp:326
-#: pcbnew/class_track.cpp:878
+#: pcbnew/class_track.cpp:875
 msgid "Segment"
 msgstr "Segment"
 
 #: pcbnew/class_drawsegment.cpp:336
 #: pcbnew/class_module.cpp:1081
-#: pcbnew/class_pad.cpp:993
+#: pcbnew/class_pad.cpp:990
 #: pcbnew/class_pcb_text.cpp:190
 #: pcbnew/class_text_mod.cpp:516
-#: pcbnew/class_track.cpp:910
+#: pcbnew/class_track.cpp:907
 #: pcbnew/class_zone.cpp:823
 msgid "Layer"
 msgstr "Couche"
@@ -318,7 +318,7 @@ msgstr "Couche"
 #: pcbnew/class_edge_mod.cpp:297
 #: pcbnew/class_pcb_text.cpp:204
 #: pcbnew/class_text_mod.cpp:528
-#: pcbnew/class_track.cpp:933
+#: pcbnew/class_track.cpp:930
 msgid "Width"
 msgstr "Epaisseur"
 
@@ -388,7 +388,7 @@ msgstr "Seg"
 
 #: pcbnew/class_edge_mod.cpp:286
 #: pcbnew/class_module.cpp:1108
-#: pcbnew/class_pad.cpp:903
+#: pcbnew/class_pad.cpp:900
 #: pcbnew/class_text_mod.cpp:494
 msgid "Module"
 msgstr "Module"
@@ -418,12 +418,12 @@ msgid "Netlist path"
 msgstr "Chemin Netliste "
 
 #: pcbnew/class_module.cpp:1101
-#: pcbnew/class_track.cpp:894
+#: pcbnew/class_track.cpp:891
 msgid "Stat"
 msgstr "Stat"
 
 #: pcbnew/class_module.cpp:1105
-#: pcbnew/class_pad.cpp:1035
+#: pcbnew/class_pad.cpp:1028
 #: pcbnew/class_pcb_text.cpp:201
 #: pcbnew/class_text_mod.cpp:525
 msgid "Orient"
@@ -441,41 +441,41 @@ msgstr "Doc: "
 msgid "KeyW: "
 msgstr "KeyW: "
 
-#: pcbnew/class_pad.cpp:820
+#: pcbnew/class_pad.cpp:817
 msgid "Unknown Pad shape"
 msgstr "Forme Pad inconnue"
 
-#: pcbnew/class_pad.cpp:906
+#: pcbnew/class_pad.cpp:903
 msgid "RefP"
 msgstr "RefP"
 
-#: pcbnew/class_pad.cpp:1006
+#: pcbnew/class_pad.cpp:999
 #: pcbnew/class_pcb_text.cpp:207
 #: pcbnew/class_text_mod.cpp:531
 msgid "H Size"
 msgstr "Taille H"
 
-#: pcbnew/class_pad.cpp:1010
+#: pcbnew/class_pad.cpp:1003
 #: pcbnew/class_pcb_text.cpp:210
 #: pcbnew/class_text_mod.cpp:534
 msgid "V Size"
 msgstr "Taille V"
 
-#: pcbnew/class_pad.cpp:1016
-#: pcbnew/class_track.cpp:925
-#: pcbnew/class_track.cpp:930
+#: pcbnew/class_pad.cpp:1009
+#: pcbnew/class_track.cpp:922
+#: pcbnew/class_track.cpp:927
 msgid "Drill"
 msgstr "Perçage"
 
-#: pcbnew/class_pad.cpp:1024
+#: pcbnew/class_pad.cpp:1017
 msgid "Drill X / Y"
 msgstr "Perçage X/Y"
 
-#: pcbnew/class_pad.cpp:1039
+#: pcbnew/class_pad.cpp:1032
 msgid "X Pos"
 msgstr "X Pos"
 
-#: pcbnew/class_pad.cpp:1043
+#: pcbnew/class_pad.cpp:1036
 msgid "Y pos"
 msgstr "Y pos"
 
@@ -510,21 +510,21 @@ msgstr "Ref."
 msgid "Display"
 msgstr "Affichage"
 
-#: pcbnew/class_track.cpp:869
+#: pcbnew/class_track.cpp:866
 #: pcbnew/class_zone.cpp:811
 msgid "NetName"
 msgstr "NetName"
 
-#: pcbnew/class_track.cpp:874
+#: pcbnew/class_track.cpp:871
 #: pcbnew/class_zone.cpp:819
 msgid "NetCode"
 msgstr "NetCode"
 
-#: pcbnew/class_track.cpp:882
+#: pcbnew/class_track.cpp:879
 msgid "Standard"
 msgstr "Standard"
 
-#: pcbnew/class_track.cpp:918
+#: pcbnew/class_track.cpp:915
 msgid "Diam"
 msgstr "Diam"
 
@@ -1799,6 +1799,38 @@ msgstr "Ok pour ajuster l'orientation des modules à %g degrés ?"
 msgid "Bad value for footprints orientation"
 msgstr "Mauvaise valeur pour l'orientation des empreintes"
 
+#: pcbnew/dialog_pad_properties.cpp:120
+msgid "Pad Position"
+msgstr "Position Pad"
+
+#: pcbnew/dialog_pad_properties.cpp:125
+msgid "Pad Size"
+msgstr "Taille Pad"
+
+#: pcbnew/dialog_pad_properties.cpp:130
+msgid "Delta"
+msgstr "Delta"
+
+#: pcbnew/dialog_pad_properties.cpp:135
+msgid "Offset"
+msgstr "Offset"
+
+#: pcbnew/dialog_pad_properties.cpp:141
+msgid "Pad drill"
+msgstr "Diam perçage"
+
+#: pcbnew/dialog_pad_properties.cpp:427
+msgid "Incorrect value for pad drill: pad drill bigger than pad size"
+msgstr "Valeur incorrecte pour diamètre de perçage.perçage plus grand que la taille du pad"
+
+#: pcbnew/dialog_pad_properties.cpp:433
+msgid "Incorrect value for pad offset"
+msgstr "Valeur incorrecte pour offset du pad"
+
+#: pcbnew/dialog_pad_properties.cpp:528
+msgid "Unknown netname, no change"
+msgstr "Net inconnu, pas de changement"
+
 #: pcbnew/pcbplot.cpp:149
 #: pcbnew/pcbplot.cpp:281
 msgid "Plot"
@@ -2053,7 +2085,7 @@ msgstr "Surbrillance des équipotentielles"
 msgid "Local Ratsnest"
 msgstr "Montrer le chevelu général"
 
-#: pcbnew/edit.cpp:579
+#: pcbnew/edit.cpp:584
 msgid "Delete item"
 msgstr "Suppression d'éléments"
 
@@ -2818,7 +2850,7 @@ msgstr "L'élément graphique sera sur une couche cuivre. C'est très dangereux.
 
 #: pcbnew/edgemod.cpp:246
 msgid "New Width (1/10000\"):"
-msgstr "Novelle largeur (1/10000\"):"
+msgstr "Nouvelle largeur (1/10000\"):"
 
 #: pcbnew/edgemod.cpp:246
 msgid "Edge Width"
@@ -2978,19 +3010,19 @@ msgstr " chargé"
 msgid "Modules [%d items]"
 msgstr "Modules [%d éléments]"
 
-#: pcbnew/dialog_copper_zones.cpp:66
+#: pcbnew/dialog_copper_zones.cpp:67
 msgid "Zone clearance value:"
 msgstr "Valeur isolation zone:"
 
-#: pcbnew/dialog_copper_zones.cpp:69
+#: pcbnew/dialog_copper_zones.cpp:70
 msgid "Grid :"
 msgstr "Grille:"
 
-#: pcbnew/dialog_copper_zones.cpp:354
+#: pcbnew/dialog_copper_zones.cpp:355
 msgid "Error : you must choose a layer"
 msgstr "Erreur. Vous devez choisir une couche"
 
-#: pcbnew/dialog_copper_zones.cpp:366
+#: pcbnew/dialog_copper_zones.cpp:367
 msgid "Error : you must choose a net name"
 msgstr "Erreur. Vous devez choisir une équipotentielle"
 
@@ -3157,6 +3189,30 @@ msgstr "Référence ou Valeur ne peut etre effacée"
 msgid "Delete [%s]"
 msgstr "Supprimer [%s]"
 
+#: pcbnew/dsn.cpp:502
+msgid "Line length exceeded"
+msgstr "Longueur de ligne dépassée"
+
+#: pcbnew/dsn.cpp:616
+msgid "in file"
+msgstr "dans le fichier"
+
+#: pcbnew/dsn.cpp:617
+msgid "on line"
+msgstr "en ligne"
+
+#: pcbnew/dsn.cpp:618
+msgid "at offset"
+msgstr "a l'offset"
+
+#: pcbnew/dsn.cpp:678
+msgid "String delimiter must be a single character of ', \", or $"
+msgstr "Le caractère de délimitation de ligne doit être un seul caractère  ', \", or $"
+
+#: pcbnew/dsn.cpp:768
+msgid "Un-terminated delimited string"
+msgstr "Ligne délimitée non terminée"
+
 #: pcbnew/tool_pcb.cpp:33
 msgid ""
 "Show active layer selections\n"
@@ -3620,42 +3676,6 @@ msgstr "Bloc Miroir"
 msgid "Move Block"
 msgstr "Déplacer Bloc"
 
-#: pcbnew/editpads.cpp:81
-msgid "Pad Position"
-msgstr "Position Pad"
-
-#: pcbnew/editpads.cpp:88
-msgid "Pad Size"
-msgstr "Taille Pad"
-
-#: pcbnew/editpads.cpp:95
-msgid "Delta"
-msgstr "Delta"
-
-#: pcbnew/editpads.cpp:102
-msgid "Offset"
-msgstr "Offset"
-
-#: pcbnew/editpads.cpp:111
-msgid "Pad drill"
-msgstr "Diam perçage"
-
-#: pcbnew/editpads.cpp:123
-msgid "Pad Orientation (in 0.1 degrees)"
-msgstr "Orientation Pad  en (0.1 degrés)"
-
-#: pcbnew/editpads.cpp:388
-msgid "Incorrect value for pad drill: pad drill bigger than pad size"
-msgstr "Valeur incorrecte pour diamètre de perçage.perçage plus grand que la taille du pad"
-
-#: pcbnew/editpads.cpp:394
-msgid "Incorrect value for pad offset"
-msgstr "Valeur incorrecte pour offset du pad"
-
-#: pcbnew/editpads.cpp:491
-msgid "Unknown netname, no change"
-msgstr "Net inconnu, pas de changement"
-
 #: pcbnew/specctra.cpp:133
 #: pcbnew/specctra.cpp:140
 msgid "Expecting"
@@ -3787,14 +3807,14 @@ msgstr "Le Fichier Session utilise une couche invalide n° \"%s\""
 
 #: pcbnew/specctra_import.cpp:241
 msgid "Session via padstack has no shapes"
-msgstr "Manque dans le Fichier Session file la section "
+msgstr "Dans le fichier Session une via n'a pas de forme"
 
 #: pcbnew/specctra_import.cpp:248
 #: pcbnew/specctra_import.cpp:266
 #: pcbnew/specctra_import.cpp:290
 #, c-format
 msgid "Unsupported via shape: \"%s\""
-msgstr "Forme via inconnue: \"%s\""
+msgstr "Forme via non supportée: \"%s\""
 
 #: pcbnew/specctra_import.cpp:347
 msgid "Session file is missing the \"session\" section"
@@ -3822,30 +3842,6 @@ msgstr "Le fichier Session a une 'reference' a un composant non existant \"%s\""
 msgid "A wire_via references a missing padstack \"%s\""
 msgstr "Une piste ou via  a une référence vers un  pad \"%s\" manquant"
 
-#: pcbnew/dsn.cpp:502
-msgid "Line length exceeded"
-msgstr "Longueur de ligne dépassée"
-
-#: pcbnew/dsn.cpp:616
-msgid "in file"
-msgstr "dans le fichier"
-
-#: pcbnew/dsn.cpp:617
-msgid "on line"
-msgstr "en ligne"
-
-#: pcbnew/dsn.cpp:618
-msgid "at offset"
-msgstr "a l'offset"
-
-#: pcbnew/dsn.cpp:666
-msgid "String delimiter must be a single character of ', \", or $"
-msgstr "Le caractère de délimitation de ligne doit être un seul caractère  ', \", or $"
-
-#: pcbnew/dsn.cpp:756
-msgid "Un-terminated delimited string"
-msgstr "Ligne délimitée non terminée"
-
 #: pcbnew/pcbnew.cpp:44
 msgid "Pcbnew is already running, Continue?"
 msgstr "Pcbnew est en cours d'exécution. Continuer ?"
@@ -4380,7 +4376,7 @@ msgstr " Pads magnétiques"
 
 #: pcbnew/dialog_general_options.cpp:460
 msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
-msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur le pad"
+msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur un pad"
 
 #: pcbnew/dialog_general_options.cpp:468
 msgid "Magnetic Tracks"
@@ -4388,7 +4384,7 @@ msgstr "Pistes Magnétiques"
 
 #: pcbnew/dialog_general_options.cpp:475
 msgid "control the capture of the pcb cursor when the mouse cursor enters a track"
-msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur la piste"
+msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur une piste"
 
 #: pcbnew/dialog_non_copper_zones_properties_base.cpp:28
 msgid "Hatched Outline"
@@ -4419,115 +4415,6 @@ msgstr "Direction contours zone"
 msgid "Layer selection:"
 msgstr "Sélection couche:"
 
-#: pcbnew/dialog_pad_edit.cpp:157
-msgid "Pad Num :"
-msgstr "Num Pad :"
-
-#: pcbnew/dialog_pad_edit.cpp:163
-msgid "Pad Net Name :"
-msgstr "NetName Pad:"
-
-#: pcbnew/dialog_pad_edit.cpp:177
-#: pcbnew/dialog_pad_edit.cpp:197
-msgid "Oval"
-msgstr "Ovale"
-
-#: pcbnew/dialog_pad_edit.cpp:178
-msgid "Drill Shape:"
-msgstr "Forme du perçage:"
-
-#: pcbnew/dialog_pad_edit.cpp:187
-msgid "90"
-msgstr "90"
-
-#: pcbnew/dialog_pad_edit.cpp:188
-msgid "-90"
-msgstr "-90"
-
-#: pcbnew/dialog_pad_edit.cpp:189
-msgid "180"
-msgstr "180"
-
-#: pcbnew/dialog_pad_edit.cpp:191
-msgid "Pad Orient:"
-msgstr "Orient pad:"
-
-#: pcbnew/dialog_pad_edit.cpp:199
-msgid "Trapezoidal"
-msgstr "Trapezoidal"
-
-#: pcbnew/dialog_pad_edit.cpp:200
-msgid "Pad Shape:"
-msgstr "Forme Pad:"
-
-#: pcbnew/dialog_pad_edit.cpp:206
-msgid "SMD"
-msgstr "CMS"
-
-#: pcbnew/dialog_pad_edit.cpp:207
-msgid "Conn"
-msgstr "Conn"
-
-#: pcbnew/dialog_pad_edit.cpp:208
-msgid "Pad Type:"
-msgstr "Type Pad:"
-
-#: pcbnew/dialog_pad_edit.cpp:223
-msgid "Layers:"
-msgstr "Couches:"
-
-#: pcbnew/dialog_pad_edit.cpp:227
-msgid "Copper layer"
-msgstr "Couches Cuivre"
-
-#: pcbnew/dialog_pad_edit.cpp:231
-msgid "Comp layer"
-msgstr "Couche Cmp"
-
-#: pcbnew/dialog_pad_edit.cpp:237
-msgid "Adhesive Cmp"
-msgstr "Adhesive Cmp"
-
-#: pcbnew/dialog_pad_edit.cpp:241
-msgid "Adhesive Copper"
-msgstr "Adhesive Cu"
-
-#: pcbnew/dialog_pad_edit.cpp:245
-msgid "Solder paste Cmp"
-msgstr "Pate à souder Cmp"
-
-#: pcbnew/dialog_pad_edit.cpp:249
-msgid "Solder paste Copper"
-msgstr "Pate à souder cuivre"
-
-#: pcbnew/dialog_pad_edit.cpp:253
-msgid "Silkscreen Cmp"
-msgstr "Sérigr Cmp"
-
-#: pcbnew/dialog_pad_edit.cpp:257
-msgid "Silkscreen Copper"
-msgstr "Sérigr Cu "
-
-#: pcbnew/dialog_pad_edit.cpp:261
-msgid "Solder mask Cmp"
-msgstr "Masque soudure Cmp"
-
-#: pcbnew/dialog_pad_edit.cpp:265
-msgid "Solder mask Copper"
-msgstr "Masque soudure cuivre"
-
-#: pcbnew/dialog_pad_edit.cpp:269
-msgid "E.C.O.1 layer"
-msgstr "couche E.C.O.1"
-
-#: pcbnew/dialog_pad_edit.cpp:273
-msgid "E.C.O.2 layer"
-msgstr "couche E.C.O.2"
-
-#: pcbnew/dialog_pad_edit.cpp:277
-msgid "Draft layer"
-msgstr "Couche dessin"
-
 #: pcbnew/dialog_copper_zones_base.cpp:32
 msgid "Zone Setup:"
 msgstr "Options Zone:"
@@ -4566,7 +4453,7 @@ msgstr "Pad en Zone:"
 
 #: pcbnew/dialog_copper_zones_base.cpp:53
 msgid "Thermal Reliefs Parameters"
-msgstr "Pramètres FreinsThermiques"
+msgstr "Paramètres FreinsThermiques"
 
 #: pcbnew/dialog_copper_zones_base.cpp:55
 msgid "Antipad Size"
@@ -5060,6 +4947,119 @@ msgstr "&Divers"
 msgid "P&ostprocess"
 msgstr "P&ostprocesseurs"
 
+#: pcbnew/dialog_pad_properties_base.cpp:22
+msgid "Pad Num :"
+msgstr "Num Pad :"
+
+#: pcbnew/dialog_pad_properties_base.cpp:29
+msgid "Pad Net Name :"
+msgstr "NetName Pad:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:44
+#: pcbnew/dialog_pad_properties_base.cpp:53
+msgid "Oval"
+msgstr "Ovale"
+
+#: pcbnew/dialog_pad_properties_base.cpp:44
+msgid "Trapezoidal"
+msgstr "Trapezoidal"
+
+#: pcbnew/dialog_pad_properties_base.cpp:46
+msgid "Pad Shape:"
+msgstr "Forme Pad:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:55
+msgid "Drill Shape:"
+msgstr "Forme du perçage:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:64
+msgid "90"
+msgstr "90"
+
+#: pcbnew/dialog_pad_properties_base.cpp:64
+msgid "-90"
+msgstr "-90"
+
+#: pcbnew/dialog_pad_properties_base.cpp:64
+msgid "180"
+msgstr "180"
+
+#: pcbnew/dialog_pad_properties_base.cpp:66
+msgid "Pad Orient:"
+msgstr "Orient pad:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:70
+msgid "Pad Orient (0.1 deg)"
+msgstr "Orient. Pad  (0.1 deg)"
+
+#: pcbnew/dialog_pad_properties_base.cpp:80
+msgid "SMD"
+msgstr "CMS"
+
+#: pcbnew/dialog_pad_properties_base.cpp:80
+msgid "Conn"
+msgstr "Conn"
+
+#: pcbnew/dialog_pad_properties_base.cpp:82
+msgid "Pad Type:"
+msgstr "Type Pad:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:106
+msgid "Layers:"
+msgstr "Couches:"
+
+#: pcbnew/dialog_pad_properties_base.cpp:108
+msgid "Copper layer"
+msgstr "Couches Cuivre"
+
+#: pcbnew/dialog_pad_properties_base.cpp:112
+msgid "Component layer"
+msgstr "Couche composant"
+
+#: pcbnew/dialog_pad_properties_base.cpp:119
+msgid "Adhesive Cmp"
+msgstr "Adhesive Cmp"
+
+#: pcbnew/dialog_pad_properties_base.cpp:123
+msgid "Adhesive Copper"
+msgstr "Adhesive Cu"
+
+#: pcbnew/dialog_pad_properties_base.cpp:127
+msgid "Solder paste Cmp"
+msgstr "Pate à souder Cmp"
+
+#: pcbnew/dialog_pad_properties_base.cpp:131
+msgid "Solder paste Copper"
+msgstr "Pate à souder cuivre"
+
+#: pcbnew/dialog_pad_properties_base.cpp:135
+msgid "Silkscreen Cmp"
+msgstr "Sérigr Cmp"
+
+#: pcbnew/dialog_pad_properties_base.cpp:139
+msgid "Silkscreen Copper"
+msgstr "Sérigr Cu "
+
+#: pcbnew/dialog_pad_properties_base.cpp:143
+msgid "Solder mask Cmp"
+msgstr "Masque soudure Cmp"
+
+#: pcbnew/dialog_pad_properties_base.cpp:147
+msgid "Solder mask Copper"
+msgstr "Masque soudure cuivre"
+
+#: pcbnew/dialog_pad_properties_base.cpp:151
+msgid "E.C.O.1 layer"
+msgstr "couche E.C.O.1"
+
+#: pcbnew/dialog_pad_properties_base.cpp:155
+msgid "E.C.O.2 layer"
+msgstr "couche E.C.O.2"
+
+#: pcbnew/dialog_pad_properties_base.cpp:159
+msgid "Draft layer"
+msgstr "Couche dessin"
+
 #: eeschema/backanno.cpp:135
 msgid "Load Stuff File"
 msgstr "Charger Fichier d'échange"
@@ -6267,7 +6267,7 @@ msgstr "Incrément Label:"
 
 #: eeschema/dialog_options.cpp:332
 msgid "Default Label Size"
-msgstr "Taille Label par défaut:"
+msgstr "Taille Label par défaut"
 
 #: eeschema/libfield.cpp:205
 msgid "Edit field"
@@ -7088,32 +7088,6 @@ msgstr "Cette opération changera l'annotation actuelle et ne pourra être annul
 msgid "Ok to continue renaming?"
 msgstr "Ok pour continuer le changement de nom?"
 
-#: eeschema/symbedit.cpp:52
-msgid "Import symbol drawings:"
-msgstr "Importer les symboles:"
-
-#: eeschema/symbedit.cpp:74
-#, c-format
-msgid "Failed to open Symbol File <%s>"
-msgstr "Ne peut pas ouvrir fichier <%s>"
-
-#: eeschema/symbedit.cpp:87
-msgid "Warning: more than 1 part in Symbol File"
-msgstr "Attention: plus de 1élément dans le fichier symbole"
-
-#: eeschema/symbedit.cpp:92
-msgid "Symbol File is void"
-msgstr "Fichier Symbole vide"
-
-#: eeschema/symbedit.cpp:150
-msgid "Export symbol drawings:"
-msgstr "Exporter le symbole"
-
-#: eeschema/symbedit.cpp:170
-#, c-format
-msgid "Save Symbol in [%s]"
-msgstr "Symbole sauvé en  [%s]"
-
 #: eeschema/libedit.cpp:38
 msgid " Part:   "
 msgstr "Composant   "
@@ -7321,6 +7295,7 @@ msgid "Part %c"
 msgstr "Composant %c"
 
 #: eeschema/tool_sch.cpp:39
+#: eeschema/menubar.cpp:42
 msgid "New schematic project"
 msgstr "Nouveau Projet schématique"
 
@@ -7329,7 +7304,6 @@ msgid "Open schematic project"
 msgstr "Ouvrir un Projet schématique"
 
 #: eeschema/tool_sch.cpp:45
-#: eeschema/menubar.cpp:55
 msgid "Save schematic project"
 msgstr "Sauver le Projet schématique"
 
@@ -7346,7 +7320,6 @@ msgid "Schematic hierarchy navigator"
 msgstr "Navigation dans la hiérarchie"
 
 #: eeschema/tool_sch.cpp:82
-#: eeschema/menubar.cpp:75
 msgid "Print schematic"
 msgstr "Impression des feuilles de schéma"
 
@@ -7383,32 +7356,30 @@ msgid "Hierarchy Push/Pop"
 msgstr "Navigation dans la hiérarchie"
 
 #: eeschema/tool_sch.cpp:156
-#: eeschema/menubar.cpp:206
-msgid "Place the component"
-msgstr "Placer le Composant"
+msgid "Place a component"
+msgstr "Placer un Composant"
 
 #: eeschema/tool_sch.cpp:160
-#: eeschema/menubar.cpp:212
-msgid "Place the power port"
-msgstr "Placer le Symbole Power"
+msgid "Place a power port"
+msgstr "Placer un Symbole Power"
 
 #: eeschema/tool_sch.cpp:165
-#: eeschema/menubar.cpp:218
-msgid "Place the wire"
-msgstr "Place fil"
+msgid "Place a wire"
+msgstr "Placer un fil"
 
 #: eeschema/tool_sch.cpp:169
-#: eeschema/menubar.cpp:227
-msgid "Place bus"
-msgstr "Place bus"
+msgid "Place a bus"
+msgstr "Placer un bus"
 
 #: eeschema/tool_sch.cpp:173
-msgid "Place the wire to bus entry"
-msgstr "Placer des entrées de bus (type fil vers bus)"
+#: eeschema/menubar.cpp:237
+msgid "Place a wire to bus entry"
+msgstr "Placer une Entrée de Bus (type fil vers bus)"
 
 #: eeschema/tool_sch.cpp:177
-msgid "Place bus to bus entry"
-msgstr "Placer entrée de bus (type bus vers bus)"
+#: eeschema/menubar.cpp:247
+msgid "Place a bus to bus entry"
+msgstr "Placer une Entrée de Bus (type bus vers bus)"
 
 #: eeschema/tool_sch.cpp:182
 msgid "Place no connect flag"
@@ -7421,20 +7392,20 @@ msgstr "Place  nom de net"
 
 #: eeschema/tool_sch.cpp:190
 msgid ""
-"Place the global label.\n"
+"Place a global label.\n"
 "Warning: all global labels with the same name are connected in whole hierarchy"
 msgstr ""
-"Placer le label global.\n"
-"Attention: tous les labels globaux de même nom sont connecté dans toute la hiérarchie"
+"Placer un label global.\n"
+"Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
 
 #: eeschema/tool_sch.cpp:195
-#: eeschema/menubar.cpp:285
-msgid "Place junction"
-msgstr "Place jonction"
+msgid "Place a junction"
+msgstr "Placer une jonction"
 
 #: eeschema/tool_sch.cpp:200
-msgid "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
-msgstr "Placer le label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
+#: eeschema/menubar.cpp:297
+msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
+msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
 
 #: eeschema/tool_sch.cpp:205
 msgid "Place hierarchical sheet"
@@ -7571,6 +7542,262 @@ msgstr ""
 msgid "File <%s> not found."
 msgstr "Fichier <%s> non trouvé"
 
+#: eeschema/menubar.cpp:41
+msgid "&New"
+msgstr "&Nouveau"
+
+#: eeschema/menubar.cpp:47
+msgid "&Open"
+msgstr "&Ouvrir "
+
+#: eeschema/menubar.cpp:48
+msgid "Open an existing schematic project"
+msgstr "Ouvrir un projet schématique existant"
+
+#: eeschema/menubar.cpp:54
+msgid "&Save Project"
+msgstr "&Sauver Projet"
+
+#: eeschema/menubar.cpp:55
+msgid "Save all sheets in the schematic project"
+msgstr "Sauver toutes les feuilles du projet schématique"
+
+#: eeschema/menubar.cpp:61
+msgid "&Save"
+msgstr "&Sauver"
+
+#: eeschema/menubar.cpp:62
+msgid "Save only current schematic sheet"
+msgstr "Sauver seulement la feuille active"
+
+#: eeschema/menubar.cpp:67
+msgid "Save &as.."
+msgstr "S&auver Sous..."
+
+#: eeschema/menubar.cpp:68
+msgid "Save current schematic sheet as.."
+msgstr "Sauver la feuille active sous un autre nom"
+
+#: eeschema/menubar.cpp:75
+msgid "Print schematic sheet"
+msgstr "Impression des feuilles de schéma"
+
+#: eeschema/menubar.cpp:82
+msgid "Plot PostScript"
+msgstr "Tracé Postscript"
+
+#: eeschema/menubar.cpp:82
+msgid "Plot schematic sheet in PostScript format"
+msgstr "Tracer les feuilles schématiques en format Postscript"
+
+#: eeschema/menubar.cpp:87
+msgid "Plot HPGL"
+msgstr "Tracé HPGL"
+
+#: eeschema/menubar.cpp:87
+msgid "Plot schematic sheet in HPGL format"
+msgstr "Tracer les feuilles schématiques en format HPGL"
+
+#: eeschema/menubar.cpp:92
+msgid "Plot SVG"
+msgstr "Tracé  SVG"
+
+#: eeschema/menubar.cpp:92
+msgid "Plot schematic sheet in SVG format"
+msgstr "Tracer les feuilles schématiques en format SVG"
+
+#: eeschema/menubar.cpp:99
+msgid "Plot to Clipboard"
+msgstr "Tracé dans Presse papier"
+
+#: eeschema/menubar.cpp:99
+msgid "Export drawings to clipboard"
+msgstr " Export du dessin dans le presse-papier"
+
+#: eeschema/menubar.cpp:106
+msgid "Plot schematic sheet in HPGL, PostScript or SVG format"
+msgstr "Tracer les feuilles schématiques en format HPGL,  POSTSCRIPT ou SVG"
+
+#: eeschema/menubar.cpp:109
+msgid "Quit Eeschema"
+msgstr "Quitter Eeschema"
+
+#: eeschema/menubar.cpp:127
+msgid "&Undo\t"
+msgstr "&Undo\t"
+
+#: eeschema/menubar.cpp:135
+msgid "&Redo\t"
+msgstr "&Redo\t"
+
+#: eeschema/menubar.cpp:154
+msgid "Find"
+msgstr "Chercher"
+
+#: eeschema/menubar.cpp:162
+msgid "Backannotate"
+msgstr "Rétro Annotation"
+
+#: eeschema/menubar.cpp:162
+msgid "Back annotated footprint fields"
+msgstr "Rétroannotation des champs modules"
+
+#: eeschema/menubar.cpp:206
+msgid "&Component"
+msgstr "&Composant"
+
+#: eeschema/menubar.cpp:206
+msgid "Place the component"
+msgstr "Placer le Composant"
+
+#: eeschema/menubar.cpp:212
+msgid "&Power port"
+msgstr "Power Symbole"
+
+#: eeschema/menubar.cpp:212
+msgid "Place the power port"
+msgstr "Placer le Symbole Power"
+
+#: eeschema/menubar.cpp:218
+msgid "&Wire"
+msgstr "&Fil"
+
+#: eeschema/menubar.cpp:218
+msgid "Place the wire"
+msgstr "Place fil"
+
+#: eeschema/menubar.cpp:226
+msgid "&Bus"
+msgstr "&Bus"
+
+#: eeschema/menubar.cpp:227
+msgid "Place bus"
+msgstr "Place bus"
+
+#: eeschema/menubar.cpp:236
+msgid "W&ire to bus entry"
+msgstr "Entrées de bus (type fil vers bus)"
+
+#: eeschema/menubar.cpp:246
+msgid "B&us to bus entry"
+msgstr "Entrées de bus (type bus vers bus)"
+
+#: eeschema/menubar.cpp:256
+msgid "No connect flag"
+msgstr "Symbole de Non Connexion"
+
+#: eeschema/menubar.cpp:257
+msgid "Place a no connect flag"
+msgstr "Placer un Symbole de Non Connexion"
+
+#: eeschema/menubar.cpp:266
+msgid "Net name"
+msgstr "Net Name"
+
+#: eeschema/menubar.cpp:274
+msgid "Global label"
+msgstr "Label Global"
+
+#: eeschema/menubar.cpp:275
+msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy"
+msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
+
+#: eeschema/menubar.cpp:284
+msgid "Place Junction"
+msgstr "Place Jonction"
+
+#: eeschema/menubar.cpp:285
+msgid "Place junction"
+msgstr "Place jonction"
+
+#: eeschema/menubar.cpp:296
+msgid "Hierarchical label"
+msgstr "Label Hiérarchique"
+
+#: eeschema/menubar.cpp:306
+msgid "Hierarchical sheet"
+msgstr "Feuille Hiérrachique"
+
+#: eeschema/menubar.cpp:307
+msgid "Create a hierarchical sheet"
+msgstr "Créer une Feuille Hiérachique"
+
+#: eeschema/menubar.cpp:316
+msgid "Import Hierarchical Label"
+msgstr "Importer Label Hiérarchique"
+
+#: eeschema/menubar.cpp:317
+msgid "Place a pin sheet created by importing a hierarchical label from sheet"
+msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille"
+
+#: eeschema/menubar.cpp:326
+msgid "Add Hierarchical Pin to Sheet"
+msgstr "Ajouter Pins de Hiérarchie dans feuille"
+
+#: eeschema/menubar.cpp:327
+msgid "Place a hierarchical pin to sheet"
+msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie"
+
+#: eeschema/menubar.cpp:338
+msgid "Graphic line or polygon"
+msgstr "Ligne ou polygone graphique"
+
+#: eeschema/menubar.cpp:339
+msgid "Place graphic lines or polygons"
+msgstr "Placer lignes ou  polygones graphiques"
+
+#: eeschema/menubar.cpp:348
+msgid "Graphic text (comment)"
+msgstr "Ttextes graphiques (commentaires)"
+
+#: eeschema/menubar.cpp:359
+msgid "Library preferences"
+msgstr "Préférences pour Librairie"
+
+#: eeschema/menubar.cpp:365
+msgid "Color preferences"
+msgstr "Préférences de couleurs"
+
+#: eeschema/menubar.cpp:371
+msgid "&Options"
+msgstr "&Options"
+
+#: eeschema/menubar.cpp:372
+msgid "General options..."
+msgstr "Options Générales..."
+
+#: eeschema/menubar.cpp:382
+msgid "&Save preferences"
+msgstr "&Sauver Préférences"
+
+#: eeschema/menubar.cpp:386
+msgid "&Read preferences"
+msgstr "&Lire Préférences"
+
+#: eeschema/menubar.cpp:397
+msgid "Open the eeschema manual"
+msgstr "Ouvrir la documentation de eeschema"
+
+#: eeschema/menubar.cpp:402
+msgid "&About"
+msgstr "&Au Sujet de"
+
+#: eeschema/menubar.cpp:402
+msgid "About eeschema schematic designer"
+msgstr "Au sujet de Eeschema (outil de conception schématique)"
+
+#: eeschema/menubar.cpp:408
+msgid "&Edit"
+msgstr "&Editer"
+
+#: eeschema/menubar.cpp:409
+msgid "&View"
+msgstr "&Voir"
+
+#: eeschema/menubar.cpp:410
+msgid "&Place"
+msgstr "&Placer"
+
 #: eeschema/component_class.cpp:131
 msgid "Datasheet"
 msgstr "Documentation"
@@ -7726,249 +7953,31 @@ msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enreg
 msgid "Done Loading "
 msgstr "Chargement terminé"
 
-#: eeschema/menubar.cpp:41
-msgid "&New"
-msgstr "&Nouveau"
+#: eeschema/symbedit.cpp:52
+msgid "Import symbol drawings:"
+msgstr "Importer les symboles:"
 
-#: eeschema/menubar.cpp:42
-msgid "New schematic"
-msgstr "Nouvelle schématique"
+#: eeschema/symbedit.cpp:74
+#, c-format
+msgid "Failed to open Symbol File <%s>"
+msgstr "Ne peut pas ouvrir fichier <%s>"
 
-#: eeschema/menubar.cpp:47
-msgid "&Open"
-msgstr "&Ouvrir "
+#: eeschema/symbedit.cpp:87
+msgid "Warning: more than 1 part in Symbol File"
+msgstr "Attention: plus de 1élément dans le fichier symbole"
 
-#: eeschema/menubar.cpp:48
-msgid "Open a schematic"
-msgstr "Ouvrir un Projet schématique"
+#: eeschema/symbedit.cpp:92
+msgid "Symbol File is void"
+msgstr "Fichier Symbole vide"
 
-#: eeschema/menubar.cpp:54
-msgid "&Save"
-msgstr "&Sauver"
+#: eeschema/symbedit.cpp:150
+msgid "Export symbol drawings:"
+msgstr "Exporter le symbole"
 
-#: eeschema/menubar.cpp:61
-msgid "Save &Current sheet"
-msgstr "Sauver &Feuille active"
-
-#: eeschema/menubar.cpp:62
-msgid "Save current sheet only"
-msgstr "Sauver la feuille active uniquement"
-
-#: eeschema/menubar.cpp:67
-msgid "Save Current sheet &as.."
-msgstr "Sauver la feuille &active sous.."
-
-#: eeschema/menubar.cpp:68
-msgid "Save current sheet as.."
-msgstr "Sauver la feuille active sous un autre nom"
-
-#: eeschema/menubar.cpp:82
-msgid "Plot PostScript"
-msgstr "Tracé Postscript"
-
-#: eeschema/menubar.cpp:82
-msgid "Plot schematic in PostScript format"
-msgstr "Générer un tracé en format Postscript"
-
-#: eeschema/menubar.cpp:87
-msgid "Plot HPGL"
-msgstr "Tracé HPGL"
-
-#: eeschema/menubar.cpp:87
-msgid "Plot schematic in HPGL format"
-msgstr "Générer un tracé en format HPGL"
-
-#: eeschema/menubar.cpp:92
-msgid "Plot SVG"
-msgstr "Tracé  SVG"
-
-#: eeschema/menubar.cpp:92
-msgid "Plot schematic in SVG format"
-msgstr "Générer un tracé en format SVG"
-
-#: eeschema/menubar.cpp:99
-msgid "Plot to Clipboard"
-msgstr "Tracé dans Presse papier"
-
-#: eeschema/menubar.cpp:99
-msgid "Export drawings to clipboard"
-msgstr " Export du dessin dans le presse-papier"
-
-#: eeschema/menubar.cpp:106
-msgid "Plot schematic in HPGL, PostScript or SVG format"
-msgstr "Tracer schématique ( format HPGL,  POSTSCRIPT ou SVG)"
-
-#: eeschema/menubar.cpp:109
-msgid "Quit Eeschema"
-msgstr "Quitter Eeschema"
-
-#: eeschema/menubar.cpp:127
-msgid "&Undo\t"
-msgstr "&Undo\t"
-
-#: eeschema/menubar.cpp:135
-msgid "&Redo\t"
-msgstr "&Redo\t"
-
-#: eeschema/menubar.cpp:154
-msgid "Find"
-msgstr "Chercher"
-
-#: eeschema/menubar.cpp:162
-msgid "Backannotate"
-msgstr "Rétro Annotation"
-
-#: eeschema/menubar.cpp:162
-msgid "Back annotated footprint fields"
-msgstr "Rétroannotation des champs modules"
-
-#: eeschema/menubar.cpp:206
-msgid "&Component"
-msgstr "&Composant"
-
-#: eeschema/menubar.cpp:212
-msgid "&Power port"
-msgstr "Power Symbole"
-
-#: eeschema/menubar.cpp:218
-msgid "&Wire"
-msgstr "&Fil"
-
-#: eeschema/menubar.cpp:226
-msgid "&Bus"
-msgstr "&Bus"
-
-#: eeschema/menubar.cpp:236
-msgid "W&ire to bus entry"
-msgstr "Entrées de bus (type fil vers bus)"
-
-#: eeschema/menubar.cpp:237
-msgid "Place a wire to bus entry"
-msgstr "Placer une Entrée de Bus (type fil vers bus)"
-
-#: eeschema/menubar.cpp:246
-msgid "B&us to bus entry"
-msgstr "Entrées de bus (type bus vers bus)"
-
-#: eeschema/menubar.cpp:247
-msgid "Place a bus to bus entry"
-msgstr "Placer une Entrée de Bus (type bus vers bus)"
-
-#: eeschema/menubar.cpp:256
-msgid "No connect flag"
-msgstr "Symbole de Non Connexion"
-
-#: eeschema/menubar.cpp:257
-msgid "Place a no connect flag"
-msgstr "Placer un Symbole de Non Connexion"
-
-#: eeschema/menubar.cpp:266
-msgid "Net name"
-msgstr "Net Name"
-
-#: eeschema/menubar.cpp:274
-msgid "Global label"
-msgstr "Label Global"
-
-#: eeschema/menubar.cpp:275
-msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy"
-msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
-
-#: eeschema/menubar.cpp:284
-msgid "Place Junction"
-msgstr "Place Jonction"
-
-#: eeschema/menubar.cpp:296
-msgid "Hierarchical label"
-msgstr "Label Hiérarchique"
-
-#: eeschema/menubar.cpp:297
-msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
-msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
-
-#: eeschema/menubar.cpp:306
-msgid "Hierarchical sheet"
-msgstr "Feuille Hiérrachique"
-
-#: eeschema/menubar.cpp:307
-msgid "Create a hierarchical sheet"
-msgstr "Créer une Feuille Hiérachique"
-
-#: eeschema/menubar.cpp:316
-msgid "Import Hierarchical Label"
-msgstr "Importer Label Hiérarchique"
-
-#: eeschema/menubar.cpp:317
-msgid "Place a pin sheet created by importing a hierarchical label from sheet"
-msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille"
-
-#: eeschema/menubar.cpp:326
-msgid "Add Hierarchical Pin to Sheet"
-msgstr "Ajouter Pins de Hiérarchie dans feuille"
-
-#: eeschema/menubar.cpp:327
-msgid "Place a hierarchical pin to sheet"
-msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie"
-
-#: eeschema/menubar.cpp:338
-msgid "Graphic line or polygon"
-msgstr "Ligne ou polygone graphique"
-
-#: eeschema/menubar.cpp:339
-msgid "Place graphic lines or polygons"
-msgstr "Placer lignes ou  polygones graphiques"
-
-#: eeschema/menubar.cpp:348
-msgid "Graphic text (comment)"
-msgstr "Ttextes graphiques (commentaires)"
-
-#: eeschema/menubar.cpp:359
-msgid "Library preferences"
-msgstr "Préférences pour Librairie"
-
-#: eeschema/menubar.cpp:365
-msgid "Color preferences"
-msgstr "Préférences de couleurs"
-
-#: eeschema/menubar.cpp:371
-msgid "&Options"
-msgstr "&Options"
-
-#: eeschema/menubar.cpp:372
-msgid "General options..."
-msgstr "Options Générales..."
-
-#: eeschema/menubar.cpp:382
-msgid "&Save preferences"
-msgstr "&Sauver Préférences"
-
-#: eeschema/menubar.cpp:386
-msgid "&Read preferences"
-msgstr "&Lire Préférences"
-
-#: eeschema/menubar.cpp:397
-msgid "Open the eeschema manual"
-msgstr "Ouvrir la documentation de eeschema"
-
-#: eeschema/menubar.cpp:402
-msgid "&About"
-msgstr "&Au Sujet de"
-
-#: eeschema/menubar.cpp:402
-msgid "About eeschema schematic designer"
-msgstr "Au sujet de Eeschema (outil de conception schématique)"
-
-#: eeschema/menubar.cpp:408
-msgid "&Edit"
-msgstr "&Editer"
-
-#: eeschema/menubar.cpp:409
-msgid "&View"
-msgstr "&Voir"
-
-#: eeschema/menubar.cpp:410
-msgid "&Place"
-msgstr "&Placer"
+#: eeschema/symbedit.cpp:170
+#, c-format
+msgid "Save Symbol in [%s]"
+msgstr "Symbole sauvé en  [%s]"
 
 #: eeschema/edit_component_in_schematic.cpp:331
 msgid "No Component Name!"
@@ -8887,12 +8896,12 @@ msgid "Open an existing project"
 msgstr "Ouvrir un projet  existant"
 
 #: kicad/buildmnu.cpp:140
-#: kicad/buildmnu.cpp:383
+#: kicad/buildmnu.cpp:379
 msgid "Start a new project"
 msgstr "Créer un nouveau projet"
 
 #: kicad/buildmnu.cpp:149
-#: kicad/buildmnu.cpp:402
+#: kicad/buildmnu.cpp:398
 msgid "Save current project"
 msgstr "Sauver le projet courrant"
 
@@ -8917,86 +8926,90 @@ msgid "Quit kicad"
 msgstr "Quitter KiCad"
 
 #: kicad/buildmnu.cpp:209
-msgid "&Editor"
-msgstr "&Editeur"
+msgid "Text E&ditor"
+msgstr "&Editeur de Texte"
 
 #: kicad/buildmnu.cpp:210
-msgid "Text editor"
-msgstr "Editeur de Texte"
+msgid "Open prefered text editor"
+msgstr "Lancer l'éditeur de texte préféré"
 
 #: kicad/buildmnu.cpp:218
 msgid "&Browse Files"
 msgstr "&Examen Fichiers"
 
 #: kicad/buildmnu.cpp:219
-msgid "Read or edit files"
-msgstr "Lire ou Editer fichiers"
+msgid "Read or edit files with text editor"
+msgstr "Lire ou éditer des fichiers avec l'éditeur de texte"
 
 #: kicad/buildmnu.cpp:231
-msgid "&Select Editor"
-msgstr "&Sélection Editeur"
-
-#: kicad/buildmnu.cpp:232
-msgid "Select your prefered editor for file browsing"
-msgstr "Choisir son  pour examen de fichiers"
-
-#: kicad/buildmnu.cpp:244
 msgid "Fonts"
 msgstr "Fonte"
 
-#: kicad/buildmnu.cpp:245
+#: kicad/buildmnu.cpp:232
 msgid "Font preferences"
 msgstr "Préférences de fontes"
 
-#: kicad/buildmnu.cpp:259
+#: kicad/buildmnu.cpp:240
+msgid "&Text Editor"
+msgstr "&Editeur de Texte"
+
+#: kicad/buildmnu.cpp:241
+msgid "Select your prefered text editor"
+msgstr "Choisir son  éditeur de texte préféré"
+
+#: kicad/buildmnu.cpp:255
 msgid "Default PDF Viewer"
 msgstr "Visualisateur PDF par défaut"
 
-#: kicad/buildmnu.cpp:260
+#: kicad/buildmnu.cpp:256
 msgid "Use the default (system) PDF viewer used to browse datasheets"
 msgstr "Utiliser le visualisateur PDF par défaut pour afficher les documentations"
 
-#: kicad/buildmnu.cpp:271
+#: kicad/buildmnu.cpp:267
 msgid "Favourite PDF Viewer"
 msgstr "Visualisateur PDF préféré"
 
-#: kicad/buildmnu.cpp:272
+#: kicad/buildmnu.cpp:268
 msgid "Use your favourite PDF viewer used to browse datasheets"
 msgstr "Utiliser le visualisateur PDF préférét pour afficher les documentations"
 
-#: kicad/buildmnu.cpp:283
+#: kicad/buildmnu.cpp:279
 msgid "Select Pdf Viewer"
 msgstr "Sélection Visualisateur PDF"
 
-#: kicad/buildmnu.cpp:284
+#: kicad/buildmnu.cpp:280
 msgid "Select your favourite PDF viewer used to browse datasheets"
 msgstr "Sélectionner le visualisateur PDF favori pour afficher les documents"
 
-#: kicad/buildmnu.cpp:290
-msgid "Pdf Browser"
+#: kicad/buildmnu.cpp:286
+msgid "Pdf Viewer"
 msgstr "Visualisateur PDF"
 
-#: kicad/buildmnu.cpp:306
+#: kicad/buildmnu.cpp:287
+msgid "Pdf viewer preferences"
+msgstr "Préférences pour le visualisateur PDF"
+
+#: kicad/buildmnu.cpp:302
 msgid "Open the kicad manual"
 msgstr "Ouvrir la documentation de kicad"
 
-#: kicad/buildmnu.cpp:315
+#: kicad/buildmnu.cpp:311
 msgid "About kicad project manager"
 msgstr "Au sujet de Kicad, gestionnaire de projet"
 
-#: kicad/buildmnu.cpp:322
+#: kicad/buildmnu.cpp:318
 msgid "&Browse"
 msgstr "&Examiner"
 
-#: kicad/buildmnu.cpp:392
+#: kicad/buildmnu.cpp:388
 msgid "Load existing project"
 msgstr "Ouvrir un projet  existant"
 
-#: kicad/buildmnu.cpp:415
+#: kicad/buildmnu.cpp:411
 msgid "Archive all project files"
 msgstr "Archiver les fichiers du projet"
 
-#: kicad/buildmnu.cpp:428
+#: kicad/buildmnu.cpp:424
 msgid "Refresh project tree"
 msgstr "Mettre a jour l'affichage du projet"
 
@@ -9153,6 +9166,7 @@ msgid "Layer modified,  Continue ?"
 msgstr "Couche modifiée,  Continuer ?"
 
 #: gerbview/gerbview_config.cpp:147
+#: gerbview/process_config.cpp:117
 msgid "Save config file"
 msgstr "Sauver config"
 
@@ -9713,7 +9727,7 @@ msgstr "Langage"
 
 #: common/edaappl.cpp:605
 msgid "Select application language (only for testing!)"
-msgstr ""
+msgstr "Choisir le langage (seulement pour tests!)"
 
 #: common/common.cpp:105
 msgid " (\"):"
@@ -10412,10 +10426,6 @@ msgstr "Afficher Modules Cmp"
 msgid "Show Modules Cu"
 msgstr "Afficher Modules Cu"
 
-#: pcbnew/dialog_pad_edit.h:62
-msgid "Pad properties"
-msgstr "Propriétés des Pads"
-
 #: pcbnew/dialog_copper_zones_base.h:99
 msgid "Fill Zones Options"
 msgstr "Options de Remplissage de Zone"
@@ -10424,6 +10434,10 @@ msgstr "Options de Remplissage de Zone"
 msgid "Non Copper Zones Properties"
 msgstr "Propriétés des Zones sur couches non cuivre"
 
+#: pcbnew/dialog_pad_properties_base.h:90
+msgid "Pad Properties"
+msgstr "Propriétés du Pad"
+
 #: pcbnew/dialog_gendrill.h:50
 msgid "Drill Files Generation"
 msgstr "Génération Fichiers de Perçagee"
@@ -10736,6 +10750,48 @@ msgstr "Imprimer"
 msgid "Create SVG file"
 msgstr "Créer Fichier SVG"
 
+#~ msgid "Comp layer"
+#~ msgstr "Couche Cmp"
+#~ msgid "New schematic sheet"
+#~ msgstr "Nouvelle feuille schématique"
+
+#, fuzzy
+#~ msgid "Open a schematic sheet"
+#~ msgstr "Ouvrir un Projet schématique"
+#~ msgid "Save project"
+#~ msgstr "Sauver projet"
+#~ msgid "Save &Current sheet"
+#~ msgstr "Sauver &Feuille active"
+#~ msgid "Save current sheet only"
+#~ msgstr "Sauver la feuille active uniquement"
+#~ msgid "Save Current sheet &as.."
+#~ msgstr "Sauver la feuille &active sous.."
+#~ msgid "&Editor"
+#~ msgstr "&Editeur"
+#~ msgid "Text editor"
+#~ msgstr "Editeur de Texte"
+#~ msgid "&Select Editor"
+#~ msgstr "&Sélection Editeur"
+#~ msgid "Pdf Browser"
+#~ msgstr "Visualisateur PDF"
+#~ msgid "Place the wire to bus entry"
+#~ msgstr "Placer des entrées de bus (type fil vers bus)"
+#~ msgid "Place bus to bus entry"
+#~ msgstr "Placer entrée de bus (type bus vers bus)"
+#~ msgid ""
+#~ "Place the global label.\n"
+#~ "Warning: all global labels with the same name are connected in whole "
+#~ "hierarchy"
+#~ msgstr ""
+#~ "Placer un label global.\n"
+#~ "Attention: tous les labels globaux de même nom sont connecté dans toute "
+#~ "la hiérarchie"
+#~ msgid ""
+#~ "Place the hierarchical label. This label will be seen as a pin sheet in "
+#~ "the sheet symbol"
+#~ msgstr ""
+#~ "Placer un label hiérachique. Ce label sera vu comme une pin dans la "
+#~ "feuille mère symbole"
 #~ msgid "Print on current printer"
 #~ msgstr "Imprimer sur l'imprimante par défaut"
 #~ msgid "Plot HPGL, PostScript, SVG"
@@ -10746,8 +10802,6 @@ msgstr "Créer Fichier SVG"
 #~ msgstr "&Ouvrir Projet"
 #~ msgid "&New Project"
 #~ msgstr "&Nouveau Projet"
-#~ msgid "&Save Project"
-#~ msgstr "&Sauver Projet"
 #~ msgid "&About Kicad"
 #~ msgstr "&Au Sujet de Kicad"
 #~ msgid "&Projects"
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index a6bda88d3d..179826118a 100644
--- a/pcbnew/CMakeLists.txt
+++ b/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
diff --git a/pcbnew/dialog_copper_zones.cpp b/pcbnew/dialog_copper_zones.cpp
index f1b906c05c..4bd0562f47 100644
--- a/pcbnew/dialog_copper_zones.cpp
+++ b/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:
diff --git a/pcbnew/dialog_copper_zones.h b/pcbnew/dialog_copper_zones.h
index bdd2cfd512..6ed479388a 100644
--- a/pcbnew/dialog_copper_zones.h
+++ b/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
diff --git a/pcbnew/dialog_module_edit.rc b/pcbnew/dialog_module_edit.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/pcbnew/dialog_module_edit.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/pcbnew/dialog_pad_edit.cpp b/pcbnew/dialog_pad_edit.cpp
deleted file mode 100644
index 731306773c..0000000000
--- a/pcbnew/dialog_pad_edit.cpp
+++ /dev/null
@@ -1,409 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_pad_edit.cpp
-// 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
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog_pad_edit.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
-#include "dialog_pad_edit.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * WinEDA_PadPropertiesFrame type definition
- */
-
-IMPLEMENT_DYNAMIC_CLASS( WinEDA_PadPropertiesFrame, wxDialog )
-
-/*!
- * WinEDA_PadPropertiesFrame event table definition
- */
-
-BEGIN_EVENT_TABLE( WinEDA_PadPropertiesFrame, wxDialog )
-
-////@begin WinEDA_PadPropertiesFrame event table entries
-    EVT_RADIOBOX( ID_RADIOBOX_DRILL_SHAPE, WinEDA_PadPropertiesFrame::OnRadioboxDrillShapeSelected )
-
-    EVT_RADIOBOX( ID_LISTBOX_ORIENT_PAD, WinEDA_PadPropertiesFrame::OnListboxOrientPadSelected )
-
-    EVT_RADIOBOX( ID_LISTBOX_SHAPE_PAD, WinEDA_PadPropertiesFrame::OnListboxShapePadSelected )
-
-    EVT_RADIOBOX( ID_LISTBOX_TYPE_PAD, WinEDA_PadPropertiesFrame::OnListboxTypePadSelected )
-
-    EVT_BUTTON( wxID_OK, WinEDA_PadPropertiesFrame::OnOkClick )
-
-    EVT_BUTTON( wxID_CANCEL, WinEDA_PadPropertiesFrame::OnCancelClick )
-
-////@end WinEDA_PadPropertiesFrame event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * WinEDA_PadPropertiesFrame constructors
- */
-
-WinEDA_PadPropertiesFrame::WinEDA_PadPropertiesFrame( )
-{
-}
-
-WinEDA_PadPropertiesFrame::WinEDA_PadPropertiesFrame( WinEDA_BasePcbFrame* parent,
-            D_PAD * Pad,wxDC * DC,
-            wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-	m_Parent = parent;
-	m_DC = DC;
-	m_Module = NULL;
-	CurrentPad = Pad;
-
-	if ( CurrentPad )
-	{
-		Current_PadNetName = CurrentPad->m_Netname;
-		g_Current_PadName = CurrentPad->ReturnStringPadName();
-		m_Module = (MODULE*) CurrentPad->m_Parent;
-	}
-
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * WinEDA_PadPropertiesFrame creator
- */
-
-bool WinEDA_PadPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin WinEDA_PadPropertiesFrame member initialisation
-    m_LeftBoxSizer = NULL;
-    m_PadNumCtrl = NULL;
-    m_PadNetNameCtrl = NULL;
-    m_PadPositionBoxSizer = NULL;
-    m_DrillShapeBoxSizer = NULL;
-    m_DrillShapeCtrl = NULL;
-    m_PadOptSizer = NULL;
-    m_PadOrient = NULL;
-    m_PadShape = NULL;
-    m_PadType = NULL;
-    m_PadLayerCu = NULL;
-    m_PadLayerCmp = NULL;
-    m_PadLayerAdhCmp = NULL;
-    m_PadLayerAdhCu = NULL;
-    m_PadLayerPateCmp = NULL;
-    m_PadLayerPateCu = NULL;
-    m_PadLayerSilkCmp = NULL;
-    m_PadLayerSilkCu = NULL;
-    m_PadLayerMaskCmp = NULL;
-    m_PadLayerMaskCu = NULL;
-    m_PadLayerECO1 = NULL;
-    m_PadLayerECO2 = NULL;
-    m_PadLayerDraft = NULL;
-////@end WinEDA_PadPropertiesFrame member initialisation
-
-////@begin WinEDA_PadPropertiesFrame creation
-    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
-    wxDialog::Create( parent, id, caption, pos, size, style );
-
-    CreateControls();
-    if (GetSizer())
-    {
-        GetSizer()->SetSizeHints(this);
-    }
-    Centre();
-////@end WinEDA_PadPropertiesFrame creation
-    return true;
-}
-
-/*!
- * Control creation for WinEDA_PadPropertiesFrame
- */
-
-void WinEDA_PadPropertiesFrame::CreateControls()
-{
-	SetFont(*g_DialogFont);
-////@begin WinEDA_PadPropertiesFrame content construction
-    // Generated by DialogBlocks, 30/07/2008 22:05:19 (unregistered)
-
-    WinEDA_PadPropertiesFrame* itemDialog1 = this;
-
-    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL);
-    itemDialog1->SetSizer(itemBoxSizer2);
-
-    m_LeftBoxSizer = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(m_LeftBoxSizer, 0, wxGROW|wxALL, 5);
-
-    wxStaticText* itemStaticText4 = new wxStaticText( itemDialog1, wxID_STATIC, _("Pad Num :"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LeftBoxSizer->Add(itemStaticText4, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-
-    m_PadNumCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_PADNUM, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LeftBoxSizer->Add(m_PadNumCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-    wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("Pad Net Name :"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LeftBoxSizer->Add(itemStaticText6, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-
-    m_PadNetNameCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_NETNAME, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LeftBoxSizer->Add(m_PadNetNameCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-    m_PadPositionBoxSizer = new wxBoxSizer(wxVERTICAL);
-    m_LeftBoxSizer->Add(m_PadPositionBoxSizer, 0, wxGROW|wxTOP, 5);
-
-    m_DrillShapeBoxSizer = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(m_DrillShapeBoxSizer, 0, wxGROW|wxTOP, 5);
-
-    wxArrayString m_DrillShapeCtrlStrings;
-    m_DrillShapeCtrlStrings.Add(_("Circle"));
-    m_DrillShapeCtrlStrings.Add(_("Oval"));
-    m_DrillShapeCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX_DRILL_SHAPE, _("Drill Shape:"), wxDefaultPosition, wxDefaultSize, m_DrillShapeCtrlStrings, 1, wxRA_SPECIFY_COLS );
-    m_DrillShapeCtrl->SetSelection(0);
-    m_DrillShapeBoxSizer->Add(m_DrillShapeCtrl, 0, wxGROW|wxALL, 5);
-
-    m_PadOptSizer = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(m_PadOptSizer, 0, wxGROW|wxALL, 5);
-
-    wxArrayString m_PadOrientStrings;
-    m_PadOrientStrings.Add(_("0"));
-    m_PadOrientStrings.Add(_("90"));
-    m_PadOrientStrings.Add(_("-90"));
-    m_PadOrientStrings.Add(_("180"));
-    m_PadOrientStrings.Add(_("User"));
-    m_PadOrient = new wxRadioBox( itemDialog1, ID_LISTBOX_ORIENT_PAD, _("Pad Orient:"), wxDefaultPosition, wxDefaultSize, m_PadOrientStrings, 1, wxRA_SPECIFY_COLS );
-    m_PadOrient->SetSelection(0);
-    m_PadOptSizer->Add(m_PadOrient, 0, wxGROW|wxALL, 5);
-
-    wxArrayString m_PadShapeStrings;
-    m_PadShapeStrings.Add(_("Circle"));
-    m_PadShapeStrings.Add(_("Oval"));
-    m_PadShapeStrings.Add(_("Rect"));
-    m_PadShapeStrings.Add(_("Trapezoidal"));
-    m_PadShape = new wxRadioBox( itemDialog1, ID_LISTBOX_SHAPE_PAD, _("Pad Shape:"), wxDefaultPosition, wxDefaultSize, m_PadShapeStrings, 1, wxRA_SPECIFY_COLS );
-    m_PadShape->SetSelection(0);
-    m_PadOptSizer->Add(m_PadShape, 0, wxGROW|wxALL, 5);
-
-    wxArrayString m_PadTypeStrings;
-    m_PadTypeStrings.Add(_("Standard"));
-    m_PadTypeStrings.Add(_("SMD"));
-    m_PadTypeStrings.Add(_("Conn"));
-    m_PadType = new wxRadioBox( itemDialog1, ID_LISTBOX_TYPE_PAD, _("Pad Type:"), wxDefaultPosition, wxDefaultSize, m_PadTypeStrings, 1, wxRA_SPECIFY_COLS );
-    m_PadType->SetSelection(0);
-    m_PadOptSizer->Add(m_PadType, 0, wxGROW|wxALL, 5);
-
-    wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(itemBoxSizer15, 0, wxGROW|wxALL, 5);
-
-    wxButton* itemButton16 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton16->SetForegroundColour(wxColour(204, 0, 0));
-    itemBoxSizer15->Add(itemButton16, 0, wxGROW|wxALL, 5);
-
-    wxButton* itemButton17 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton17->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer15->Add(itemButton17, 0, wxGROW|wxALL, 5);
-
-    wxStaticBox* itemStaticBoxSizer18Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Layers:"));
-    wxStaticBoxSizer* itemStaticBoxSizer18 = new wxStaticBoxSizer(itemStaticBoxSizer18Static, wxVERTICAL);
-    itemBoxSizer15->Add(itemStaticBoxSizer18, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerCu = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Copper layer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerCu->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerCu, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
-
-    m_PadLayerCmp = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Comp layer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerCmp->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerCmp, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-    itemStaticBoxSizer18->Add(5, 5, 0, wxGROW|wxALL, 5);
-
-    m_PadLayerAdhCmp = new wxCheckBox( itemDialog1, ID_CHECKBOX2, _("Adhesive Cmp"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerAdhCmp->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerAdhCmp, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
-
-    m_PadLayerAdhCu = new wxCheckBox( itemDialog1, ID_CHECKBOX3, _("Adhesive Copper"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerAdhCu->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerAdhCu, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerPateCmp = new wxCheckBox( itemDialog1, ID_CHECKBOX4, _("Solder paste Cmp"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerPateCmp->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerPateCmp, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerPateCu = new wxCheckBox( itemDialog1, ID_CHECKBOX5, _("Solder paste Copper"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerPateCu->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerPateCu, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerSilkCmp = new wxCheckBox( itemDialog1, ID_CHECKBOX6, _("Silkscreen Cmp"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerSilkCmp->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerSilkCmp, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerSilkCu = new wxCheckBox( itemDialog1, ID_CHECKBOX7, _("Silkscreen Copper"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerSilkCu->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerSilkCu, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerMaskCmp = new wxCheckBox( itemDialog1, ID_CHECKBOX8, _("Solder mask Cmp"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerMaskCmp->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerMaskCmp, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerMaskCu = new wxCheckBox( itemDialog1, ID_CHECKBOX9, _("Solder mask Copper"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerMaskCu->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerMaskCu, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerECO1 = new wxCheckBox( itemDialog1, ID_CHECKBOX10, _("E.C.O.1 layer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerECO1->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerECO1, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerECO2 = new wxCheckBox( itemDialog1, ID_CHECKBOX11, _("E.C.O.2 layer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerECO2->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerECO2, 0, wxGROW|wxLEFT|wxRIGHT, 5);
-
-    m_PadLayerDraft = new wxCheckBox( itemDialog1, ID_CHECKBOX12, _("Draft layer"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_PadLayerDraft->SetValue(false);
-    itemStaticBoxSizer18->Add(m_PadLayerDraft, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
-
-////@end WinEDA_PadPropertiesFrame content construction
-
-	SetOthersControls();
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool WinEDA_PadPropertiesFrame::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap WinEDA_PadPropertiesFrame::GetBitmapResource( const wxString& name )
-{
-    // Bitmap retrieval
-////@begin WinEDA_PadPropertiesFrame bitmap retrieval
-    wxUnusedVar(name);
-    return wxNullBitmap;
-////@end WinEDA_PadPropertiesFrame bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon WinEDA_PadPropertiesFrame::GetIconResource( const wxString& name )
-{
-    // Icon retrieval
-////@begin WinEDA_PadPropertiesFrame icon retrieval
-    wxUnusedVar(name);
-    return wxNullIcon;
-////@end WinEDA_PadPropertiesFrame icon retrieval
-}
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
- */
-
-void WinEDA_PadPropertiesFrame::OnOkClick( wxCommandEvent& event )
-{
-	PadPropertiesAccept(event);
-}
-
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
- */
-
-void WinEDA_PadPropertiesFrame::OnCancelClick( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_PadPropertiesFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_PadPropertiesFrame.
-}
-
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_ORIENT_PAD
- */
-
-void WinEDA_PadPropertiesFrame::OnListboxOrientPadSelected( wxCommandEvent& event )
-{
-	PadOrientEvent(event);
-}
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_SHAPE_PAD
- */
-
-void WinEDA_PadPropertiesFrame::OnListboxShapePadSelected( wxCommandEvent& event )
-{
-	switch (m_PadShape->GetSelection() )
-	{
-		case 0: //CIRCLE:
-			m_PadDeltaSizeCtrl->Enable(FALSE, FALSE);
-			m_PadSizeCtrl->Enable(TRUE, FALSE);
-			break;
-
-		case 1: //OVALE:
-			m_PadDeltaSizeCtrl->Enable(FALSE, FALSE);
-			m_PadSizeCtrl->Enable(TRUE, TRUE);
-			break;
-
-		case 2: // PAD_RECT:
-			m_PadDeltaSizeCtrl->Enable(FALSE, FALSE);
-			m_PadSizeCtrl->Enable(TRUE, TRUE);
-			break;
-
-		case 3: //TRAPEZE:
-			m_PadDeltaSizeCtrl->Enable(TRUE, TRUE);
-			m_PadSizeCtrl->Enable(TRUE, TRUE);
-			break;
-	}
-}
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_LISTBOX_TYPE_PAD
- */
-
-void WinEDA_PadPropertiesFrame::OnListboxTypePadSelected( wxCommandEvent& event )
-{
-	PadTypeSelected();
-}
-
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX_DRILL_SHAPE
- */
-
-void WinEDA_PadPropertiesFrame::OnRadioboxDrillShapeSelected( wxCommandEvent& event )
-{
-	switch ( m_DrillShapeCtrl->GetSelection() )
-	{
-		case 0: //CIRCLE:
-			m_PadDrillCtrl->Enable(TRUE,FALSE);
-			break;
-
-		case 1: //OVALE:
-			m_PadDrillCtrl->Enable(TRUE, TRUE);
-			break;
-	}
-}
-
-
diff --git a/pcbnew/dialog_pad_edit.h b/pcbnew/dialog_pad_edit.h
deleted file mode 100644
index 0e3d117fce..0000000000
--- a/pcbnew/dialog_pad_edit.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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_
diff --git a/pcbnew/dialog_pad_edit.pjd b/pcbnew/dialog_pad_edit.pjd
deleted file mode 100644
index b1ccb5599d..0000000000
--- a/pcbnew/dialog_pad_edit.pjd
+++ /dev/null
@@ -1,2061 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">
-  <header>
-    <long name="name_counter">0</long>
-    <string name="html_path">""</string>
-    <string name="title">""</string>
-    <string name="author">""</string>
-    <string name="description">""</string>
-    <string name="xrc_filename">""</string>
-    <bool name="convert_images_to_xpm">0</bool>
-    <bool name="inline_images">0</bool>
-    <bool name="generate_cpp_for_xrc">0</bool>
-    <long name="working_mode">1</long>
-    <bool name="use_help_text_for_tooltips">1</bool>
-    <bool name="translate_strings">1</bool>
-    <bool name="make_unicode_strings">1</bool>
-    <bool name="extract_strings">0</bool>
-    <string name="user_name">"jean-pierre Charras"</string>
-    <string name="copyright_string">"License GNU"</string>
-    <string name="resource_prefix">""</string>
-    <bool name="use_two_step_construction">0</bool>
-    <bool name="use_enums">0</bool>
-    <string name="current_platform">"&lt;All platforms&gt;"</string>
-    <string name="target_wx_version">"&lt;Any&gt;"</string>
-    <string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %HEADER-FILENAME%
-// Purpose:     
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_implementation_comment">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %SOURCE-FILENAME%
-// Purpose:     
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %SYMBOLS-FILENAME%
-// Purpose:     Symbols file
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_header_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
-#pragma interface &quot;%HEADER-FILENAME%&quot;
-#endif
-
-"</string>
-    <string name="cpp_implementation_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
-#pragma implementation &quot;%HEADER-FILENAME%&quot;
-#endif
-
-// For compilers that support precompilation, includes &quot;wx/wx.h&quot;.
-#include &quot;wx/wxprec.h&quot;
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include &quot;wx/wx.h&quot;
-#endif
-
-"</string>
-    <string name="cpp_function_declaration_comment">"	/// %BODY%
-"</string>
-    <string name="cpp_function_implementation_comment">"
-/*!
- * %BODY%
- */
-
-"</string>
-    <string name="resource_file_header">"app_resources.h"</string>
-    <string name="resource_file_implementation">"app_resources.cpp"</string>
-    <string name="resource_class_name">"AppResources"</string>
-    <string name="app_file_header">"app.h"</string>
-    <string name="app_file_implementation">"app.cpp"</string>
-    <string name="app_class_name">"Application"</string>
-    <bool name="generate_app_class">0</bool>
-    <string name="external_symbol_filenames">""</string>
-    <string name="configuration">"&lt;None&gt;"</string>
-    <string name="source_encoding">"&lt;System&gt;"</string>
-    <string name="xrc_encoding">"utf-8"</string>
-    <string name="project_encoding">"&lt;System&gt;"</string>
-    <string name="resource_archive">""</string>
-    <long name="text_file_type">0</long>
-    <bool name="use_tabs">0</bool>
-    <long name="indent_size">4</long>
-    <string name="whitespace_after_return_type">" "</string>
-    <string name="resource_xrc_cpp">""</string>
-    <bool name="use_resource_archive">0</bool>
-    <bool name="use_generated_xrc_cpp">0</bool>
-    <bool name="always_generate_xrc">1</bool>
-    <bool name="use_id_name_for_name">0</bool>
-    <bool name="archive_xrc_files">1</bool>
-    <bool name="archive_image_files">1</bool>
-    <bool name="archive_all_image_files">0</bool>
-    <bool name="xrc_retain_relative_paths">1</bool>
-    <bool name="xrc_generate_id_tags">0</bool>
-  </header>
-  <data>
-    <document>
-      <string name="title">""</string>
-      <string name="type">"data-document"</string>
-      <string name="filename">""</string>
-      <string name="icon-name">""</string>
-      <long name="is-transient">0</long>
-      <long name="owns-file">1</long>
-      <long name="title-mode">0</long>
-      <long name="locked">0</long>
-      <document>
-        <string name="title">"Configurations"</string>
-        <string name="type">"config-data-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">""</string>
-        <long name="is-transient">0</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">0</long>
-        <string name="template-name">""</string>
-        <bool name="dirty">1</bool>
-        <long name="makefile-last-written">-8519680</long>
-        <string name="Compiler name">""</string>
-        <string name="Build mode">"Debug"</string>
-        <string name="Unicode mode">"ANSI"</string>
-        <string name="Shared mode">"Static"</string>
-        <string name="Modularity">"Modular"</string>
-        <string name="GUI mode">"GUI"</string>
-        <string name="Toolkit">"wxMSW"</string>
-        <string name="Runtime linking">"Dynamic"</string>
-        <string name="Use exceptions">"Yes"</string>
-        <string name="Use ODBC">"No"</string>
-        <string name="Use OpenGL">"No"</string>
-        <string name="wxWidgets version">"%WXVERSION%"</string>
-        <string name="Executable name">"%EXECUTABLE%"</string>
-        <string name="Program arguments">""</string>
-        <string name="Working path">"%AUTO%"</string>
-        <string name="Output path">"%AUTO%"</string>
-        <string name="Objects path">"%AUTO%"</string>
-        <string name="Compiler location">"%AUTO%"</string>
-        <string name="wxWidgets location">"%AUTO%"</string>
-        <string name="C++ command">"%AUTO%"</string>
-        <string name="Resource compiler">"%AUTO%"</string>
-        <string name="Make command">"%AUTO%"</string>
-        <string name="Project makefile">"%AUTO%"</string>
-        <string name="wxWidgets makefile">"%AUTO%"</string>
-        <string name="Compiler bin path">"%AUTO%"</string>
-        <string name="Compiler include path">"%AUTO%"</string>
-        <string name="Compiler lib path">"%AUTO%"</string>
-        <string name="Preprocessor flags">"%AUTO%"</string>
-        <string name="Optimizations">"%AUTO%"</string>
-        <string name="Warnings">"%AUTO%"</string>
-        <string name="Debug flags">"%AUTO%"</string>
-        <string name="Libraries">"%AUTO%"</string>
-        <string name="Library path">"%AUTO%"</string>
-        <string name="Linker flags">"%AUTO%"</string>
-        <string name="Include path">"%AUTO%"</string>
-        <string name="Resource flags">"%AUTO%"</string>
-        <string name="Resource path">"%AUTO%"</string>
-        <string name="wxWidgets build path">"%AUTO%"</string>
-        <string name="wxWidgets build command">"%AUTO%"</string>
-        <string name="wxWidgets clean command">"%AUTO%"</string>
-        <string name="PATH variable">"%AUTO%"</string>
-        <bool name="Suppress source rules">0</bool>
-        <bool name="Enable makefile generation">1</bool>
-      </document>
-    </document>
-  </data>
-
-  <documents>
-    <document>
-      <string name="title">"Projects"</string>
-      <string name="type">"root-document"</string>
-      <string name="filename">""</string>
-      <string name="icon-name">"project"</string>
-      <long name="is-transient">1</long>
-      <long name="owns-file">1</long>
-      <long name="title-mode">0</long>
-      <long name="locked">1</long>
-      <document>
-        <string name="title">"Windows"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"dialogsfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-        <document>
-          <string name="title">"Pad properties"</string>
-          <string name="type">"dialog-document"</string>
-          <string name="filename">""</string>
-          <string name="icon-name">"dialog"</string>
-          <long name="is-transient">0</long>
-          <long name="owns-file">1</long>
-          <long name="title-mode">0</long>
-          <long name="locked">0</long>
-          <string name="created">"28/7/2006"</string>
-          <string name="proxy-type">"wbDialogProxy"</string>
-          <long name="base-id">10000</long>
-          <bool name="use-id-prefix">0</bool>
-          <string name="id-prefix">""</string>
-          <bool name="use-id-suffix">0</bool>
-          <string name="id-suffix">""</string>
-          <long name="use-xrc">0</long>
-          <long name="working-mode">0</long>
-          <string name="proxy-Id name">"ID_DIALOG"</string>
-          <long name="proxy-Id value">10000</long>
-          <string name="proxy-Class">"WinEDA_PadPropertiesFrame"</string>
-          <string name="proxy-Base class">"wxDialog"</string>
-          <string name="proxy-Window kind">"wxDialog"</string>
-          <string name="proxy-Implementation filename">"dialog_pad_edit.cpp"</string>
-          <string name="proxy-Header filename">"dialog_pad_edit.h"</string>
-          <string name="proxy-XRC filename">""</string>
-          <string name="proxy-Title">"Pad properties"</string>
-          <bool name="proxy-Centre">1</bool>
-          <string name="proxy-Icon">""</string>
-          <bool name="proxy-Dialog units">0</bool>
-          <string name="proxy-Help text">""</string>
-          <string name="proxy-Tooltip text">""</string>
-          <string name="proxy-Background colour">""</string>
-          <string name="proxy-Foreground colour">""</string>
-          <string name="proxy-Font">""</string>
-          <bool name="proxy-Hidden">0</bool>
-          <bool name="proxy-Enabled">1</bool>
-          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-          <string name="proxy-Data source">""</string>
-          <string name="proxy-Data class name">""</string>
-          <string name="proxy-Data class implementation filename">""</string>
-          <string name="proxy-Data class header filename">""</string>
-          <string name="proxy-Data class manager window">""</string>
-          <string name="proxy-Texture">""</string>
-          <string name="proxy-Texture style">"Tiled"</string>
-          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
-          <bool name="proxy-wxCAPTION">1</bool>
-          <bool name="proxy-wxRESIZE_BORDER">0</bool>
-          <bool name="proxy-wxSYSTEM_MENU">1</bool>
-          <bool name="proxy-wxSTAY_ON_TOP">0</bool>
-          <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
-          <bool name="proxy-wxCLOSE_BOX">1</bool>
-          <bool name="proxy-wxMAXIMIZE_BOX">0</bool>
-          <bool name="proxy-wxMINIMIZE_BOX">0</bool>
-          <bool name="proxy-wxDIALOG_MODAL">0</bool>
-          <bool name="proxy-wxNO_BORDER">0</bool>
-          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-          <bool name="proxy-wxRAISED_BORDER">0</bool>
-          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-          <bool name="proxy-wxWANTS_CHARS">0</bool>
-          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-          <bool name="proxy-wxCLIP_CHILDREN">0</bool>
-          <bool name="proxy-wxTAB_TRAVERSAL">0</bool>
-          <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
-          <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
-          <bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
-          <string name="proxy-Custom styles">"MAYBE_RESIZE_BORDER"</string>
-          <bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
-          <bool name="proxy-Fit to content">1</bool>
-          <long name="proxy-X">-1</long>
-          <long name="proxy-Y">-1</long>
-          <long name="proxy-Width">400</long>
-          <long name="proxy-Height">300</long>
-          <bool name="proxy-AUI manager">0</bool>
-          <string name="proxy-Event sources">""</string>
-          <document>
-            <string name="title">"wxBoxSizer H"</string>
-            <string name="type">"dialog-control-document"</string>
-            <string name="filename">""</string>
-            <string name="icon-name">"sizer"</string>
-            <long name="is-transient">0</long>
-            <long name="owns-file">1</long>
-            <long name="title-mode">0</long>
-            <long name="locked">0</long>
-            <string name="proxy-type">"wbBoxSizerProxy"</string>
-            <string name="proxy-Orientation">"Horizontal"</string>
-            <string name="proxy-Member variable name">""</string>
-            <bool name="proxy-wxSHAPED">0</bool>
-            <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-            <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-            <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-            <document>
-              <string name="title">"wxBoxSizer V"</string>
-              <string name="type">"dialog-control-document"</string>
-              <string name="filename">""</string>
-              <string name="icon-name">"sizer"</string>
-              <long name="is-transient">0</long>
-              <long name="owns-file">1</long>
-              <long name="title-mode">0</long>
-              <long name="locked">0</long>
-              <string name="created">"28/7/2006"</string>
-              <string name="proxy-type">"wbBoxSizerProxy"</string>
-              <string name="proxy-Orientation">"Vertical"</string>
-              <string name="proxy-Member variable name">"m_LeftBoxSizer"</string>
-              <string name="proxy-AlignH">"Centre"</string>
-              <string name="proxy-AlignV">"Expand"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
-              <bool name="proxy-wxLEFT">1</bool>
-              <bool name="proxy-wxRIGHT">1</bool>
-              <bool name="proxy-wxTOP">1</bool>
-              <bool name="proxy-wxBOTTOM">1</bool>
-              <bool name="proxy-wxSHAPED">0</bool>
-              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              <document>
-                <string name="title">"wxStaticText: wxID_STATIC"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"statictext"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbStaticTextProxy"</string>
-                <string name="proxy-Id name">"wxID_STATIC"</string>
-                <long name="proxy-Id value">5105</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxStaticText"</string>
-                <string name="proxy-Base class">"wxStaticText"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"Pad Num :"</string>
-                <long name="proxy-Wrapping width">-1</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxALIGN_LEFT">0</bool>
-                <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">1</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxTextCtrl: ID_TEXTCTRL_PADNUM"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"textctrl"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                <string name="proxy-Id name">"ID_TEXTCTRL_PADNUM"</string>
-                <long name="proxy-Id value">10001</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxTextCtrl"</string>
-                <string name="proxy-Base class">"wxTextCtrl"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_PadNumCtrl"</string>
-                <string name="proxy-Initial value">""</string>
-                <long name="proxy-Max length">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                <bool name="proxy-wxTE_READONLY">0</bool>
-                <bool name="proxy-wxTE_RICH">0</bool>
-                <bool name="proxy-wxTE_RICH2">0</bool>
-                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                <bool name="proxy-wxTE_LEFT">0</bool>
-                <bool name="proxy-wxTE_CENTRE">0</bool>
-                <bool name="proxy-wxTE_RIGHT">0</bool>
-                <bool name="proxy-wxHSCROLL">0</bool>
-                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">0</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-              </document>
-              <document>
-                <string name="title">"wxStaticText: wxID_STATIC"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"statictext"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbStaticTextProxy"</string>
-                <string name="proxy-Id name">"wxID_STATIC"</string>
-                <long name="proxy-Id value">5105</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxStaticText"</string>
-                <string name="proxy-Base class">"wxStaticText"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"Pad Net Name :"</string>
-                <long name="proxy-Wrapping width">-1</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxALIGN_LEFT">0</bool>
-                <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">1</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxTextCtrl: ID_TEXTCTRL_NETNAME"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"textctrl"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                <string name="proxy-Id name">"ID_TEXTCTRL_NETNAME"</string>
-                <long name="proxy-Id value">10002</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxTextCtrl"</string>
-                <string name="proxy-Base class">"wxTextCtrl"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_PadNetNameCtrl"</string>
-                <string name="proxy-Initial value">""</string>
-                <long name="proxy-Max length">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                <bool name="proxy-wxTE_READONLY">0</bool>
-                <bool name="proxy-wxTE_RICH">0</bool>
-                <bool name="proxy-wxTE_RICH2">0</bool>
-                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                <bool name="proxy-wxTE_LEFT">0</bool>
-                <bool name="proxy-wxTE_CENTRE">0</bool>
-                <bool name="proxy-wxTE_RIGHT">0</bool>
-                <bool name="proxy-wxHSCROLL">0</bool>
-                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">0</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-              </document>
-              <document>
-                <string name="title">"wxBoxSizer V"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"sizer"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"30/5/2006"</string>
-                <string name="proxy-type">"wbBoxSizerProxy"</string>
-                <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">"m_PadPositionBoxSizer"</string>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">0</bool>
-                <bool name="proxy-wxRIGHT">0</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              </document>
-            </document>
-            <document>
-              <string name="title">"wxBoxSizer V"</string>
-              <string name="type">"dialog-control-document"</string>
-              <string name="filename">""</string>
-              <string name="icon-name">"sizer"</string>
-              <long name="is-transient">0</long>
-              <long name="owns-file">1</long>
-              <long name="title-mode">0</long>
-              <long name="locked">0</long>
-              <string name="created">"3/8/2006"</string>
-              <string name="proxy-type">"wbBoxSizerProxy"</string>
-              <string name="proxy-Orientation">"Vertical"</string>
-              <string name="proxy-Member variable name">"m_DrillShapeBoxSizer"</string>
-              <string name="proxy-AlignH">"Expand"</string>
-              <string name="proxy-AlignV">"Expand"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
-              <bool name="proxy-wxLEFT">0</bool>
-              <bool name="proxy-wxRIGHT">0</bool>
-              <bool name="proxy-wxTOP">1</bool>
-              <bool name="proxy-wxBOTTOM">0</bool>
-              <bool name="proxy-wxSHAPED">0</bool>
-              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              <document>
-                <string name="title">"wxRadioBox: ID_RADIOBOX_DRILL_SHAPE"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"radiobox"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"3/8/2006"</string>
-                <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnRadioboxDrillShapeSelected"</string>
-                <string name="proxy-Id name">"ID_RADIOBOX_DRILL_SHAPE"</string>
-                <long name="proxy-Id value">10019</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxRadioBox"</string>
-                <string name="proxy-Base class">"wxRadioBox"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_DrillShapeCtrl"</string>
-                <string name="proxy-Label">"Drill Shape:"</string>
-                <long name="proxy-Major dimension count">1</long>
-                <string name="proxy-Items">"Circle|Oval"</string>
-                <long name="proxy-Initial value">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
-                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-            </document>
-            <document>
-              <string name="title">"wxBoxSizer V"</string>
-              <string name="type">"dialog-control-document"</string>
-              <string name="filename">""</string>
-              <string name="icon-name">"sizer"</string>
-              <long name="is-transient">0</long>
-              <long name="owns-file">1</long>
-              <long name="title-mode">0</long>
-              <long name="locked">0</long>
-              <string name="created">"28/7/2006"</string>
-              <string name="proxy-type">"wbBoxSizerProxy"</string>
-              <string name="proxy-Orientation">"Vertical"</string>
-              <string name="proxy-Member variable name">"m_PadOptSizer"</string>
-              <string name="proxy-AlignH">"Centre"</string>
-              <string name="proxy-AlignV">"Expand"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
-              <bool name="proxy-wxLEFT">1</bool>
-              <bool name="proxy-wxRIGHT">1</bool>
-              <bool name="proxy-wxTOP">1</bool>
-              <bool name="proxy-wxBOTTOM">1</bool>
-              <bool name="proxy-wxSHAPED">0</bool>
-              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              <document>
-                <string name="title">"wxRadioBox: ID_LISTBOX_ORIENT_PAD"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"radiobox"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnListboxOrientPadSelected"</string>
-                <string name="proxy-Id name">"ID_LISTBOX_ORIENT_PAD"</string>
-                <long name="proxy-Id value">10003</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxRadioBox"</string>
-                <string name="proxy-Base class">"wxRadioBox"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_PadOrient"</string>
-                <string name="proxy-Label">"Pad Orient:"</string>
-                <long name="proxy-Major dimension count">1</long>
-                <string name="proxy-Items">"0|90|-90|180|User"</string>
-                <long name="proxy-Initial value">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
-                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxRadioBox: ID_LISTBOX_SHAPE_PAD"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"radiobox"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnListboxShapePadSelected"</string>
-                <string name="proxy-Id name">"ID_LISTBOX_SHAPE_PAD"</string>
-                <long name="proxy-Id value">10004</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxRadioBox"</string>
-                <string name="proxy-Base class">"wxRadioBox"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_PadShape"</string>
-                <string name="proxy-Label">"Pad Shape:"</string>
-                <long name="proxy-Major dimension count">1</long>
-                <string name="proxy-Items">"Circle|Oval|Rect|Trapezoidal"</string>
-                <long name="proxy-Initial value">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
-                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxRadioBox: ID_LISTBOX_TYPE_PAD"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"radiobox"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnListboxTypePadSelected"</string>
-                <string name="proxy-Id name">"ID_LISTBOX_TYPE_PAD"</string>
-                <long name="proxy-Id value">10005</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxRadioBox"</string>
-                <string name="proxy-Base class">"wxRadioBox"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_PadType"</string>
-                <string name="proxy-Label">"Pad Type:"</string>
-                <long name="proxy-Major dimension count">1</long>
-                <string name="proxy-Items">"Standard|SMD|Conn"</string>
-                <long name="proxy-Initial value">0</long>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
-                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-            </document>
-            <document>
-              <string name="title">"wxBoxSizer V"</string>
-              <string name="type">"dialog-control-document"</string>
-              <string name="filename">""</string>
-              <string name="icon-name">"sizer"</string>
-              <long name="is-transient">0</long>
-              <long name="owns-file">1</long>
-              <long name="title-mode">0</long>
-              <long name="locked">0</long>
-              <string name="created">"28/7/2006"</string>
-              <string name="proxy-type">"wbBoxSizerProxy"</string>
-              <string name="proxy-Orientation">"Vertical"</string>
-              <string name="proxy-Member variable name">""</string>
-              <string name="proxy-AlignH">"Centre"</string>
-              <string name="proxy-AlignV">"Expand"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
-              <bool name="proxy-wxLEFT">1</bool>
-              <bool name="proxy-wxRIGHT">1</bool>
-              <bool name="proxy-wxTOP">1</bool>
-              <bool name="proxy-wxBOTTOM">1</bool>
-              <bool name="proxy-wxSHAPED">0</bool>
-              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              <document>
-                <string name="title">"wxButton: wxID_OK"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"dialogcontrol"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string>
-                <string name="proxy-Id name">"wxID_OK"</string>
-                <long name="proxy-Id value">5100</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxButton"</string>
-                <string name="proxy-Base class">"wxButton"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"&amp;OK"</string>
-                <bool name="proxy-Default">0</bool>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">"CC0000"</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <bool name="proxy-wxBU_LEFT">0</bool>
-                <bool name="proxy-wxBU_RIGHT">0</bool>
-                <bool name="proxy-wxBU_TOP">0</bool>
-                <bool name="proxy-wxBU_BOTTOM">0</bool>
-                <bool name="proxy-wxBU_EXACTFIT">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxButton: wxID_CANCEL"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"dialogcontrol"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string>
-                <string name="proxy-Id name">"wxID_CANCEL"</string>
-                <long name="proxy-Id value">5101</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxButton"</string>
-                <string name="proxy-Base class">"wxButton"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"&amp;Cancel"</string>
-                <bool name="proxy-Default">0</bool>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Data variable">""</string>
-                <string name="proxy-Data validator">""</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">"0000FF"</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <bool name="proxy-wxBU_LEFT">0</bool>
-                <bool name="proxy-wxBU_RIGHT">0</bool>
-                <bool name="proxy-wxBU_TOP">0</bool>
-                <bool name="proxy-wxBU_BOTTOM">0</bool>
-                <bool name="proxy-wxBU_EXACTFIT">0</bool>
-                <bool name="proxy-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <long name="proxy-X">-1</long>
-                <long name="proxy-Y">-1</long>
-                <long name="proxy-Width">-1</long>
-                <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Custom arguments">""</string>
-                <string name="proxy-Custom ctor arguments">""</string>
-              </document>
-              <document>
-                <string name="title">"wxStaticBoxSizer V"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"sizer"</string>
-                <long name="is-transient">0</long>
-                <long name="owns-file">1</long>
-                <long name="title-mode">0</long>
-                <long name="locked">0</long>
-                <string name="created">"28/7/2006"</string>
-                <string name="proxy-type">"wbStaticBoxSizerProxy"</string>
-                <string name="proxy-Id name">"wxID_ANY"</string>
-                <string name="proxy-Id value">"-1"</string>
-                <string name="proxy-Label">"Layers:"</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Sizer member variable name">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Static box class">"wxStaticBox"</string>
-                <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-AlignH">"Centre"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">1</bool>
-                <bool name="proxy-wxRIGHT">1</bool>
-                <bool name="proxy-wxTOP">0</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX"</string>
-                  <long name="proxy-Id value">10006</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerCu"</string>
-                  <string name="proxy-Label">"Copper layer"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX1"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX1"</string>
-                  <long name="proxy-Id value">10007</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerCmp"</string>
-                  <string name="proxy-Label">"Comp layer"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"Spacer"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"spacer"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbSpacerProxy"</string>
-                  <long name="proxy-Width">5</long>
-                  <long name="proxy-Height">5</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX2"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX2"</string>
-                  <long name="proxy-Id value">10008</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerAdhCmp"</string>
-                  <string name="proxy-Label">"Adhesive Cmp"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX3"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX3"</string>
-                  <long name="proxy-Id value">10009</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerAdhCu"</string>
-                  <string name="proxy-Label">"Adhesive Copper"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX4"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX4"</string>
-                  <long name="proxy-Id value">10010</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerPateCmp"</string>
-                  <string name="proxy-Label">"Solder paste Cmp"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX5"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX5"</string>
-                  <long name="proxy-Id value">10011</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerPateCu"</string>
-                  <string name="proxy-Label">"Solder paste Copper"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX6"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX6"</string>
-                  <long name="proxy-Id value">10012</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerSilkCmp"</string>
-                  <string name="proxy-Label">"Silkscreen Cmp"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX7"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX7"</string>
-                  <long name="proxy-Id value">10013</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerSilkCu"</string>
-                  <string name="proxy-Label">"Silkscreen Copper"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX8"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX8"</string>
-                  <long name="proxy-Id value">10014</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerMaskCmp"</string>
-                  <string name="proxy-Label">"Solder mask Cmp"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX9"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX9"</string>
-                  <long name="proxy-Id value">10015</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerMaskCu"</string>
-                  <string name="proxy-Label">"Solder mask Copper"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX10"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX10"</string>
-                  <long name="proxy-Id value">10016</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerECO1"</string>
-                  <string name="proxy-Label">"E.C.O.1 layer"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX11"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX11"</string>
-                  <long name="proxy-Id value">10017</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerECO2"</string>
-                  <string name="proxy-Label">"E.C.O.2 layer"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">0</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxCheckBox: ID_CHECKBOX12"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"checkbox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"28/7/2006"</string>
-                  <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_CHECKBOX12"</string>
-                  <long name="proxy-Id value">10018</long>
-                  <string name="proxy-Name">""</string>
-                  <string name="proxy-Class">"wxCheckBox"</string>
-                  <string name="proxy-Base class">"wxCheckBox"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">"m_PadLayerDraft"</string>
-                  <string name="proxy-Label">"Draft layer"</string>
-                  <bool name="proxy-Initial value">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxCHK_2STATE">1</bool>
-                  <bool name="proxy-wxCHK_3STATE">0</bool>
-                  <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">0</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-              </document>
-            </document>
-          </document>
-        </document>
-      </document>
-      <document>
-        <string name="title">"Sources"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"sourcesfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-        <document>
-          <string name="title">"dialog_pad_edit.rc"</string>
-          <string name="type">"source-editor-document"</string>
-          <string name="filename">"dialog_pad_edit.rc"</string>
-          <string name="icon-name">"source-editor"</string>
-          <long name="is-transient">0</long>
-          <long name="owns-file">0</long>
-          <long name="title-mode">1</long>
-          <long name="locked">0</long>
-          <string name="created">"28/7/2006"</string>
-          <string name="language">""</string>
-        </document>
-      </document>
-      <document>
-        <string name="title">"Images"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"bitmapsfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-      </document>
-    </document>
-  </documents>
-
-</anthemion-project>
diff --git a/pcbnew/dialog_pad_edit.rc b/pcbnew/dialog_pad_edit.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/pcbnew/dialog_pad_edit.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/pcbnew/dialog_pad_properties.cpp b/pcbnew/dialog_pad_properties.cpp
new file mode 100644
index 0000000000..9078ec0a05
--- /dev/null
+++ b/pcbnew/dialog_pad_properties.cpp
@@ -0,0 +1,585 @@
+/******************************************************/
+/* editpads.cpp: Pad editing functions and dialog box */
+/******************************************************/
+
+#include "fctsys.h"
+#include "common.h"
+#include "pcbnew.h"
+#include "trigo.h"
+
+/* Local variables */
+static wxString Current_PadNetName;
+
+
+#define NBSHAPES 4
+int CodeShape[NBSHAPES] = /* forme des pads  */
+{
+    PAD_CIRCLE, PAD_OVAL, PAD_RECT, PAD_TRAPEZOID
+};
+
+
+#define NBTYPES 4
+int CodeType[NBTYPES] =
+{
+    PAD_STANDARD, PAD_SMD, PAD_CONN, PAD_HOLE_NOT_PLATED
+};
+
+// Default mask layers for pads according to the pad type
+static long Std_Pad_Layers[NBTYPES] =
+{
+    // PAD_STANDARD:
+    ALL_CU_LAYERS | SILKSCREEN_LAYER_CMP | SOLDERMASK_LAYER_CU | SOLDERMASK_LAYER_CMP,
+
+    // PAD_CONN:
+    CMP_LAYER | SOLDERPASTE_LAYER_CMP | SOLDERMASK_LAYER_CMP,
+
+    // PAD_SMD:
+    CMP_LAYER | SOLDERMASK_LAYER_CMP,
+
+    //PAD_HOLE_NOT_PLATED:
+    CUIVRE_LAYER | SILKSCREEN_LAYER_CMP | SOLDERMASK_LAYER_CU | SOLDERMASK_LAYER_CMP
+};
+
+
+#include "dialog_pad_properties_base.h"
+
+
+/********************************************************************/
+/* class DialogPadProperties, derived from DialogPadPropertiesBase, */
+/*                            created by wxFormBuilder              */
+/********************************************************************/
+class DialogPadProperties : public DialogPadPropertiesBase
+{
+public:
+    WinEDA_BasePcbFrame* m_Parent;
+    wxDC*                m_DC;
+    D_PAD*               m_CurrentPad;
+
+    WinEDA_SizeCtrl*     m_PadSizeCtrl;
+    WinEDA_PositionCtrl* m_PadPositionCtrl;
+    WinEDA_SizeCtrl*     m_PadDeltaSizeCtrl;
+    WinEDA_SizeCtrl*     m_PadOffsetCtrl;
+    WinEDA_SizeCtrl*     m_PadDrillCtrl;
+
+public:
+    DialogPadProperties( WinEDA_BasePcbFrame* parent, D_PAD* Pad, wxDC* DC );
+    void InitDialog( wxInitDialogEvent& event );
+    void OnPadShapeSelection( wxCommandEvent& event );
+    void OnDrillShapeSelected( wxCommandEvent& event );
+    void PadOrientEvent( wxCommandEvent& event );
+    void PadTypeSelected( wxCommandEvent& event );
+    void PadPropertiesAccept( wxCommandEvent& event );
+    void SetPadLayersList( long layer_mask );
+};
+
+
+/*******************************************************************************************/
+DialogPadProperties::DialogPadProperties( WinEDA_BasePcbFrame* parent, D_PAD* Pad, wxDC* DC ) :
+    DialogPadPropertiesBase( parent )
+/*******************************************************************************************/
+{
+    m_Parent = parent;
+    m_DC = DC;
+    m_CurrentPad = Pad;
+
+    if( m_CurrentPad )
+    {
+        Current_PadNetName = m_CurrentPad->m_Netname;
+        g_Current_PadName  = m_CurrentPad->ReturnStringPadName();
+    }
+}
+
+
+/*************************************************************/
+void WinEDA_BasePcbFrame::InstallPadOptionsFrame( D_PAD* Pad, wxDC* DC, const wxPoint& pos )
+/*************************************************************/
+{
+    DialogPadProperties* frame = new DialogPadProperties( this, Pad, DC );
+
+    frame->ShowModal(); frame->Destroy();
+}
+
+
+/**************************************************************/
+void DialogPadProperties::InitDialog( wxInitDialogEvent& event )
+/**************************************************************/
+{
+    int            tmp;
+    wxCommandEvent cmd_event;
+
+    SetFont( *g_DialogFont );
+
+    SetFocus();     // Required under wxGTK if we want to demiss the dialog with the ESC key
+
+    m_PadNumCtrl->SetValue( g_Current_PadName );
+    m_PadNetNameCtrl->SetValue( Current_PadNetName );
+    D_PAD* pad = m_CurrentPad;
+    if( pad == NULL )
+        pad = &g_Pad_Master;
+
+    m_PadPositionCtrl = new     WinEDA_PositionCtrl( this, _( "Pad Position" ),
+        pad->m_Pos,
+        g_UnitMetric, m_PadPositionBoxSizer,
+        m_Parent->m_InternalUnits );
+
+    m_PadSizeCtrl = new         WinEDA_SizeCtrl( this, _( "Pad Size" ),
+        pad->m_Size,
+        g_UnitMetric, m_PadPositionBoxSizer,
+        m_Parent->m_InternalUnits );
+
+    m_PadDeltaSizeCtrl = new    WinEDA_SizeCtrl( this, _( "Delta" ),
+        pad->m_DeltaSize,
+        g_UnitMetric, m_PadPositionBoxSizer,
+        m_Parent->m_InternalUnits );
+
+    m_PadOffsetCtrl = new       WinEDA_SizeCtrl( this, _( "Offset" ),
+        pad->m_Offset,
+        g_UnitMetric, m_PadPositionBoxSizer,
+        m_Parent->m_InternalUnits );
+
+    /* In second column */
+    m_PadDrillCtrl = new WinEDA_SizeCtrl( this, _( "Pad drill" ),
+        pad->m_Drill,
+        g_UnitMetric, m_DrillShapeBoxSizer,
+        m_Parent->m_InternalUnits );
+
+    if( m_CurrentPad )
+    {
+        MODULE* Module = (MODULE*) m_CurrentPad->m_Parent;
+        tmp = m_CurrentPad->m_Orient - Module->m_Orient;
+    }
+    else
+        tmp = g_Pad_Master.m_Orient;
+    wxString msg; msg << tmp;
+    m_PadOrientCtrl->SetValue( msg );
+
+
+    // Pad Orient
+    switch( tmp )
+    {
+    case 0:
+        m_PadOrient->SetSelection( 0 );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case - 2700:
+    case 900:
+        m_PadOrient->SetSelection( 1 );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case - 900:
+    case 2700:
+        m_PadOrient->SetSelection( 2 );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case 1800:
+    case - 1800:
+        m_PadOrient->SetSelection( 3 );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    default:
+        m_PadOrient->SetSelection( 4 );
+        break;
+    }
+
+    switch( pad->m_PadShape )
+    {
+    default:
+    case PAD_CIRCLE:
+        m_PadShape->SetSelection( 0 );
+        break;
+
+    case PAD_OVAL:
+        m_PadShape->SetSelection( 1 );
+        break;
+
+    case PAD_RECT:
+        m_PadShape->SetSelection( 2 );
+        break;
+
+    case PAD_TRAPEZOID:
+        m_PadShape->SetSelection( 3 );
+        break;
+    }
+
+    cmd_event.SetId( m_PadShape->GetSelection() );
+    OnPadShapeSelection( cmd_event );
+
+    // Selection du type
+    tmp = pad->m_Attribut;
+    m_PadType->SetSelection( 0 );
+    for( int ii = 0; ii < NBTYPES; ii++ )
+    {
+        if( CodeType[ii] == tmp )
+        {
+            m_PadType->SetSelection( ii ); break;
+        }
+    }
+
+    if( pad->m_DrillShape != PAD_OVAL )
+        m_DrillShapeCtrl->SetSelection( 0 );
+    else
+        m_DrillShapeCtrl->SetSelection( 1 );
+    cmd_event.SetId( m_DrillShapeCtrl->GetSelection() );
+    OnDrillShapeSelected( cmd_event );
+
+    // Set layers used by this pad: :
+    if( m_CurrentPad )
+        SetPadLayersList( m_CurrentPad->m_Masque_Layer );
+    else
+    {
+        cmd_event.SetId( m_PadType->GetSelection() );
+        PadTypeSelected( cmd_event );
+    }
+
+    if( GetSizer() )
+    {
+        GetSizer()->SetSizeHints( this );
+    }
+}
+
+
+/*********************************************************************/
+void DialogPadProperties::OnPadShapeSelection( wxCommandEvent& event )
+/*********************************************************************/
+{
+    switch( m_PadShape->GetSelection() )
+    {
+    case 0:     //CIRCLE:
+        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
+        m_PadSizeCtrl->Enable( TRUE, FALSE );
+        break;
+
+    case 1:     //OVALE:
+        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
+        m_PadSizeCtrl->Enable( TRUE, TRUE );
+        break;
+
+    case 2:     // PAD_RECT:
+        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
+        m_PadSizeCtrl->Enable( TRUE, TRUE );
+        break;
+
+    case 3:     //TRAPEZE:
+        m_PadDeltaSizeCtrl->Enable( TRUE, TRUE );
+        m_PadSizeCtrl->Enable( TRUE, TRUE );
+        break;
+    }
+}
+
+
+/**********************************************************************/
+void DialogPadProperties::OnDrillShapeSelected( wxCommandEvent& event )
+/**********************************************************************/
+{
+    if ( (m_PadType->GetSelection() == 1) || (m_PadType->GetSelection() == 2) )
+    {   // pad type = SMD or CONN: no hole allowed
+        m_PadDrillCtrl->Enable( FALSE, FALSE );
+        return;
+    }
+    switch( m_DrillShapeCtrl->GetSelection() )
+    {
+    case 0:     //CIRCLE:
+        m_PadDrillCtrl->Enable( TRUE, FALSE );
+        break;
+
+    case 1:     //OVALE:
+        m_PadDrillCtrl->Enable( TRUE, TRUE );
+        break;
+    }
+}
+
+
+/*******************************************************************/
+void DialogPadProperties::PadOrientEvent( wxCommandEvent& event )
+/********************************************************************/
+{
+    switch( m_PadOrient->GetSelection() )
+    {
+    case 0:
+        m_PadOrientCtrl->SetValue( wxT( "0" ) );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case 1:
+        m_PadOrientCtrl->SetValue( wxT( "900" ) );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case 2:
+        m_PadOrientCtrl->SetValue( wxT( "2700" ) );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    case 3:
+        m_PadOrientCtrl->SetValue( wxT( "1800" ) );
+        m_PadOrientCtrl->Enable( FALSE );
+        break;
+
+    default:
+        m_PadOrientCtrl->Enable( TRUE );
+        break;
+    }
+}
+
+
+/*****************************************************************/
+void DialogPadProperties::PadTypeSelected( wxCommandEvent& event )
+/*****************************************************************/
+
+/* Adjust the better mask layer according to the selected pad type
+ */
+{
+    long layer_mask;
+    int  ii;
+
+    ii = m_PadType->GetSelection();
+    if( (ii < 0) || ( ii >= NBTYPES) )
+        ii = 0;
+
+    layer_mask = Std_Pad_Layers[ii];
+    SetPadLayersList( layer_mask );
+
+    // Enable/disable drill dialog items:
+    event.SetId(m_DrillShapeCtrl->GetSelection());
+    OnDrillShapeSelected( event );
+}
+
+
+/****************************************************************/
+void DialogPadProperties::SetPadLayersList( long layer_mask )
+/****************************************************************/
+
+/** SetPadLayersList
+ * Update the CheckBoxes state in pad layers list,
+ * @param layer_mask = pad layer mask (ORed layers bit mask)
+ */
+{
+    m_PadLayerCu->SetValue( ( layer_mask & CUIVRE_LAYER ) );
+    m_PadLayerCmp->SetValue( ( layer_mask & CMP_LAYER ) );
+
+    m_PadLayerAdhCmp->SetValue( ( layer_mask & ADHESIVE_LAYER_CMP ) );
+    m_PadLayerAdhCu->SetValue( ( layer_mask & ADHESIVE_LAYER_CU ) );
+
+    m_PadLayerPateCmp->SetValue( ( layer_mask & SOLDERPASTE_LAYER_CMP ) );
+    m_PadLayerPateCu->SetValue( ( layer_mask & SOLDERPASTE_LAYER_CU ) );
+
+    m_PadLayerSilkCmp->SetValue( ( layer_mask & SILKSCREEN_LAYER_CMP ) );
+    m_PadLayerSilkCu->SetValue( ( layer_mask & SILKSCREEN_LAYER_CU ) );
+
+    m_PadLayerMaskCmp->SetValue( ( layer_mask & SOLDERMASK_LAYER_CMP ) );
+    m_PadLayerMaskCu->SetValue( ( layer_mask & SOLDERMASK_LAYER_CU ) );
+
+    m_PadLayerECO1->SetValue( ( layer_mask & ECO1_LAYER ) );
+    m_PadLayerECO2->SetValue( ( layer_mask & ECO2_LAYER ) );
+
+    m_PadLayerDraft->SetValue( ( layer_mask & DRAW_LAYER ) );
+}
+
+
+/*************************************************************************/
+void DialogPadProperties::PadPropertiesAccept( wxCommandEvent& event )
+/*************************************************************************/
+
+/* Met a jour les differents parametres pour le composant en cours d'édition
+ */
+{
+    long PadLayerMask;
+    bool error = FALSE;
+    bool RastnestIsChanged = false;
+
+    if( m_DC )
+        m_Parent->DrawPanel->CursorOff( m_DC );
+
+    g_Pad_Master.m_Attribut = CodeType[m_PadType->GetSelection()];
+    g_Pad_Master.m_PadShape = CodeShape[m_PadShape->GetSelection()];
+    g_Pad_Master.m_Pos  = m_PadPositionCtrl->GetValue();
+    g_Pad_Master.m_Pos0 = g_Pad_Master.m_Pos;
+    g_Pad_Master.m_Size = m_PadSizeCtrl->GetValue();
+    if( g_Pad_Master.m_PadShape == PAD_CIRCLE )
+        g_Pad_Master.m_Size.y = g_Pad_Master.m_Size.x;
+    g_Pad_Master.m_DeltaSize = m_PadDeltaSizeCtrl->GetValue();
+    g_Pad_Master.m_Offset    = m_PadOffsetCtrl->GetValue();
+    g_Pad_Master.m_Drill = m_PadDrillCtrl->GetValue();
+    if( m_DrillShapeCtrl->GetSelection() == 0 )
+    {
+        g_Pad_Master.m_DrillShape = PAD_CIRCLE;
+        g_Pad_Master.m_Drill.y    = g_Pad_Master.m_Drill.x;
+    }
+    else
+        g_Pad_Master.m_DrillShape = PAD_OVAL;
+    long     ovalue = 0;
+    wxString msg    = m_PadOrientCtrl->GetValue();
+    msg.ToLong( &ovalue );
+    g_Pad_Master.m_Orient = ovalue;
+
+    g_Current_PadName  = m_PadNumCtrl->GetValue().Left( 4 );
+    Current_PadNetName = m_PadNetNameCtrl->GetValue();
+
+    /* Test for incorrect values */
+    if( (g_Pad_Master.m_Size.x < g_Pad_Master.m_Drill.x)
+       || (g_Pad_Master.m_Size.y < g_Pad_Master.m_Drill.y) )
+    {
+        error = TRUE;
+        DisplayError( this, _( "Incorrect value for pad drill: pad drill bigger than pad size" ) );
+    }
+    if( ( g_Pad_Master.m_Size.x / 2 <= ABS( g_Pad_Master.m_Offset.x ) )
+       || ( g_Pad_Master.m_Size.y / 2 <= ABS( g_Pad_Master.m_Offset.y ) ) )
+    {
+        error = TRUE;
+        DisplayError( this, _( "Incorrect value for pad offset" ) );
+    }
+
+    if( error )
+    {
+        if( m_DC )
+            m_Parent->DrawPanel->CursorOn( m_DC );
+        return;
+    }
+
+    PadLayerMask = 0;
+    if( m_PadLayerCu->GetValue() )
+        PadLayerMask |= CUIVRE_LAYER;
+    if( m_PadLayerCmp->GetValue() )
+        PadLayerMask |= CMP_LAYER;
+    if( ( PadLayerMask & (CUIVRE_LAYER | CMP_LAYER) ) == (CUIVRE_LAYER | CMP_LAYER) )
+        PadLayerMask |= ALL_CU_LAYERS;
+    if( m_PadLayerAdhCmp->GetValue() )
+        PadLayerMask |= ADHESIVE_LAYER_CMP;
+    if( m_PadLayerAdhCu->GetValue() )
+        PadLayerMask |= ADHESIVE_LAYER_CU;
+    if( m_PadLayerPateCmp->GetValue() )
+        PadLayerMask |= SOLDERPASTE_LAYER_CMP;
+    if( m_PadLayerPateCu->GetValue() )
+        PadLayerMask |= SOLDERPASTE_LAYER_CU;
+    if( m_PadLayerSilkCmp->GetValue() )
+        PadLayerMask |= SILKSCREEN_LAYER_CMP;
+    if( m_PadLayerSilkCu->GetValue() )
+        PadLayerMask |= SILKSCREEN_LAYER_CU;
+    if( m_PadLayerMaskCmp->GetValue() )
+        PadLayerMask |= SOLDERMASK_LAYER_CMP;
+    if( m_PadLayerMaskCu->GetValue() )
+        PadLayerMask |= SOLDERMASK_LAYER_CU;
+    if( m_PadLayerECO1->GetValue() )
+        PadLayerMask |= ECO1_LAYER;
+    if( m_PadLayerECO2->GetValue() )
+        PadLayerMask |= ECO2_LAYER;
+    if( m_PadLayerDraft->GetValue() )
+        PadLayerMask |= DRAW_LAYER;
+
+    g_Pad_Master.m_Masque_Layer = PadLayerMask;
+
+    if( m_CurrentPad )   // Set Pad Name & Num
+    {
+        m_Parent->SaveCopyInUndoList( m_Parent->m_Pcb->m_Modules );
+        MODULE* Module = (MODULE*) m_CurrentPad->m_Parent;
+        Module->m_LastEdit_Time = time( NULL );
+
+        if( m_DC ) // redraw the area where the pad was, without pad (delete pad on screen)
+        {
+            m_CurrentPad->m_Flags |= DO_NOT_DRAW;
+            m_Parent->DrawPanel->PostDirtyRect( m_CurrentPad->GetBoundingBox() );
+            m_CurrentPad->m_Flags &= ~DO_NOT_DRAW;
+        }
+        m_CurrentPad->m_PadShape = g_Pad_Master.m_PadShape;
+        m_CurrentPad->m_Attribut = g_Pad_Master.m_Attribut;
+        if( m_CurrentPad->m_Pos != g_Pad_Master.m_Pos )
+        {
+            m_CurrentPad->m_Pos = g_Pad_Master.m_Pos;
+            RastnestIsChanged   = true;
+        }
+
+        /* compute the pos 0 value, i.e. pad position for module orient = 0 i.e.
+         *  refer to module origin (module position) */
+        m_CurrentPad->m_Pos0   = m_CurrentPad->m_Pos;
+        m_CurrentPad->m_Pos0  -= Module->m_Pos;
+        m_CurrentPad->m_Orient = g_Pad_Master.m_Orient + Module->m_Orient;
+        RotatePoint( &m_CurrentPad->m_Pos0.x, &m_CurrentPad->m_Pos0.y, -Module->m_Orient );
+
+        m_CurrentPad->m_Size       = g_Pad_Master.m_Size;
+        m_CurrentPad->m_DeltaSize  = g_Pad_Master.m_DeltaSize;
+        m_CurrentPad->m_Drill      = g_Pad_Master.m_Drill;
+        m_CurrentPad->m_DrillShape = g_Pad_Master.m_DrillShape;
+        m_CurrentPad->m_Offset     = g_Pad_Master.m_Offset;
+        if( m_CurrentPad->m_Masque_Layer != g_Pad_Master.m_Masque_Layer )
+        {
+            RastnestIsChanged = true;
+            m_CurrentPad->m_Masque_Layer = g_Pad_Master.m_Masque_Layer;
+        }
+        m_CurrentPad->SetPadName( g_Current_PadName );
+
+        if( m_CurrentPad->m_Netname != Current_PadNetName )
+        {
+            if( Current_PadNetName.IsEmpty() )
+                m_CurrentPad->SetNet( 0 );
+            else
+            {
+                const EQUIPOT* net = m_Parent->m_Pcb->FindNet( Current_PadNetName );
+                if( net )
+                {
+                    RastnestIsChanged = true;
+                    m_CurrentPad->m_Netname = Current_PadNetName;
+                    m_CurrentPad->SetNet( net->GetNet() );
+                }
+                else
+                    DisplayError( this, _( "Unknown netname, no change" ) );
+            }
+        }
+
+        switch( m_CurrentPad->m_PadShape )
+        {
+        case PAD_CIRCLE:
+            m_CurrentPad->m_DeltaSize = wxSize( 0, 0 );
+            m_CurrentPad->m_Size.y    = m_CurrentPad->m_Size.x;
+            break;
+
+        case PAD_RECT:
+            m_CurrentPad->m_DeltaSize = wxSize( 0, 0 );
+            break;
+
+        case PAD_OVAL:
+            m_CurrentPad->m_DeltaSize = wxSize( 0, 0 );
+            break;
+
+        case PAD_TRAPEZOID:
+            break;
+        }
+
+        switch( m_CurrentPad->m_Attribut )
+        {
+        case PAD_STANDARD:
+            break;
+
+        case PAD_CONN:
+        case PAD_SMD:
+            m_CurrentPad->m_Offset = wxSize( 0, 0 );
+            m_CurrentPad->m_Drill  = wxSize( 0, 0 );
+            break;
+
+        case PAD_HOLE_NOT_PLATED:
+            break;
+
+        default:
+            DisplayError( this, wxT( "Error: unknown pad type" ) );
+            break;
+        }
+
+        m_CurrentPad->ComputeRayon();
+
+        Module->Set_Rectangle_Encadrement();
+        m_CurrentPad->Display_Infos( m_Parent );
+        if( m_DC )  // redraw the area where the pad was
+            m_Parent->DrawPanel->PostDirtyRect( m_CurrentPad->GetBoundingBox() );
+        m_Parent->GetScreen()->SetModify();
+    }
+
+    Close();
+
+    if( m_DC )
+        m_Parent->DrawPanel->CursorOn( m_DC );
+    if( RastnestIsChanged )  // The net ratsnest must be recalculated
+        m_Parent->m_Pcb->m_Status_Pcb = 0;
+}
diff --git a/pcbnew/dialog_pad_properties_base.cpp b/pcbnew/dialog_pad_properties_base.cpp
new file mode 100644
index 0000000000..edaad20479
--- /dev/null
+++ b/pcbnew/dialog_pad_properties_base.cpp
@@ -0,0 +1,190 @@
+///////////////////////////////////////////////////////////////////////////
+// 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 );
+}
diff --git a/pcbnew/dialog_pad_properties_base.fbp b/pcbnew/dialog_pad_properties_base.fbp
new file mode 100644
index 0000000000..4bce91acff
--- /dev/null
+++ b/pcbnew/dialog_pad_properties_base.fbp
@@ -0,0 +1,1504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="9" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_pad_properties_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">dialog_pad_properties_base</property>
+        <property name="namespace"></property>
+        <property name="path">.</property>
+        <property name="precompiled_header"></property>
+        <property name="relative_path">1</property>
+        <property name="use_enum">1</property>
+        <property name="use_microsoft_bom">0</property>
+        <object class="Dialog" expanded="1">
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="enabled">1</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_DIALOG_EDIT_PAD</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">DialogPadPropertiesBase</property>
+            <property name="pos"></property>
+            <property name="size">520,396</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
+            <property name="subclass"></property>
+            <property name="title">Pad Properties</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxSUNKEN_BORDER</property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog">InitDialog</event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">m_MainSizer</property>
+                <property name="orient">wxHORIZONTAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxBOTTOM|wxLEFT</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">m_LeftBoxSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticText" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Pad Num :</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadNumText</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxTextCtrl" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PADNUMCTRL</property>
+                                <property name="maximum_size"></property>
+                                <property name="maxlength">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadNumCtrl</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticText" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Pad Net Name :</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadNameText</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxTextCtrl" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_PADNETNAMECTRL</property>
+                                <property name="maximum_size"></property>
+                                <property name="maxlength">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadNetNameCtrl</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxBoxSizer" expanded="1">
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadPositionBoxSizer</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">protected</property>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxBOTTOM</property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">m_DrillShapeBoxSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">protected</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="bg"></property>
+                                <property name="choices">&quot;Circle&quot; &quot;Oval&quot; &quot;Rect&quot; &quot;Trapezoidal&quot;</property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">ID_LISTBOX_SHAPE_PAD</property>
+                                <property name="label">Pad Shape:</property>
+                                <property name="majorDimension">1</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadShape</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="selection">0</property>
+                                <property name="size"></property>
+                                <property name="style">wxRA_SPECIFY_COLS</property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox">OnPadShapeSelection</event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="spacer" expanded="1">
+                                <property name="height">8</property>
+                                <property name="permission">protected</property>
+                                <property name="width">0</property>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="bg"></property>
+                                <property name="choices">&quot;Circle&quot; &quot;Oval&quot;</property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">ID_RADIOBOX_DRILL_SHAPE</property>
+                                <property name="label">Drill Shape:</property>
+                                <property name="majorDimension">1</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_DrillShapeCtrl</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="selection">1</property>
+                                <property name="size"></property>
+                                <property name="style">wxRA_SPECIFY_COLS</property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox">OnDrillShapeSelected</event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">m_MiddleRightBoxSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="bg"></property>
+                                <property name="choices">&quot;0&quot; &quot;90&quot; &quot;-90&quot; &quot;180&quot; &quot;User&quot;</property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">ID_LISTBOX_ORIENT_PAD</property>
+                                <property name="label">Pad Orient:</property>
+                                <property name="majorDimension">1</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadOrient</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="selection">0</property>
+                                <property name="size"></property>
+                                <property name="style">wxRA_SPECIFY_COLS</property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox">PadOrientEvent</event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticText" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Pad Orient (0.1 deg)</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadOrientText</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxTextCtrl" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="maximum_size"></property>
+                                <property name="maxlength">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadOrientCtrl</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="spacer" expanded="1">
+                                <property name="height">8</property>
+                                <property name="permission">protected</property>
+                                <property name="width">0</property>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxRadioBox" expanded="1">
+                                <property name="bg"></property>
+                                <property name="choices">&quot;Standard&quot; &quot;SMD&quot; &quot;Conn&quot;</property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">ID_LISTBOX_TYPE_PAD</property>
+                                <property name="label">Pad Type:</property>
+                                <property name="majorDimension">1</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_PadType</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="selection">0</property>
+                                <property name="size"></property>
+                                <property name="style">wxRA_SPECIFY_COLS</property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRadioBox">PadTypeSelected</event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxBOTTOM|wxRIGHT</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">m_RightBoxSizer</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="default">1</property>
+                                <property name="enabled">1</property>
+                                <property name="fg">209,26,5</property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_OK</property>
+                                <property name="label">Ok</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_buttonOk</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick">PadPropertiesAccept</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="default">0</property>
+                                <property name="enabled">1</property>
+                                <property name="fg">14,2,164</property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_CANCEL</property>
+                                <property name="label">Cancel</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_buttonCancel</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick"></event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="spacer" expanded="1">
+                                <property name="height">8</property>
+                                <property name="permission">protected</property>
+                                <property name="width">0</property>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag"></property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticBoxSizer" expanded="1">
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Layers:</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_LayersSizer</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <event name="OnUpdateUI"></event>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Copper layer</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerCu</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Component layer</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerCmp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="spacer" expanded="1">
+                                        <property name="height">8</property>
+                                        <property name="permission">protected</property>
+                                        <property name="width">0</property>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Adhesive Cmp</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerAdhCmp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Adhesive Copper</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerAdhCu</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Solder paste Cmp</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerPateCmp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Solder paste Copper</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerPateCu</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Silkscreen Cmp</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerSilkCmp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Silkscreen Copper</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerSilkCu</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Solder mask Cmp</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerMaskCmp</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Solder mask Copper</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerMaskCu</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">E.C.O.1 layer</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerECO1</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">E.C.O.2 layer</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerECO2</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="bg"></property>
+                                        <property name="checked">0</property>
+                                        <property name="context_help"></property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="font"></property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Draft layer</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">m_PadLayerDraft</property>
+                                        <property name="permission">protected</property>
+                                        <property name="pos"></property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/pcbnew/dialog_pad_properties_base.h b/pcbnew/dialog_pad_properties_base.h
new file mode 100644
index 0000000000..edd917019d
--- /dev/null
+++ b/pcbnew/dialog_pad_properties_base.h
@@ -0,0 +1,95 @@
+///////////////////////////////////////////////////////////////////////////
+// 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__
diff --git a/pcbnew/editpads.cpp b/pcbnew/editpads.cpp
deleted file mode 100644
index c29de00624..0000000000
--- a/pcbnew/editpads.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/******************************************************/
-/* editpads.cpp: Pad editing functions and dialog box */
-/******************************************************/
-
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "pcbnew.h"
-#include "autorout.h"
-#include "trigo.h"
-
-#include "drag.h"
-
-#include "protos.h"
-
-/* Routines Locales */
-
-/* Variables locales */
-static wxString Current_PadNetName;
-
-
-#define NBSHAPES 4
-int CodeShape[NBSHAPES] = /* forme des pads  */
-{
-    PAD_CIRCLE, PAD_OVAL, PAD_RECT, PAD_TRAPEZOID
-};
-
-
-#define NBTYPES 4
-int CodeType[NBTYPES] =
-{
-    PAD_STANDARD, PAD_SMD, PAD_CONN, PAD_HOLE_NOT_PLATED
-};
-
-// Default mask layers for pads according to the pas type
-static long Std_Pad_Layers[NBTYPES] =
-{
-    // PAD_STANDARD:
-    ALL_CU_LAYERS | SILKSCREEN_LAYER_CMP | SOLDERMASK_LAYER_CU | SOLDERMASK_LAYER_CMP,
-
-    // PAD_CONN:
-    CMP_LAYER | SOLDERPASTE_LAYER_CMP | SOLDERMASK_LAYER_CMP,
-
-    // PAD_SMD:
-    CMP_LAYER | SOLDERMASK_LAYER_CMP,
-
-    //PAD_HOLE_NOT_PLATED:
-    ALL_CU_LAYERS | SILKSCREEN_LAYER_CMP | SOLDERMASK_LAYER_CU | SOLDERMASK_LAYER_CMP
-};
-
-
-/************************************/
-/* class WinEDA_PadPropertiesFrame */
-/************************************/
-
-#include "dialog_pad_edit.cpp"
-
-
-/*************************************************************/
-void WinEDA_BasePcbFrame::InstallPadOptionsFrame( D_PAD* Pad,
-                                                  wxDC* DC, const wxPoint& pos )
-/*************************************************************/
-{
-    WinEDA_PadPropertiesFrame* frame = new WinEDA_PadPropertiesFrame( this,
-                               Pad, DC );
-
-    frame->ShowModal(); frame->Destroy();
-}
-
-
-/********************************************************/
-void WinEDA_PadPropertiesFrame::SetOthersControls()
-/********************************************************/
-{
-    int tmp;
-
-    m_PadNumCtrl->SetValue( g_Current_PadName );
-    m_PadNetNameCtrl->SetValue( Current_PadNetName );
-
-    m_PadPositionCtrl = new     WinEDA_PositionCtrl( this, _(
-                                                         "Pad Position" ),
-                                                     CurrentPad ? CurrentPad->m_Pos : g_Pad_Master
-                                                     .m_Pos,
-                                                     g_UnitMetric, m_PadPositionBoxSizer,
-                                                     m_Parent->m_InternalUnits );
-
-    m_PadSizeCtrl = new         WinEDA_SizeCtrl( this, _(
-                                                     "Pad Size" ),
-                                                 CurrentPad ? CurrentPad->m_Size : g_Pad_Master.
-                                                 m_Size,
-                                                 g_UnitMetric, m_PadPositionBoxSizer,
-                                                 m_Parent->m_InternalUnits );
-
-    m_PadDeltaSizeCtrl = new    WinEDA_SizeCtrl( this, _(
-                                                     "Delta" ),
-                                                 CurrentPad ? CurrentPad->m_DeltaSize :
-                                                 g_Pad_Master.m_DeltaSize,
-                                                 g_UnitMetric, m_PadPositionBoxSizer,
-                                                 m_Parent->m_InternalUnits );
-
-    m_PadOffsetCtrl = new       WinEDA_SizeCtrl( this, _(
-                                                     "Offset" ),
-                                                 CurrentPad ? CurrentPad->m_Offset : g_Pad_Master.
-                                                 m_Offset,
-                                                 g_UnitMetric, m_PadPositionBoxSizer,
-                                                 m_Parent->m_InternalUnits );
-
-    /* In second column */
-
-    m_PadDrillCtrl = new WinEDA_SizeCtrl( this, _(
-                                              "Pad drill" ),
-                                          CurrentPad ? CurrentPad->m_Drill : g_Pad_Master.m_Drill,
-                                          g_UnitMetric, m_DrillShapeBoxSizer,
-                                          m_Parent->m_InternalUnits );
-
-    if( CurrentPad )
-    {
-        tmp = CurrentPad->m_Orient - m_Module->m_Orient;
-    }
-    else
-        tmp = g_Pad_Master.m_Orient;
-    m_DrillShapeBoxSizer->Add( 5, 5, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 5 );
-    m_PadOrientCtrl = new WinEDA_ValueCtrl( this, _( "Pad Orientation (in 0.1 degrees)" ),
-                                            tmp, 2, m_DrillShapeBoxSizer, 1 );
-
-
-    // Pad Orient
-    switch( tmp )
-    {
-    case 0:
-        m_PadOrient->SetSelection( 0 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case - 2700:
-    case 900:
-        m_PadOrient->SetSelection( 1 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case - 900:
-    case 2700:
-        m_PadOrient->SetSelection( 2 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case 1800:
-    case - 1800:
-        m_PadOrient->SetSelection( 3 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    default:
-        m_PadOrient->SetSelection( 4 );
-        break;
-    }
-
-    tmp = CurrentPad ? CurrentPad->m_PadShape : g_Pad_Master.m_PadShape;
-
-    switch( tmp )
-    {
-    case PAD_CIRCLE:
-        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
-        m_PadSizeCtrl->Enable( TRUE, FALSE );
-        m_PadShape->SetSelection( 0 );
-        break;
-
-    case PAD_OVAL:
-        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
-        m_PadSizeCtrl->Enable( TRUE, TRUE );
-        m_PadShape->SetSelection( 1 );
-        break;
-
-    case PAD_RECT:
-        m_PadDeltaSizeCtrl->Enable( FALSE, FALSE );
-        m_PadSizeCtrl->Enable( TRUE, TRUE );
-        m_PadShape->SetSelection( 2 );
-        break;
-
-    case PAD_TRAPEZOID:
-        m_PadDeltaSizeCtrl->Enable( TRUE, TRUE );
-        m_PadSizeCtrl->Enable( TRUE, TRUE );
-        m_PadShape->SetSelection( 3 );
-        break;
-    }
-
-    // Selection du type
-    tmp = CurrentPad ? CurrentPad->m_Attribut : g_Pad_Master.m_Attribut;
-    m_PadType->SetSelection( 0 );
-    for( int ii = 0; ii < NBTYPES; ii++ )
-    {
-        if( CodeType[ii] == tmp )
-        {
-            m_PadType->SetSelection( ii ); break;
-        }
-    }
-
-    tmp = CurrentPad ? CurrentPad->m_DrillShape : g_Pad_Master.m_DrillShape;
-
-    switch( tmp )
-    {
-    case PAD_CIRCLE:
-        m_DrillShapeCtrl->SetSelection( 0 );
-        m_PadDrillCtrl->Enable( TRUE, FALSE );
-        break;
-
-    case PAD_OVAL:
-        m_DrillShapeCtrl->SetSelection( 1 );
-        m_PadDrillCtrl->Enable( TRUE, TRUE );
-        break;
-    }
-
-    // Selection des couches cuivre :
-    if( CurrentPad )
-        SetPadLayersList( CurrentPad->m_Masque_Layer );
-    else
-        PadTypeSelected();
-}
-
-
-/*******************************************************************/
-void WinEDA_PadPropertiesFrame::PadOrientEvent( wxCommandEvent& event )
-/********************************************************************/
-{
-    switch( m_PadOrient->GetSelection() )
-    {
-    case 0:
-        m_PadOrientCtrl->SetValue( 0 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case 1:
-        m_PadOrientCtrl->SetValue( 900 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case 2:
-        m_PadOrientCtrl->SetValue( 2700 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    case 3:
-        m_PadOrientCtrl->SetValue( 1800 );
-        m_PadOrientCtrl->Enable( FALSE );
-        break;
-
-    default:
-        m_PadOrientCtrl->Enable( TRUE );
-        break;
-    }
-}
-
-
-
-/************************************************/
-void WinEDA_PadPropertiesFrame::PadTypeSelected()
-/************************************************/
-/* Adjust the better mask layer according to the selected pad type
- */
-{
-    long layer_mask;
-    int  ii;
-
-    ii = m_PadType->GetSelection();
-    if( (ii < 0) || ( ii >= NBTYPES) )
-        ii = 0;
-
-    layer_mask = Std_Pad_Layers[ii];
-    SetPadLayersList( layer_mask );
-}
-
-
-/****************************************************************/
-void WinEDA_PadPropertiesFrame::SetPadLayersList( long layer_mask )
-/****************************************************************/
-
-/* Met a jour l'etat des CheckBoxes de la liste des layers actives,
- *  données bit a bit dans layer_mask
- */
-{
-    if( layer_mask & CUIVRE_LAYER )
-        m_PadLayerCu->SetValue( TRUE );
-    else
-        m_PadLayerCu->SetValue( FALSE );
-
-    if( layer_mask & CMP_LAYER )
-        m_PadLayerCmp->SetValue( TRUE );
-    else
-        m_PadLayerCmp->SetValue( FALSE );
-
-    if( layer_mask & ADHESIVE_LAYER_CMP )
-        m_PadLayerAdhCmp->SetValue( TRUE );
-    else
-        m_PadLayerAdhCmp->SetValue( FALSE );
-
-    if( layer_mask & ADHESIVE_LAYER_CU )
-        m_PadLayerAdhCu->SetValue( TRUE );
-    else
-        m_PadLayerAdhCu->SetValue( FALSE );
-
-    if( layer_mask & SOLDERPASTE_LAYER_CMP )
-        m_PadLayerPateCmp->SetValue( TRUE );
-    else
-        m_PadLayerPateCmp->SetValue( FALSE );
-
-    if( layer_mask & SOLDERPASTE_LAYER_CU )
-        m_PadLayerPateCu->SetValue( TRUE );
-    else
-        m_PadLayerPateCu->SetValue( FALSE );
-
-    if( layer_mask & SILKSCREEN_LAYER_CMP )
-        m_PadLayerSilkCmp->SetValue( TRUE );
-    else
-        m_PadLayerSilkCmp->SetValue( FALSE );
-
-    if( layer_mask & SILKSCREEN_LAYER_CU )
-        m_PadLayerSilkCu->SetValue( TRUE );
-    else
-        m_PadLayerSilkCu->SetValue( FALSE );
-
-    if( layer_mask & SOLDERMASK_LAYER_CMP )
-        m_PadLayerMaskCmp->SetValue( TRUE );
-    else
-        m_PadLayerMaskCmp->SetValue( FALSE );
-
-    if( layer_mask & SOLDERMASK_LAYER_CU )
-        m_PadLayerMaskCu->SetValue( TRUE );
-    else
-        m_PadLayerMaskCu->SetValue( FALSE );
-
-    if( layer_mask & ECO1_LAYER )
-        m_PadLayerECO1->SetValue( TRUE );
-    else
-        m_PadLayerECO1->SetValue( FALSE );
-
-    if( layer_mask & ECO2_LAYER )
-        m_PadLayerECO2->SetValue( TRUE );
-    else
-        m_PadLayerECO2->SetValue( FALSE );
-
-    if( layer_mask & DRAW_LAYER )
-        m_PadLayerDraft->SetValue( TRUE );
-    else
-        m_PadLayerDraft->SetValue( FALSE );
-}
-
-
-/*************************************************************************/
-void WinEDA_PadPropertiesFrame::PadPropertiesAccept( wxCommandEvent& event )
-/*************************************************************************/
-
-/* Met a jour les differents parametres pour le composant en cours d'édition
- */
-{
-    long PadLayerMask;
-    bool error = FALSE;
-    bool RastnestIsChanged = false;
-
-    if( m_DC )
-        m_Parent->DrawPanel->CursorOff( m_DC );
-
-    g_Pad_Master.m_Attribut = CodeType[m_PadType->GetSelection()];
-    g_Pad_Master.m_PadShape = CodeShape[m_PadShape->GetSelection()];
-    g_Pad_Master.m_Pos  = m_PadPositionCtrl->GetValue();
-    g_Pad_Master.m_Pos0 = g_Pad_Master.m_Pos;
-    g_Pad_Master.m_Size = m_PadSizeCtrl->GetValue();
-    if( g_Pad_Master.m_PadShape == PAD_CIRCLE )
-        g_Pad_Master.m_Size.y = g_Pad_Master.m_Size.x;
-    g_Pad_Master.m_DeltaSize = m_PadDeltaSizeCtrl->GetValue();
-    g_Pad_Master.m_Offset    = m_PadOffsetCtrl->GetValue();
-    g_Pad_Master.m_Drill = m_PadDrillCtrl->GetValue();
-    if( m_DrillShapeCtrl->GetSelection() == 0 )
-    {
-        g_Pad_Master.m_DrillShape = PAD_CIRCLE;
-        g_Pad_Master.m_Drill.y    = g_Pad_Master.m_Drill.x;
-    }
-    else
-        g_Pad_Master.m_DrillShape = PAD_OVAL;
-    g_Pad_Master.m_Orient = m_PadOrientCtrl->GetValue();
-    g_Current_PadName  = m_PadNumCtrl->GetValue().Left( 4 );
-    Current_PadNetName = m_PadNetNameCtrl->GetValue();
-
-    /* Test for incorrect values */
-    if( (g_Pad_Master.m_Size.x < g_Pad_Master.m_Drill.x)
-       || (g_Pad_Master.m_Size.y < g_Pad_Master.m_Drill.y) )
-    {
-        error = TRUE;
-        DisplayError( this, _( "Incorrect value for pad drill: pad drill bigger than pad size" ) );
-    }
-    if( ( g_Pad_Master.m_Size.x / 2 <= ABS( g_Pad_Master.m_Offset.x ) )
-       || ( g_Pad_Master.m_Size.y / 2 <= ABS( g_Pad_Master.m_Offset.y ) ) )
-    {
-        error = TRUE;
-        DisplayError( this, _( "Incorrect value for pad offset" ) );
-    }
-
-    if( error )
-    {
-        if( m_DC )
-            m_Parent->DrawPanel->CursorOn( m_DC );
-        return;
-    }
-
-    PadLayerMask = 0;
-    if( m_PadLayerCu->GetValue() )
-        PadLayerMask |= CUIVRE_LAYER;
-    if( m_PadLayerCmp->GetValue() )
-        PadLayerMask |= CMP_LAYER;
-    if( ( PadLayerMask & (CUIVRE_LAYER | CMP_LAYER) ) == (CUIVRE_LAYER | CMP_LAYER) )
-        PadLayerMask |= ALL_CU_LAYERS;
-    if( m_PadLayerAdhCmp->GetValue() )
-        PadLayerMask |= ADHESIVE_LAYER_CMP;
-    if( m_PadLayerAdhCu->GetValue() )
-        PadLayerMask |= ADHESIVE_LAYER_CU;
-    if( m_PadLayerPateCmp->GetValue() )
-        PadLayerMask |= SOLDERPASTE_LAYER_CMP;
-    if( m_PadLayerPateCu->GetValue() )
-        PadLayerMask |= SOLDERPASTE_LAYER_CU;
-    if( m_PadLayerSilkCmp->GetValue() )
-        PadLayerMask |= SILKSCREEN_LAYER_CMP;
-    if( m_PadLayerSilkCu->GetValue() )
-        PadLayerMask |= SILKSCREEN_LAYER_CU;
-    if( m_PadLayerMaskCmp->GetValue() )
-        PadLayerMask |= SOLDERMASK_LAYER_CMP;
-    if( m_PadLayerMaskCu->GetValue() )
-        PadLayerMask |= SOLDERMASK_LAYER_CU;
-    if( m_PadLayerECO1->GetValue() )
-        PadLayerMask |= ECO1_LAYER;
-    if( m_PadLayerECO2->GetValue() )
-        PadLayerMask |= ECO2_LAYER;
-    if( m_PadLayerDraft->GetValue() )
-        PadLayerMask |= DRAW_LAYER;
-
-    g_Pad_Master.m_Masque_Layer = PadLayerMask;
-
-    if( CurrentPad )   // Set Pad Name & Num
-    {
-        m_Parent->SaveCopyInUndoList( m_Parent->m_Pcb->m_Modules );
-        MODULE* Module;
-        Module = (MODULE*) CurrentPad->m_Parent;
-        Module->m_LastEdit_Time = time( NULL );
-
-        if( m_DC )// redraw the area where the pas was, without pad
-		{
-			CurrentPad->m_Flags |= DO_NOT_DRAW;
-			m_Parent->DrawPanel->PostDirtyRect( CurrentPad->GetBoundingBox() );
-			CurrentPad->m_Flags &= ~DO_NOT_DRAW;
-		}
-        CurrentPad->m_PadShape = g_Pad_Master.m_PadShape;
-        CurrentPad->m_Attribut = g_Pad_Master.m_Attribut;
-        if (CurrentPad->m_Pos != g_Pad_Master.m_Pos )
-        {
-            CurrentPad->m_Pos = g_Pad_Master.m_Pos;
-            RastnestIsChanged = true;
-        }
-
-        /* compute the pos 0 value, i.e. pad position for module orient = 0 i.e.
-         *  refer to module origin (module position) */
-        CurrentPad->m_Pos0    = CurrentPad->m_Pos;
-        CurrentPad->m_Pos0.x -= Module->m_Pos.x;
-        CurrentPad->m_Pos0.y -= Module->m_Pos.y;
-        CurrentPad->m_Orient  = g_Pad_Master.m_Orient + Module->m_Orient;
-        RotatePoint( &CurrentPad->m_Pos0.x, &CurrentPad->m_Pos0.y, -Module->m_Orient );
-
-        CurrentPad->m_Size         = g_Pad_Master.m_Size;
-        CurrentPad->m_DeltaSize    = g_Pad_Master.m_DeltaSize;
-        CurrentPad->m_Drill        = g_Pad_Master.m_Drill;
-        CurrentPad->m_DrillShape   = g_Pad_Master.m_DrillShape;
-        CurrentPad->m_Offset       = g_Pad_Master.m_Offset;
-        if ( CurrentPad->m_Masque_Layer != g_Pad_Master.m_Masque_Layer )
-        {
-            RastnestIsChanged = true;
-            CurrentPad->m_Masque_Layer = g_Pad_Master.m_Masque_Layer;
-        }
-        CurrentPad->SetPadName( g_Current_PadName );
-
-        if ( CurrentPad->m_Netname != Current_PadNetName )
-        {
-            if( Current_PadNetName.IsEmpty() )
-                CurrentPad->SetNet( 0 );
-            else
-            {
-                const EQUIPOT* net = m_Parent->m_Pcb->FindNet( Current_PadNetName );
-                if ( net )
-                {
-                    RastnestIsChanged = true;
-                    CurrentPad->m_Netname = Current_PadNetName;
-                    CurrentPad->SetNet(net->GetNet());
-                }
-                else
-                    DisplayError(this, _("Unknown netname, no change"));
-            }
-        }
-
-        switch( CurrentPad->m_PadShape )
-        {
-        case PAD_CIRCLE:
-            CurrentPad->m_DeltaSize = wxSize( 0, 0 );
-            CurrentPad->m_Size.y    = CurrentPad->m_Size.x;
-            break;
-
-        case PAD_RECT:
-            CurrentPad->m_DeltaSize = wxSize( 0, 0 );
-            break;
-
-        case PAD_OVAL:
-            CurrentPad->m_DeltaSize = wxSize( 0, 0 );
-            break;
-
-        case PAD_TRAPEZOID:
-            break;
-        }
-
-        switch( CurrentPad->m_Attribut )
-        {
-        case PAD_STANDARD:
-            break;
-
-        case PAD_CONN:
-        case PAD_SMD:
-            CurrentPad->m_Offset = wxSize( 0, 0 );
-            CurrentPad->m_Drill  = wxSize( 0, 0 );
-            break;
-
-        case PAD_HOLE_NOT_PLATED:
-            break;
-
-        default:
-            DisplayError(this, wxT("Error: unknown pad type"));
-            break;
-        }
-
-        CurrentPad->ComputeRayon();
-
-        Module->Set_Rectangle_Encadrement();
-        CurrentPad->Display_Infos( m_Parent );
-        if( m_DC )// redraw the area where the pas was
-			m_Parent->DrawPanel->PostDirtyRect( CurrentPad->GetBoundingBox() );
-        m_Parent->GetScreen()->SetModify();
-    }
-
-    Close();
-
-    if( m_DC )
-        m_Parent->DrawPanel->CursorOn( m_DC );
-    if ( RastnestIsChanged )	// The net ratsnest must be recalculated
-        m_Parent->m_Pcb->m_Status_Pcb = 0;
-
-
-}
diff --git a/pcbnew/makefile.include b/pcbnew/makefile.include
index c226373d90..3b85824390 100644
--- a/pcbnew/makefile.include
+++ b/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)
diff --git a/pcbnew/pcbcfg.h b/pcbnew/pcbcfg.h
index 4b29ca1e57..318e77524f 100644
--- a/pcbnew/pcbcfg.h
+++ b/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,
diff --git a/template/kicad.pro b/template/kicad.pro
index 76b0185e40..333476ed6a 100644
--- a/template/kicad.pro
+++ b/template/kicad.pro
@@ -1,4 +1,4 @@
-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