EESchema UI normalization and configuration updates and Gerbview parser bug fix.

* All - add wxList implementation for dynamic declaration of application settings.
* EESchema: remove non-standard fonts and dialog button text colors from all UI controls.
* EESchema: update project file and application settings from static to dynamic method.
* EESchema: save and restore show hidden pins state between sessions.
* EESchema: global variable reductions.
* EESchema: use EVT_UPDATE_UI instead of SetToolbars() to set control states.
* EESchema: remove unused DialogBlocks BOM dialog project file.
* GerbView: remove non-standard fonts and dialog button text colors from all UI controls.
* GerbView: fix infinite loop when parsing RS274X aperture definitions with whitespace.
* GerbView: add file name to export to PCBNew select layer dialog.

common/base_screen.cpp

@@ -116,7 +116,9 @@ wxPoint BASE_SCREEN::CursorRealPosition( const wxPoint& ScreenPos )
     wxPoint curpos = ScreenPos;
     Unscale( curpos );
 
+#ifndef WX_ZOOM
     curpos += m_DrawOrg;
+#endif
 
     return curpos;
 }

common/displlst.cpp

@@ -57,7 +57,6 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
     m_MoveFct  = movefct;
     m_WinMsg   = NULL;
     SetReturnCode( -1 );
-    SetFont( *g_DialogFont );
 
     if( itemlist )
         for( names = m_ItemList, ii = 0; *names != NULL; names++ )
@@ -114,9 +113,10 @@ WinEDAListBox::WinEDAListBox( WinEDA_DrawFrame* parent, const wxString& title,
 
     if( m_MoveFct )
     {
-        size.x   = -1; size.y = 60;
-        m_WinMsg = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition, size,
-                                   wxTE_READONLY | wxTE_MULTILINE );
+        size.x   = -1;
+        size.y   = 60;
+        m_WinMsg = new wxTextCtrl( this, -1, wxEmptyString, wxDefaultPosition,
+                                   size, wxTE_READONLY | wxTE_MULTILINE );
 
         GeneralBoxSizer->Add( m_WinMsg, 0, wxGROW | wxALL, 5 );
     }

common/drawframe.cpp

@@ -630,6 +630,11 @@ void WinEDA_DrawFrame::AdjustScrollBars()
                               screen->m_ScrollbarNumber.y,
                               screen->m_ScrollbarPos.x,
                               screen->m_ScrollbarPos.y, TRUE );
+#else
+    BASE_SCREEN* screen = GetBaseScreen();
+    wxSize drawingSize = screen->ReturnPageSize() * 2;
+    DrawPanel->SetScrollbars( 1, 1, drawingSize.x, drawingSize.y,
+                              screen->m_Curseur.x, screen->m_Curseur.y, true );
 #endif
 }
 

common/drawpanel.cpp

@@ -222,7 +222,16 @@ wxPoint WinEDA_DrawPanel::CursorRealPosition( const wxPoint& ScreenPos )
  * @param  ScreenPos = absolute position in pixels
  */
 {
+#ifdef WX_ZOOM
+    wxCoord x, y;
+    wxClientDC DC( this );
+    PrepareGraphicContext( &DC );
+    x = DC.DeviceToLogicalX( ScreenPos.x );
+    y = DC.DeviceToLogicalY( ScreenPos.y );
+    return wxPoint( x, y );
+#else
     return GetScreen()->CursorRealPosition( ScreenPos );
+#endif
 }
 
 
@@ -323,17 +332,23 @@ void WinEDA_DrawPanel::ConvertPcbUnitsToPixelsUnits( wxPoint* aPosition )
 }
 
 
-/********************************************************/
-wxPoint WinEDA_DrawPanel::CursorScreenPosition()
-/********************************************************/
-
 /** Function CursorScreenPosition
  * @return the cursor current position in pixels in the screen draw area
  */
+wxPoint WinEDA_DrawPanel::CursorScreenPosition()
 {
+#ifdef WX_ZOOM
+    wxCoord x, y;
+    wxClientDC DC( this );
+    PrepareGraphicContext( &DC );
+    x = DC.LogicalToDeviceX( GetScreen()->m_Curseur.x );
+    y = DC.LogicalToDeviceY( GetScreen()->m_Curseur.y );
+    return wxPoint( x, y );
+#else
     wxPoint pos = GetScreen()->m_Curseur - GetScreen()->m_DrawOrg;
     GetScreen()->Scale( pos );
     return pos;
+#endif
 }
 
 
@@ -352,8 +367,16 @@ wxPoint WinEDA_DrawPanel::GetScreenCenterRealPosition( void )
     realpos = CalcUnscrolledPosition( wxPoint( size.x, size.y ) );
 
     GetScreen()->Unscale( realpos );
+#ifdef WX_ZOOM
+    wxCoord x, y;
+    wxClientDC DC( this );
+    PrepareGraphicContext( &DC );
+    x = DC.DeviceToLogicalX( realpos.x );
+    y = DC.DeviceToLogicalY( realpos.y );
+    return wxPoint( x, y );
+#else
     realpos += GetScreen()->m_DrawOrg;
-
+#endif
     return realpos;
 }
 
@@ -648,6 +671,10 @@ void WinEDA_DrawPanel::OnPaint( wxPaintEvent& event )
         wxDCClipper dcclip( paintDC, PaintClipBox );
 
         ReDraw( &paintDC, true );
+
+#ifdef WX_ZOOM
+        paintDC.SetUserScale( 1.0, 1.0 );
+#endif
     }
 
     m_ClipBox = tmp;
@@ -1284,7 +1311,11 @@ void WinEDA_DrawPanel::OnKeyEvent( wxKeyEvent& event )
     }
 
     /* Some key commands use the current mouse position: refresh it */
+#ifdef WX_ZOOM
+    pos = CalcUnscrolledPosition( wxGetMousePosition() );
+#else
     pos = CalcUnscrolledPosition( wxGetMousePosition() - GetScreenPosition() );
+#endif
 
     /* Compute absolute mouse position in pixel units (i.e. considering the
        current scroll) : */

common/edaappl.cpp

@@ -697,6 +697,7 @@ void WinEDA_App::SaveSettings()
     m_EDA_Config->Write( wxT( "FixedFontSize" ), g_FixedFontPointSize );
     m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits );
     m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() );
+    m_EDA_Config->Write( wxT( "BgColor" ), g_DrawBgColor );
 #endif // wxCHECK_VERSION
 
     /* Save the file history list */

common/get_component_dialog.cpp

@@ -86,7 +86,6 @@ WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent,
     m_AuxTool = show_extra_tool;
     m_GetExtraFunction = FALSE;
 
-    SetFont( *g_DialogFont );
     s_ItemName.Empty();
     m_Text = &s_ItemName;
 
@@ -122,7 +121,6 @@ WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent,
                        5 );
 
     Button = new wxButton( this, ID_ACCEPT_NAME, _( "OK" ) );
-    Button->SetForegroundColour( *wxRED );
     Button->SetDefault();
     RightBoxSizer->Add( Button,
                         0,
@@ -130,22 +128,18 @@ WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent,
                         5 );
 
     Button = new wxButton( this, ID_ACCEPT_KEYWORD, _( "Search KeyWord" ) );
-    Button->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
 
     Button = new wxButton( this, ID_CANCEL, _( "Cancel" ) );
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
 
     Button = new wxButton( this, ID_LIST_ALL, _( "List All" ) );
-    Button->SetForegroundColour( wxColor( 0, 80, 0 ) );
     RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
 
 #ifndef __WXMAC__
     if( m_AuxTool )     /* The selection can be done by an extra function */
     {
         Button = new wxButton( this, ID_EXTRA_TOOL, _( "By Lib Browser" ) );
-        Button->SetForegroundColour( wxColor( 0, 0, 0 ) ); // Listbox Color
         RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
     }
 #endif

common/projet_config.cpp

@@ -246,7 +246,6 @@ void WinEDA_App::SaveCurrentSetupValues( PARAM_CFG_BASE** aList )
  */
 {
     PARAM_CFG_BASE* pt_cfg;
-    wxString        msg;
 
     if( m_EDA_Config == NULL )
         return;
@@ -268,6 +267,32 @@ void WinEDA_App::SaveCurrentSetupValues( PARAM_CFG_BASE** aList )
 }
 
 
+void WinEDA_App::SaveCurrentSetupValues( const PARAM_CFG_ARRAY& List )
+{
+    size_t          i;
+    PARAM_CFG_BASE* pt_cfg;
+
+    if( m_EDA_Config == NULL )
+        return;
+
+    for( i = 0; i < List.GetCount(); i++ )
+    {
+        pt_cfg = &List[i];
+
+        if( pt_cfg->m_Setup == false )
+            continue;
+
+        if ( pt_cfg->m_Type == PARAM_COMMAND_ERASE )    // Erase all data
+        {
+            if( pt_cfg->m_Ident )
+                m_EDA_Config->DeleteGroup( pt_cfg->m_Ident );
+        }
+        else
+            pt_cfg->SaveParam( m_EDA_Config );
+    }
+}
+
+
 /** Function ReadProjectConfig
  *  Read the current "projet" parameters
  *  Parameters are parameters that have the .m_Setup member set to false
@@ -410,6 +435,23 @@ void WinEDA_App::ReadCurrentSetupValues( PARAM_CFG_BASE** aList )
 }
 
 
+void WinEDA_App::ReadCurrentSetupValues( const PARAM_CFG_ARRAY& List )
+{
+    size_t          i;
+    PARAM_CFG_BASE* pt_cfg;
+
+    for( i = 0; i < List.GetCount(); i++ )
+    {
+        pt_cfg = &List[i];
+
+        if( pt_cfg->m_Setup == false )
+            continue;
+
+        pt_cfg->ReadParam( m_EDA_Config );
+    }
+}
+
+
 /**************************************************************/
 /* Constructeurs des descripteurs de structs de configuration */
 /**************************************************************/

eeschema/annotate_dialog.cpp

@@ -137,7 +137,7 @@ void WinEDA_AnnotateFrame::Init()
 void WinEDA_AnnotateFrame::CreateControls()
 {
 ////@begin WinEDA_AnnotateFrame content construction
-    // Generated by DialogBlocks, 21/04/2008 16:47:55 (unregistered)
+    // Generated by DialogBlocks, 29/04/2009 13:38:10 (unregistered)
 
     WinEDA_AnnotateFrame* itemDialog1 = this;
 
@@ -145,11 +145,10 @@ void WinEDA_AnnotateFrame::CreateControls()
     itemDialog1->SetSizer(itemBoxSizer2);
 
     wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5);
 
     wxStaticText* itemStaticText4 = new wxStaticText( itemDialog1, wxID_STATIC, _("Scope"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText4->SetForegroundColour(wxColour(0, 128, 64));
-    itemStaticText4->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+    itemStaticText4->SetFont(wxFont(int(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize()*1.2), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFaceName()));
     itemBoxSizer3->Add(itemStaticText4, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
@@ -174,46 +173,42 @@ void WinEDA_AnnotateFrame::CreateControls()
     m_rbResetAnnotation->SetValue(false);
     itemBoxSizer5->Add(m_rbResetAnnotation, 0, wxGROW|wxALL, 5);
 
-    wxStaticLine* itemStaticLine11 = new wxStaticLine( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer3->Add(itemStaticLine11, 0, wxGROW|wxALL, 5);
+    wxStaticText* itemStaticText11 = new wxStaticText( itemDialog1, wxID_STATIC, _("Order"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText11->SetFont(wxFont(int(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize()*1.2), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFaceName()));
+    itemBoxSizer3->Add(itemStaticText11, 0, wxALIGN_LEFT|wxALL, 5);
 
-    wxStaticText* itemStaticText12 = new wxStaticText( itemDialog1, wxID_STATIC, _("Order"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText12->SetForegroundColour(wxColour(125, 2, 12));
-    itemStaticText12->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
-    itemBoxSizer3->Add(itemStaticText12, 0, wxALIGN_LEFT|wxALL, 5);
+    wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer3->Add(itemBoxSizer12, 0, wxGROW|wxLEFT, 25);
 
-    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer13, 0, wxGROW|wxLEFT, 25);
+    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer12->Add(itemBoxSizer13, 0, wxGROW, 5);
 
-    wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer13->Add(itemBoxSizer14, 0, wxGROW, 5);
+    wxStaticBitmap* itemStaticBitmap14 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("annotate_down_right_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer13->Add(itemStaticBitmap14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxStaticBitmap* itemStaticBitmap15 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("annotate_down_right_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer14->Add(itemStaticBitmap15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    m_rbSortBy_X_Position = new wxRadioButton( itemDialog1, ID_SORT_BY_X_POSITION, _("Sort Components by &X Position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_rbSortBy_X_Position = new wxRadioButton( itemDialog1, ID_SORT_BY_X_POSITION, _("Sort components by &X position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
     m_rbSortBy_X_Position->SetValue(true);
-    itemBoxSizer14->Add(m_rbSortBy_X_Position, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer13->Add(m_rbSortBy_X_Position, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer13->Add(itemBoxSizer17, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer12->Add(itemBoxSizer16, 0, wxGROW, 5);
 
-    wxStaticBitmap* itemStaticBitmap18 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("annotate_right_down_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer17->Add(itemStaticBitmap18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticBitmap* itemStaticBitmap17 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("annotate_right_down_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer16->Add(itemStaticBitmap17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_rbSortBy_Y_Position = new wxRadioButton( itemDialog1, ID_SORT_BY_Y_POSITION, _("Sort Components by &Y Position"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_rbSortBy_Y_Position = new wxRadioButton( itemDialog1, ID_SORT_BY_Y_POSITION, _("Sort components by &Y position"), wxDefaultPosition, wxDefaultSize, 0 );
     m_rbSortBy_Y_Position->SetValue(false);
-    itemBoxSizer17->Add(m_rbSortBy_Y_Position, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer16->Add(m_rbSortBy_Y_Position, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer13->Add(itemBoxSizer20, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer12->Add(itemBoxSizer19, 0, wxGROW, 5);
 
-    wxStaticBitmap* itemStaticBitmap21 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("add_text_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer20->Add(itemStaticBitmap21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticBitmap* itemStaticBitmap20 = new wxStaticBitmap( itemDialog1, wxID_STATIC, itemDialog1->GetBitmapResource(wxT("add_text_xpm")), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer19->Add(itemStaticBitmap20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    rbSortByValue = new wxRadioButton( itemDialog1, ID_SORT_BY_VALUE, _("Sort Components by &Value"), wxDefaultPosition, wxDefaultSize, 0 );
+    rbSortByValue = new wxRadioButton( itemDialog1, ID_SORT_BY_VALUE, _("Sort components by &value"), wxDefaultPosition, wxDefaultSize, 0 );
     rbSortByValue->SetValue(false);
-    itemBoxSizer20->Add(rbSortByValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer19->Add(rbSortByValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     sizerDialogButtons = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer2->Add(sizerDialogButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
@@ -223,12 +218,10 @@ void WinEDA_AnnotateFrame::CreateControls()
     sizerDialogButtons->Add(m_btnClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_btnClear = new wxButton( itemDialog1, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnClear->SetForegroundColour(wxColour(0, 0, 230));
     sizerDialogButtons->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_btnApply = new wxButton( itemDialog1, wxID_APPLY, _("Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
     m_btnApply->SetDefault();
-    m_btnApply->SetForegroundColour(wxColour(198, 0, 0));
     sizerDialogButtons->Add(m_btnApply, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 ////@end WinEDA_AnnotateFrame content construction

eeschema/annotate_dialog.h

@@ -32,7 +32,6 @@
 
 ////@begin forward declarations
 class wxBoxSizer;
-class WinEDA_SchematicFrame;
 ////@end forward declarations
 
 /*!

eeschema/class_pin.cpp

@@ -246,7 +246,7 @@ void LibDrawPin::Draw( WinEDA_DrawPanel* aPanel,
     {
         if( frame->m_LibeditFrame && frame->m_LibeditFrame->IsActive() )
             aColor = g_InvisibleItemColor;
-        else if( !g_ShowAllPins )
+        else if( !frame->m_ShowAllPins )
             return;
     }
 

eeschema/dialog_SVG_print.cpp

@@ -84,13 +84,11 @@ DIALOG_SVG_PRINT::DIALOG_SVG_PRINT( WinEDA_DrawFrame* parent )
 void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event )
 /*************************************************************/
 {
-    SetFont( *g_DialogFont );
     SetFocus();     // Make ESC key working
 
     m_ImageXSize_mm = 270;
     if( m_Config )
     {
-        m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &g_PlotLine_Width );
         m_Config->Read( PLOTSVGMODECOLOR_KEY, &s_PlotBlackAndWhite );
     }
 
@@ -294,7 +292,6 @@ void DIALOG_SVG_PRINT::OnCloseWindow( wxCloseEvent& event )
     if( m_Config )
     {
         s_PlotBlackAndWhite = m_ModeColorOption->GetSelection();
-        m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE, g_PlotLine_Width );
         m_Config->Write( PLOTSVGMODECOLOR_KEY, s_PlotBlackAndWhite );
     }
     EndModal( 0 );

eeschema/dialog_build_BOM_base.cpp

@@ -130,13 +130,9 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c
 	
 	m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetForegroundColour( wxColour( 170, 0, 0 ) );
-	
 	bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonCANCEL->SetForegroundColour( wxColour( 11, 0, 202 ) );
-	
 	bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	bMainSizer->Add( bRightSizer, 8, wxALL|wxEXPAND, 5 );

eeschema/dialog_build_BOM_base.fbp

@@ -1127,7 +1127,7 @@
                                 <property name="context_help"></property>
                                 <property name="default">1</property>
                                 <property name="enabled">1</property>
-                                <property name="fg">170,0,0</property>
+                                <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_OK</property>
@@ -1179,7 +1179,7 @@
                                 <property name="context_help"></property>
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg">11,0,202</property>
+                                <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_CANCEL</property>

eeschema/dialog_cmp_graphic_properties.cpp

@@ -139,10 +139,8 @@ bool WinEDA_bodygraphics_PropertiesFrame::Create( wxWindow* parent, wxWindowID i
 
 void WinEDA_bodygraphics_PropertiesFrame::CreateControls()
 {
-	SetFont(*g_DialogFont);
-
 ////@begin WinEDA_bodygraphics_PropertiesFrame content construction
-    // Generated by DialogBlocks, 29/04/2008 21:07:12 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:19:31 (unregistered)
 
     WinEDA_bodygraphics_PropertiesFrame* itemDialog1 = this;
 
@@ -177,11 +175,9 @@ void WinEDA_bodygraphics_PropertiesFrame::CreateControls()
 
     wxButton* itemButton9 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton9->SetDefault();
-    itemButton9->SetForegroundColour(wxColour(206, 0, 0));
     itemBoxSizer8->Add(itemButton9, 0, wxGROW|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer8->Add(m_btClose, 0, wxGROW|wxALL, 5);
 
 ////@end WinEDA_bodygraphics_PropertiesFrame content construction

eeschema/dialog_cmp_graphic_properties.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -136,7 +138,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
-        <long name="makefile-last-written">0</long>
+        <long name="makefile-last-written">-8519680</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -609,7 +614,7 @@
                 <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">"CE0000"</string>
+                <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
@@ -676,7 +681,7 @@
                 <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-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>

eeschema/dialog_create_component.cpp

@@ -130,10 +130,8 @@ void WinEDA_CreateCmpDialog::SetComponentData( EDA_LibComponentStruct & componen
 
 void WinEDA_CreateCmpDialog::CreateControls()
 {
-	SetFont(*g_DialogFont);
-
 ////@begin WinEDA_CreateCmpDialog content construction
-    // Generated by DialogBlocks, 29/04/2008 21:00:24 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:20:19 (unregistered)
 
     WinEDA_CreateCmpDialog* itemDialog1 = this;
 
@@ -173,7 +171,7 @@ void WinEDA_CreateCmpDialog::CreateControls()
     m_AsConvert->SetValue(false);
     itemStaticBoxSizer11->Add(m_AsConvert, 0, wxALIGN_LEFT|wxALL, 5);
 
-    m_IsPowerSymbol = new wxCheckBox( itemDialog1, ID_CHECKBOX4, _("Power symbol"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_IsPowerSymbol = new wxCheckBox( itemDialog1, ID_CHECKBOX4, _("Power Symbol"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_IsPowerSymbol->SetValue(false);
     itemStaticBoxSizer11->Add(m_IsPowerSymbol, 0, wxALIGN_LEFT|wxALL, 5);
 
@@ -186,11 +184,9 @@ void WinEDA_CreateCmpDialog::CreateControls()
 
     wxButton* itemButton16 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton16->SetDefault();
-    itemButton16->SetForegroundColour(wxColour(188, 0, 0));
     itemBoxSizer15->Add(itemButton16, 0, wxGROW|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 221));
     itemBoxSizer15->Add(m_btClose, 0, wxGROW|wxALL, 5);
 
     wxStaticLine* itemStaticLine18 = new wxStaticLine( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxDOUBLE_BORDER );

eeschema/dialog_create_component.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -136,7 +138,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
-        <long name="makefile-last-written">0</long>
+        <long name="makefile-last-written">-8519680</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
         <document>
           <string name="title">"GCC Release"</string>
           <string name="type">"gcc-config-data-document"</string>
@@ -191,7 +196,7 @@
           <long name="locked">0</long>
           <string name="template-name">"GCC"</string>
           <bool name="dirty">1</bool>
-          <long name="makefile-last-written">0</long>
+          <long name="makefile-last-written">-8519680</long>
           <string name="Compiler name">"GCC"</string>
           <string name="Build mode">"Release"</string>
           <string name="Unicode mode">"ANSI"</string>
@@ -215,6 +220,7 @@
           <string name="Compiler location">"%AUTO%"</string>
           <string name="wxWidgets location">"%AUTO%"</string>
           <string name="C++ command">"%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>
@@ -226,6 +232,7 @@
           <string name="Optimizations">"%AUTO%"</string>
           <string name="Warnings">"%AUTO%"</string>
           <string name="Debug flags">"%AUTO%"</string>
+          <string name="Extra compile flags">"%AUTO%"</string>
           <string name="Libraries">"%AUTO%"</string>
           <string name="Library path">"%AUTO%"</string>
           <string name="Linker flags">"%AUTO%"</string>
@@ -238,6 +245,7 @@
           <string name="PATH variable">"%AUTO%"</string>
           <bool name="Suppress source rules">0</bool>
           <bool name="Enable makefile generation">1</bool>
+          <string name="CFG">""</string>
           <string name="Command for wx-config">"%AUTO%"</string>
           <string name="SDK path">"%AUTO%"</string>
           <string name="Minimum OS version">"%AUTO%"</string>
@@ -986,7 +994,7 @@
                   <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">"BC0000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -1053,7 +1061,7 @@
                   <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">"0000DD"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>

eeschema/dialog_edit_component_in_lib.cpp

@@ -117,10 +117,8 @@ bool WinEDA_PartPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const
 
 void WinEDA_PartPropertiesFrame::CreateControls()
 {
-	SetFont(*g_DialogFont);
-
 ////@begin WinEDA_PartPropertiesFrame content construction
-    // Generated by DialogBlocks, 29/04/2008 21:32:37 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:21:42 (unregistered)
 
     WinEDA_PartPropertiesFrame* itemDialog1 = this;
 
@@ -141,7 +139,7 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     m_PanelBasicBoxSizer->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALL, 5);
     wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
     itemBoxSizer7->Add(itemBoxSizer8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of units:"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText* itemStaticText9 = new wxStaticText( m_PanelBasic, wxID_STATIC, _("Number of Units:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     SelNumberOfUnits = new wxSpinCtrl( m_PanelBasic, ID_SPINCTRL1, _T("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 16, 1 );
@@ -155,7 +153,7 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     m_SetSkew = new wxSpinCtrl( m_PanelBasic, ID_SPINCTRL, _T("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0 );
     itemBoxSizer11->Add(m_SetSkew, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    m_OptionPower = new wxCheckBox( m_PanelBasic, ID_CHECKBOX, _("Power symbol"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_OptionPower = new wxCheckBox( m_PanelBasic, ID_CHECKBOX, _("Power Symbol"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_OptionPower->SetValue(false);
     m_PanelBasicBoxSizer->Add(m_OptionPower, 0, wxGROW|wxALL, 5);
 
@@ -170,21 +168,18 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     m_PanelDoc->SetSizer(m_PanelDocBoxSizer);
 
     wxStaticText* itemStaticText18 = new wxStaticText( m_PanelDoc, wxID_STATIC, _("Doc:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText18->SetForegroundColour(wxColour(196, 0, 0));
     m_PanelDocBoxSizer->Add(itemStaticText18, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_Doc = new wxTextCtrl( m_PanelDoc, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     m_PanelDocBoxSizer->Add(m_Doc, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
     wxStaticText* itemStaticText20 = new wxStaticText( m_PanelDoc, wxID_STATIC, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText20->SetForegroundColour(wxColour(196, 0, 0));
     m_PanelDocBoxSizer->Add(itemStaticText20, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_Keywords = new wxTextCtrl( m_PanelDoc, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     m_PanelDocBoxSizer->Add(m_Keywords, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
     wxStaticText* itemStaticText22 = new wxStaticText( m_PanelDoc, wxID_STATIC, _("DocFileName:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText22->SetForegroundColour(wxColour(196, 0, 0));
     m_PanelDocBoxSizer->Add(itemStaticText22, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
     m_Docfile = new wxTextCtrl( m_PanelDoc, ID_TEXTCTRL2, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
@@ -193,11 +188,9 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL);
     m_PanelDocBoxSizer->Add(itemBoxSizer24, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
     m_ButtonCopyDoc = new wxButton( m_PanelDoc, ID_COPY_DOC_TO_ALIAS, _("Copy Doc"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_ButtonCopyDoc->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer24->Add(m_ButtonCopyDoc, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton26 = new wxButton( m_PanelDoc, ID_BROWSE_DOC_FILES, _("Browse DocFiles"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton26->SetForegroundColour(wxColour(202, 0, 0));
     itemBoxSizer24->Add(itemButton26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_NoteBook->AddPage(m_PanelDoc, _("Doc"));
@@ -212,12 +205,10 @@ void WinEDA_PartPropertiesFrame::CreateControls()
     m_GeneralBoxSizer->Add(itemBoxSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer28->Add(m_btClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton30 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton30->SetDefault();
-    itemButton30->SetForegroundColour(wxColour(202, 0, 0));
     itemBoxSizer28->Add(itemButton30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 ////@end WinEDA_PartPropertiesFrame content construction

eeschema/dialog_edit_component_in_lib.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -136,7 +138,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
-        <long name="makefile-last-written">0</long>
+        <long name="makefile-last-written">-8519680</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -1120,7 +1125,7 @@
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">"C40000"</string>
+                    <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
                     <bool name="proxy-Hidden">0</bool>
                     <bool name="proxy-Enabled">1</bool>
@@ -1273,7 +1278,7 @@
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">"C40000"</string>
+                    <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
                     <bool name="proxy-Hidden">0</bool>
                     <bool name="proxy-Enabled">1</bool>
@@ -1426,7 +1431,7 @@
                     <string name="proxy-Help text">""</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">"C40000"</string>
+                    <string name="proxy-Foreground colour">""</string>
                     <string name="proxy-Font">""</string>
                     <bool name="proxy-Hidden">0</bool>
                     <bool name="proxy-Enabled">1</bool>
@@ -1612,7 +1617,7 @@
                       <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-Foreground colour">""</string>
                       <string name="proxy-Font">""</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>
@@ -1679,7 +1684,7 @@
                       <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">"CA0000"</string>
+                      <string name="proxy-Foreground colour">""</string>
                       <string name="proxy-Font">""</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>
@@ -1851,7 +1856,7 @@
                 <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-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
@@ -1918,7 +1923,7 @@
                 <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">"CA0000"</string>
+                <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>

eeschema/dialog_edit_label_base.cpp

@@ -74,13 +74,9 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
 	bSizer4->Add( 8, 8, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonOK->SetForegroundColour( wxColour( 234, 0, 0 ) );
-	
 	bSizer4->Add( m_buttonOK, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonCANCEL->SetForegroundColour( wxColour( 0, 0, 187 ) );
-	
 	bSizer4->Add( m_buttonCANCEL, 1, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	bMainSizer->Add( bSizer4, 1, 0, 5 );

eeschema/dialog_edit_label_base.fbp

@@ -499,7 +499,7 @@
                                 <property name="context_help"></property>
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg">234,0,0</property>
+                                <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_OK</property>
@@ -551,7 +551,7 @@
                                 <property name="context_help"></property>
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg">0,0,187</property>
+                                <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_CANCEL</property>

eeschema/dialog_edit_libentry_fields_in_lib.cpp

@@ -142,7 +142,6 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB()
 void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnInitDialog( wxInitDialogEvent& event )
 /**********************************************************************************/
 {
-    SetFont( *g_DialogFont );
     m_skipCopyFromPanel = false;
     wxListItem columnLabel;
 

eeschema/dialog_eeschema_config.cpp

@@ -87,12 +87,11 @@ DIALOG_EESCHEMA_CONFIG::DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame* parent )
 void DIALOG_EESCHEMA_CONFIG::Init()
 /***********************************/
 {
-    SetFont( *g_DialogFont );
     SetFocus();
 
     m_LibListChanged = false;
     m_LibPathChanged = false;
-    m_UserLibDirBufferImg = g_UserLibDirBuffer;         // Save the original lib path
+    m_UserLibDirBufferImg = m_Parent->m_UserLibraryPath;         // Save the original lib path
 
     // Display current files extension (info)
     wxString msg = m_InfoCmpFileExt->GetLabel() + g_NetCmpExtBuffer;
@@ -127,11 +126,11 @@ void DIALOG_EESCHEMA_CONFIG::Init()
 
     m_NetFormatBox->InsertItems( NetlistNameItems, 0 );
 
-    if( g_NetFormat > (int) m_NetFormatBox->GetCount() )
-        g_NetFormat = NET_TYPE_PCBNEW;
-    m_NetFormatBox->SetSelection( g_NetFormat - NET_TYPE_PCBNEW );
+    if( m_Parent->m_NetlistFormat > (int) m_NetFormatBox->GetCount() )
+        m_Parent->m_NetlistFormat = NET_TYPE_PCBNEW;
+    m_NetFormatBox->SetSelection( m_Parent->m_NetlistFormat - NET_TYPE_PCBNEW );
 
-    m_ListLibr->InsertItems( g_LibName_List, 0 );
+    m_ListLibr->InsertItems( m_Parent->m_ComponentLibFiles, 0 );
 
     // Load user libs paths:
     wxStringTokenizer Token( m_UserLibDirBufferImg, wxT( ";\n\r" ) );
@@ -164,7 +163,7 @@ void DIALOG_EESCHEMA_CONFIG::OnCancelClick( wxCommandEvent& event )
     {
         for ( unsigned ii = 0; ii < m_ListLibr->GetCount(); ii ++ )
             wxGetApp().RemoveLibraryPath( m_listUserPaths->GetString(ii)) ;
-        wxGetApp().InsertLibraryPath( g_UserLibDirBuffer, 1);
+        wxGetApp().InsertLibraryPath( m_Parent->m_UserLibraryPath, 1);
     }
     EndModal( -1 );
 }
@@ -175,17 +174,17 @@ void DIALOG_EESCHEMA_CONFIG::OnOkClick( wxCommandEvent& event )
 /**************************************************************/
 {
     // Set new netlist format
-    g_NetFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW;
+    m_Parent->m_NetlistFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW;
 
     // Recreate the user lib path
     if ( m_LibPathChanged )
     {
-        g_UserLibDirBuffer.Empty();
+        m_Parent->m_UserLibraryPath.Empty();
         for ( unsigned ii = 0; ii < m_listUserPaths->GetCount(); ii ++ )
         {
             if ( ii > 0 )
-                g_UserLibDirBuffer << wxT(";");
-            g_UserLibDirBuffer << m_listUserPaths->GetString(ii);
+                m_Parent->m_UserLibraryPath << wxT(";");
+            m_Parent->m_UserLibraryPath << m_listUserPaths->GetString(ii);
         }
     }
 
@@ -194,9 +193,9 @@ void DIALOG_EESCHEMA_CONFIG::OnOkClick( wxCommandEvent& event )
     if( m_LibListChanged || m_LibPathChanged )
     {
         // Recreate lib list
-        g_LibName_List.Clear();
+        m_Parent->m_ComponentLibFiles.Clear();
         for ( unsigned ii = 0; ii < m_ListLibr->GetCount(); ii ++ )
-            g_LibName_List.Add(m_ListLibr->GetString(ii) );
+            m_Parent->m_ComponentLibFiles.Add(m_ListLibr->GetString(ii) );
 
         // take new list in account
         LoadLibraries( m_Parent );
@@ -220,7 +219,7 @@ void DIALOG_EESCHEMA_CONFIG::OnCloseWindow( wxCloseEvent& event )
 void DIALOG_EESCHEMA_CONFIG::OnRemoveLibClick( wxCommandEvent& event )
 /*********************************************************************/
 /* Remove a library to the library list.
- * The real list (g_LibName_List) is not changed, so the change can be cancelled
+ * The real list (m_Parent->m_ComponentLibFiles) is not changed, so the change can be cancelled
  */
 {
     int ii;
@@ -241,7 +240,8 @@ void DIALOG_EESCHEMA_CONFIG::OnAddOrInsertLibClick( wxCommandEvent& event )
 /* Insert or add a library to the library list:
  *   The new library is put in list before (insert button) the selection,
  *   or added (add button) to end of list
- * The real list (g_LibName_List) is not changed, so the change can be cancelled
+ * The real list (m_Parent->m_ComponentLibFiles) is not changed, so the change
+ * can be cancelled
  */
 {
     int        ii;
@@ -320,7 +320,7 @@ void DIALOG_EESCHEMA_CONFIG::OnSaveCfgClick( wxCommandEvent& event )
 /*******************************************************************/
 {
     OnOkClick( event );
-    m_Parent->Save_Config( this );
+    m_Parent->SaveProjectFile( this );
 }
 
 

eeschema/dialog_erc.cpp

@@ -151,10 +151,8 @@ bool WinEDA_ErcFrame::Create( wxWindow* parent, wxWindowID id, const wxString& c
 
 void WinEDA_ErcFrame::CreateControls()
 {
-	SetFont(*g_DialogFont);
-
 ////@begin WinEDA_ErcFrame content construction
-    // Generated by DialogBlocks, 29/04/2008 21:09:11 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:22:48 (unregistered)
 
     WinEDA_ErcFrame* itemDialog1 = this;
 
@@ -174,15 +172,13 @@ void WinEDA_ErcFrame::CreateControls()
     itemBoxSizer6->Add(itemStaticBoxSizer7, 0, wxALIGN_LEFT|wxALL, 5);
     wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
     itemStaticBoxSizer7->Add(itemBoxSizer8, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
-    ErcTotalErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("-> Total Errors:  "), wxDefaultPosition, wxDefaultSize, 0 );
+    ErcTotalErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("Total Errors:  "), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer8->Add(ErcTotalErrors, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
-    WarnErcErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("-> Last Warnings: "), wxDefaultPosition, wxDefaultSize, 0 );
-    WarnErcErrors->SetForegroundColour(wxColour(0, 0, 255));
+    WarnErcErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("Last Warnings: "), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer8->Add(WarnErcErrors, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
-    ErcErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("-> Last Errors:   "), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
-    ErcErrors->SetForegroundColour(wxColour(202, 0, 0));
+    ErcErrors = new wxStaticText( m_PanelERC, wxID_STATIC, _("Last Errors:   "), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
     itemBoxSizer8->Add(ErcErrors, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);
@@ -191,11 +187,9 @@ void WinEDA_ErcFrame::CreateControls()
     itemBoxSizer12->Add(m_TotalErrCount, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     m_LastWarningCount = new wxStaticText( m_PanelERC, wxID_STATIC, _("0"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LastWarningCount->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer12->Add(m_LastWarningCount, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     m_LastErrCount = new wxStaticText( m_PanelERC, wxID_STATIC, _("0"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_LastErrCount->SetForegroundColour(wxColour(202, 0, 0));
     itemBoxSizer12->Add(m_LastErrCount, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
 
     itemBoxSizer6->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
@@ -210,7 +204,6 @@ void WinEDA_ErcFrame::CreateControls()
     wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL);
     m_PanelERCSizer->Add(itemBoxSizer19, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     wxButton* itemButton20 = new wxButton( m_PanelERC, ID_ERC_CMP, _("&Test Erc"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton20->SetForegroundColour(wxColour(198, 0, 0));
     itemBoxSizer19->Add(itemButton20, 0, wxGROW|wxALL, 5);
 
     wxButton* itemButton21 = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Del Markers"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -218,7 +211,6 @@ void WinEDA_ErcFrame::CreateControls()
 
     m_btClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
     m_btClose->SetDefault();
-    m_btClose->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer19->Add(m_btClose, 0, wxGROW|wxALL, 5);
 
     m_NoteBook->AddPage(m_PanelERC, _("erc"));

eeschema/dialog_erc.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -577,7 +582,7 @@
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">"ErcTotalErrors"</string>
-                          <string name="proxy-Label">"-&gt; Total Errors:  "</string>
+                          <string name="proxy-Label">"Total Errors:  "</string>
                           <long name="proxy-Wrapping width">-1</long>
                           <string name="proxy-Help text">""</string>
                           <string name="proxy-Tooltip text">""</string>
@@ -647,12 +652,12 @@
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">"WarnErcErrors"</string>
-                          <string name="proxy-Label">"-&gt; Last Warnings: "</string>
+                          <string name="proxy-Label">"Last Warnings: "</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">"0000FF"</string>
+                          <string name="proxy-Foreground colour">""</string>
                           <string name="proxy-Font">""</string>
                           <bool name="proxy-Hidden">0</bool>
                           <bool name="proxy-Enabled">1</bool>
@@ -717,12 +722,12 @@
                           <string name="proxy-Implementation filename">""</string>
                           <string name="proxy-Header filename">""</string>
                           <string name="proxy-Member variable name">"ErcErrors"</string>
-                          <string name="proxy-Label">"-&gt; Last Errors:   "</string>
+                          <string name="proxy-Label">"Last Errors:   "</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">"CA0000"</string>
+                          <string name="proxy-Foreground colour">""</string>
                           <string name="proxy-Font">""</string>
                           <bool name="proxy-Hidden">0</bool>
                           <bool name="proxy-Enabled">1</bool>
@@ -888,7 +893,7 @@
                           <string name="proxy-Help text">""</string>
                           <string name="proxy-Tooltip text">""</string>
                           <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">"0000FF"</string>
+                          <string name="proxy-Foreground colour">""</string>
                           <string name="proxy-Font">""</string>
                           <bool name="proxy-Hidden">0</bool>
                           <bool name="proxy-Enabled">1</bool>
@@ -958,7 +963,7 @@
                           <string name="proxy-Help text">""</string>
                           <string name="proxy-Tooltip text">""</string>
                           <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">"CA0000"</string>
+                          <string name="proxy-Foreground colour">""</string>
                           <string name="proxy-Font">""</string>
                           <bool name="proxy-Hidden">0</bool>
                           <bool name="proxy-Enabled">1</bool>
@@ -1189,7 +1194,7 @@
                       <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">"C60000"</string>
+                      <string name="proxy-Foreground colour">""</string>
                       <string name="proxy-Font">""</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>
@@ -1323,7 +1328,7 @@
                       <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-Foreground colour">""</string>
                       <string name="proxy-Font">""</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>

eeschema/dialog_find.cpp

@@ -74,12 +74,14 @@ bool WinEDA_FindFrame::Create( wxWindow* parent, wxWindowID id, const wxString&
 ////@end WinEDA_FindFrame member initialisation
 
 ////@begin WinEDA_FindFrame creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
     CreateControls();
-    GetSizer()->Fit(this);
+    if (GetSizer())
+    {
         GetSizer()->SetSizeHints(this);
+    }
     Centre();
 ////@end WinEDA_FindFrame creation
 
@@ -101,10 +103,8 @@ bool WinEDA_FindFrame::Create( wxWindow* parent, wxWindowID id, const wxString&
 
 void WinEDA_FindFrame::CreateControls()
 {
-    SetFont(*g_DialogFont);
-
 ////@begin WinEDA_FindFrame content construction
-    // Generated by DialogBlocks, 03/03/2006 08:14:51 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:23:21 (unregistered)
 
     WinEDA_FindFrame* itemDialog1 = this;
 
@@ -139,15 +139,12 @@ void WinEDA_FindFrame::CreateControls()
     itemBoxSizer6->Add(itemBoxSizer11, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxFIXED_MINSIZE, 5);
 
     wxButton* itemButton12 = new wxButton( itemDialog1, FIND_MARKERS, _("Find Markers"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton12->SetForegroundColour(wxColour(41, 84, 84));
     itemBoxSizer11->Add(itemButton12, 0, wxGROW|wxLEFT|wxRIGHT, 1);
 
     wxButton* itemButton13 = new wxButton( itemDialog1, FIND_NEXT_MARKER, _("Next Marker (F5)"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton13->SetForegroundColour(wxColour(0, 0, 213));
     itemBoxSizer11->Add(itemButton13, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 1);
 
     wxButton* itemButton14 = new wxButton( itemDialog1, LOCATE_IN_LIBRARIES, _("Find Cmp in &Lib"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton14->SetForegroundColour(wxColour(170, 0, 0));
     itemBoxSizer11->Add(itemButton14, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 1);
 
     // Set validators

eeschema/dialog_find.h

@@ -35,11 +35,6 @@
 
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define SYMBOL_WINEDA_FINDFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_FINDFRAME_TITLE _("EESchema Locate")
-#define SYMBOL_WINEDA_FINDFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_FINDFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_FINDFRAME_POSITION wxDefaultPosition
 #define ID_TEXTCTRL1 10008
 #define FIND_SHEET 10001
 #define FIND_HIERARCHY 10002
@@ -47,6 +42,11 @@
 #define FIND_MARKERS 10003
 #define FIND_NEXT_MARKER 10006
 #define LOCATE_IN_LIBRARIES 10004
+#define SYMBOL_WINEDA_FINDFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
+#define SYMBOL_WINEDA_FINDFRAME_TITLE _("EESchema Locate")
+#define SYMBOL_WINEDA_FINDFRAME_IDNAME ID_DIALOG
+#define SYMBOL_WINEDA_FINDFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_FINDFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 
 /*!

eeschema/dialog_options.cpp

@@ -38,7 +38,7 @@
 
 
 /**************************************************************************/
-void DisplayOptionFrame( WinEDA_DrawFrame* parent, const wxPoint& framepos )
+void DisplayOptionFrame( WinEDA_SchematicFrame* parent, const wxPoint& framepos )
 /**************************************************************************/
 {
     WinEDA_SetOptionsFrame* frame =
@@ -78,7 +78,7 @@ WinEDA_SetOptionsFrame::WinEDA_SetOptionsFrame()
 }
 
 
-WinEDA_SetOptionsFrame::WinEDA_SetOptionsFrame( WinEDA_DrawFrame* parent,
+WinEDA_SetOptionsFrame::WinEDA_SetOptionsFrame( WinEDA_SchematicFrame* parent,
                                                 wxWindowID id,
                                                 const wxString& caption,
                                                 const wxPoint& pos,
@@ -128,7 +128,7 @@ WinEDA_SetOptionsFrame::WinEDA_SetOptionsFrame( WinEDA_DrawFrame* parent,
     /* Adjust the current selections and options: */
     m_ShowGridOpt->SetValue( m_Parent->m_Draw_Grid );
     m_AutoPANOpt->SetValue( m_Parent->DrawPanel->m_AutoPAN_Enable );
-    m_SelShowPins->SetSelection( g_ShowAllPins ? TRUE : FALSE );
+    m_SelShowPins->SetSelection( m_Parent->m_ShowAllPins );
     m_Selunits->SetSelection( g_UnitMetric ? 0 : 1 );
     m_SelDirWires->SetSelection( g_HVLines ? 0 : 1 );
     m_Show_Page_Limits->SetSelection( g_ShowPageLimits ? 0 : 1 );
@@ -200,10 +200,8 @@ bool WinEDA_SetOptionsFrame::Create( wxWindow* parent,
 
 void WinEDA_SetOptionsFrame::CreateControls()
 {
-    SetFont( *g_DialogFont );
-
 ////@begin WinEDA_SetOptionsFrame content construction
-    // Generated by DialogBlocks, 29/04/2008 21:08:50 (unregistered)
+    // Generated by DialogBlocks, 27/04/2009 09:01:10 (unregistered)
 
     WinEDA_SetOptionsFrame* itemDialog1 = this;
 
@@ -244,7 +242,6 @@ void WinEDA_SetOptionsFrame::CreateControls()
 
     m_AutoPANOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Auto PAN"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_AutoPANOpt->SetValue(false);
-    m_AutoPANOpt->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer8->Add(m_AutoPANOpt, 0, wxGROW|wxALL, 5);
 
     wxArrayString m_SelunitsStrings;
@@ -276,11 +273,9 @@ void WinEDA_SetOptionsFrame::CreateControls()
 
     wxButton* itemButton15 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton15->SetDefault();
-    itemButton15->SetForegroundColour(wxColour(202, 0, 0));
     itemBoxSizer14->Add(itemButton15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer14->Add(m_btClose, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     itemBoxSizer14->Add(5, 5, 0, wxGROW|wxALL, 5);
@@ -435,9 +430,9 @@ void WinEDA_SetOptionsFrame::Accept( wxCommandEvent& event )
         g_UnitMetric = 0;
 
     if( m_SelShowPins->GetSelection() == 0 )
-        g_ShowAllPins = FALSE;
+        m_Parent->m_ShowAllPins = false;
     else
-        g_ShowAllPins = TRUE;
+        m_Parent->m_ShowAllPins = true;
 
     m_Parent->m_Draw_Grid = m_ShowGridOpt->GetValue();
     m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue();

eeschema/dialog_options.h

@@ -78,7 +78,7 @@ class WinEDA_SetOptionsFrame: public wxDialog
 public:
     /// Constructors
     WinEDA_SetOptionsFrame( );
-    WinEDA_SetOptionsFrame( WinEDA_DrawFrame* parent, wxWindowID id = SYMBOL_WINEDA_SETOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_SETOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_SETOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_SETOPTIONSFRAME_SIZE, long style = SYMBOL_WINEDA_SETOPTIONSFRAME_STYLE );
+    WinEDA_SetOptionsFrame( WinEDA_SchematicFrame* parent, wxWindowID id = SYMBOL_WINEDA_SETOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_SETOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_SETOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_SETOPTIONSFRAME_SIZE, long style = SYMBOL_WINEDA_SETOPTIONSFRAME_STYLE );
 
     /// Creation
     bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_SETOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_SETOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_SETOPTIONSFRAME_SIZE, long style = SYMBOL_WINEDA_SETOPTIONSFRAME_STYLE );
@@ -110,7 +110,7 @@ public:
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-	WinEDA_DrawFrame * m_Parent;
+	WinEDA_SchematicFrame * m_Parent;
     
 ////@begin WinEDA_SetOptionsFrame member variables
     wxStaticBoxSizer* m_DrawOptionsSizer;

eeschema/dialog_options.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -136,7 +138,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
-        <long name="makefile-last-written">0</long>
+        <long name="makefile-last-written">-8519680</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -602,7 +607,7 @@
                 <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-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
@@ -907,7 +912,7 @@
                 <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">"CA0000"</string>
+                <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
@@ -973,7 +978,7 @@
                 <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-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>

eeschema/dialog_print_using_printer.cpp

@@ -129,12 +129,10 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( WinEDA_DrawFrame* parent
 void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
 /************************************************************************/
 {
-	SetFont(*g_DialogFont);
     SetFocus();
 
     if( m_Config )
     {
-        m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &g_PlotLine_Width );
         m_Config->Read( PRINTMODECOLOR_KEY, &s_Print_Black_and_White );
     }
 
@@ -163,7 +161,6 @@ void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event )
 
     if( m_Config )
     {
-        m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE, g_PlotLine_Width );
         m_Config->Write( PRINTMODECOLOR_KEY, s_Print_Black_and_White );
     }
 

eeschema/edit_component_in_lib.cpp

@@ -95,7 +95,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelAlias()
 {
     wxButton*   Button;
 
-    m_PanelAlias->SetFont( *g_DialogFont );
     wxBoxSizer* PanelAliasBoxSizer = new    wxBoxSizer( wxHORIZONTAL );
 
     m_PanelAlias->SetSizer( PanelAliasBoxSizer );
@@ -105,7 +104,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelAlias()
 
     wxStaticText* Msg = new                 wxStaticText( m_PanelAlias, -1, _( "Alias" ) );
 
-    Msg->SetForegroundColour( wxColour( 200, 0, 0 ) );
     LeftBoxSizer->Add( Msg, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
 
     m_PartAliasList = new                   wxListBox( m_PanelAlias,
@@ -122,19 +120,16 @@ void WinEDA_PartPropertiesFrame::BuildPanelAlias()
 
     Button = new                    wxButton( m_PanelAlias, ID_ADD_ALIAS, _( "Add" ) );
 
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     m_ButtonDeleteOneAlias = new    wxButton( m_PanelAlias, ID_DELETE_ONE_ALIAS,
                                              _( "Delete" ) );
 
-    m_ButtonDeleteOneAlias->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( m_ButtonDeleteOneAlias, 0, wxGROW | wxALL, 5 );
 
     m_ButtonDeleteAllAlias = new wxButton( m_PanelAlias, ID_DELETE_ALL_ALIAS,
                                           _( "Delete All" ) );
 
-    m_ButtonDeleteAllAlias->SetForegroundColour( *wxRED );
     if( !CurrentAliasName.IsEmpty() )
         m_ButtonDeleteAllAlias->Enable( FALSE );
     RightBoxSizer->Add( m_ButtonDeleteAllAlias, 0, wxGROW | wxALL, 5 );
@@ -170,8 +165,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
 
     m_NoteBook->AddPage( m_PanelFootprintFilter, _( "Footprint Filter" ) );
 
-    m_PanelFootprintFilter->SetFont( *g_DialogFont );
-
     wxBoxSizer* PanelFpFilterBoxSizer = new wxBoxSizer( wxHORIZONTAL );
 
     m_PanelFootprintFilter->SetSizer( PanelFpFilterBoxSizer );
@@ -182,7 +175,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
     wxStaticText* Msg = new                 wxStaticText( m_PanelFootprintFilter, -1, _(
                                                              "Footprints" ) );
 
-    Msg->SetForegroundColour( wxColour( 200, 0, 0 ) );
     LeftBoxSizer->Add( Msg, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
 
     m_FootprintFilterListBox = new          wxListBox( m_PanelFootprintFilter,
@@ -201,7 +193,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
                                                      ID_ADD_FOOTPRINT_FILTER, _(
                                                          "Add" ) );
 
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     m_ButtonDeleteOneFootprintFilter = new  wxButton( m_PanelFootprintFilter,
@@ -209,7 +200,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
                                                      _(
                                                          "Delete" ) );
 
-    m_ButtonDeleteOneFootprintFilter->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( m_ButtonDeleteOneFootprintFilter, 0, wxGROW | wxALL, 5 );
 
     m_ButtonDeleteAllFootprintFilter = new wxButton( m_PanelFootprintFilter,
@@ -217,7 +207,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
                                                     _(
                                                         "Delete All" ) );
 
-    m_ButtonDeleteAllFootprintFilter->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( m_ButtonDeleteAllFootprintFilter, 0, wxGROW | wxALL, 5 );
 
 
@@ -286,8 +275,6 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic()
 /* create the basic panel for component properties editing
  */
 {
-    m_PanelBasic->SetFont( *g_DialogFont );
-
     AsConvertButt = new wxCheckBox( m_PanelBasic, -1, _( "As Convert" ) );
 
     if( g_AsDeMorgan )

eeschema/eelayer.cpp

@@ -121,8 +121,6 @@ void WinEDA_SetColorsFrame::CreateControls()
 {
     int lyr, grp, butt_ID, buttcolor;
 
-    SetFont( *g_DialogFont );
-
     OuterBoxSizer = new wxBoxSizer(wxVERTICAL);
     SetSizer(OuterBoxSizer);
 
@@ -237,11 +235,9 @@ void WinEDA_SetColorsFrame::CreateControls()
     OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
 
     Button = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    Button->SetForegroundColour( *wxRED );
     StdDialogButtonSizer->AddButton(Button);
 
     Button = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    Button->SetForegroundColour( *wxBLUE );
     StdDialogButtonSizer->AddButton(Button);
     Button->SetFocus();
 

eeschema/eelibs_read_libraryfiles.cpp

@@ -104,14 +104,14 @@ LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
 /******************************************/
 /* Function LoadLibraries
  * Clear all alredy loaded librries and load all librairies
- * given in g_LibName_List
+ * given in frame->m_ComponentLibFiles
  */
 /******************************************/
-void LoadLibraries (WinEDA_DrawFrame* frame)
+void LoadLibraries( WinEDA_SchematicFrame* frame )
 {
     wxFileName fn;
     wxString msg, tmp;
-    unsigned ii, iimax = g_LibName_List.GetCount();
+    unsigned ii, iimax = frame->m_ComponentLibFiles.GetCount();
 
     frame->PrintMsg( _( "Loading schematic component libraries" ) );
 
@@ -124,15 +124,15 @@ void LoadLibraries (WinEDA_DrawFrame* frame)
         if( lib->m_IsLibCache )
             continue;
 
-        // is this library in "wanted list" g_LibName_List ?
-        if( g_LibName_List.Index( lib->m_Name ) == wxNOT_FOUND )
+        // is this library in "wanted list" frame->m_ComponentLibFiles ?
+        if( frame->m_ComponentLibFiles.Index( lib->m_Name ) == wxNOT_FOUND )
             FreeCmpLibrary( frame, lib->m_Name );
     }
 
     // Load missing libraries (if any)
     for( ii = 0; ii < iimax; ii++ )
     {
-        fn = g_LibName_List[ii];
+        fn = frame->m_ComponentLibFiles[ii];
         fn.SetExt( CompLibFileExtension );
 
         if( !fn.IsOk() )
@@ -182,11 +182,11 @@ void LoadLibraries (WinEDA_DrawFrame* frame)
         (LibraryStruct**) MyZMalloc( sizeof(LibraryStruct*) * (NumOfLibs + 2) );
 
     int             jj = 0;
-    for( ii = 0; ii < g_LibName_List.GetCount(); ii++ )
+    for( ii = 0; ii < frame->m_ComponentLibFiles.GetCount(); ii++ )
     {
         if( jj >= NumOfLibs )
             break;
-        fn = g_LibName_List[ii];
+        fn = frame->m_ComponentLibFiles[ii];
         lib = FindLibrary( fn.GetName() );
         if( lib )
         {

eeschema/eeredraw.cpp

@@ -87,7 +87,7 @@ void WinEDA_SchematicFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     GetScreen()->ClrRefreshReq();
 
     // Display the sheet filename, and the sheet path, for non root sheets
-    if( GetScreen()->m_FileName == g_DefaultSchematicFileName )
+    if( GetScreen()->m_FileName == m_DefaultSchematicFileName )
     {
         wxString msg = wxGetApp().GetAppName() + wxT( " " ) + GetBuildVersion();
         title.Printf( wxT( "%s [%s]" ), msg.GetData(),

eeschema/eeschema.cpp

@@ -21,11 +21,8 @@
 
 // Global variables
 
-wxString g_DefaultSchematicFileName( wxT( "noname.sch" ) );
-wxArrayString  g_LibName_List;   // library list (short filenames) to load
 LibraryStruct* g_LibraryList;    // All part libs are saved here.
 
-int       g_NetFormat;      /* Numero de reference du type de netliste */
 int       g_OptNetListUseNames; /* TRUE pour utiliser les noms de net plutot que
                                  * les numeros (netlist PSPICE seulement) */
 SCH_ITEM* g_ItemToRepeat; /* pointeur sur la derniere structure
@@ -46,7 +43,6 @@ bool      g_LastSearchIsMarker; /* True if last seach is a marker serach
 SCH_ITEM* g_BlockSaveDataList; // List of items to paste (Created by Block Save)
 
 // Gestion d'options
-int       g_ShowAllPins;
 int       g_HVLines = 1;   // Bool: force H or V directions (Wires, Bus ..)
 
 int       g_PlotPSColorOpt;    // True = plot postcript color (see plotps.cpp)
@@ -158,8 +154,6 @@ bool WinEDA_App::OnInit()
     /* init EESCHEMA */
     SeedLayers();
     GetSettings();
-    extern PARAM_CFG_BASE* ParamCfgList[];
-    wxGetApp().ReadCurrentSetupValues( ParamCfgList );
     Read_Hotkey_Config( frame, false );   /* Must be called before creating
                                            * the main frame  in order to
                                            * display the real hotkeys in menus
@@ -195,7 +189,7 @@ bool WinEDA_App::OnInit()
     else
     {
         // Read a default config file if no file to load.
-        Read_Config( wxEmptyString, TRUE );
+        frame->LoadProjectFile( wxEmptyString, TRUE );
         if( frame->DrawPanel )
             frame->DrawPanel->Refresh( TRUE );
     }

eeschema/files-io.cpp

@@ -73,7 +73,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
     {
         if( !IsOK( this, _( "Clear Schematic Hierarchy (modified!)?" ) ) )
             return FALSE;
-        if( g_RootSheet->m_AssociatedScreen->m_FileName != g_DefaultSchematicFileName )
+        if( g_RootSheet->m_AssociatedScreen->m_FileName != m_DefaultSchematicFileName )
             SetLastProject( g_RootSheet->m_AssociatedScreen->m_FileName );
     }
 
@@ -121,7 +121,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
         screen->m_Commentaire2.Empty();
         screen->m_Commentaire3.Empty();
         screen->m_Commentaire4.Empty();
-        Read_Config( wxEmptyString, TRUE );
+        LoadProjectFile( wxEmptyString, TRUE );
         Zoom_Automatique( TRUE );
         SetSheetNumberAndCount();
         DrawPanel->Refresh();
@@ -132,7 +132,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
     msg = _( "Ready\nWorking dir: \n" ) + wxGetCwd();
     PrintMsg( msg );
 
-    Read_Config( wxEmptyString, FALSE );
+    LoadProjectFile( wxEmptyString, FALSE );
 
     // Delete old caches.
     LibraryStruct* nextlib, * lib = g_LibraryList;

eeschema/general.h

@@ -94,10 +94,8 @@ typedef enum {
 
 
 /* variables generales */
-extern wxArrayString  g_LibName_List;   // library list (short filenames) to load
 extern LibraryStruct* g_LibraryList;    // All part libs are saved here.
 
-extern int            g_NetFormat;      /* Numero de reference du type de netliste */
 extern int            g_OptNetListUseNames; /* TRUE pour utiliser les noms de net plutot que
                                           * les numeros (netlist PSPICE seulement) */
 extern SCH_ITEM*      g_ItemToRepeat; /* pointeur sur la derniere structure
@@ -208,8 +206,4 @@ extern int g_ItemSelectetColor;
 // Color to draw items flagged invisible, in libedit (they are insisible in eeschema
 extern int g_InvisibleItemColor;
 
-/* Config keys */
-#define MINI_DRAW_LINE_WIDTH_KEY   wxT( "MinimunDrawLineWidth" )
-#define OPTKEY_PLOT_LINEWIDTH_VALUE wxT( "PlotLineWidth" )
-
 #endif   // _GENERAL_H_

eeschema/menubar.cpp

@@ -298,9 +298,6 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     item->SetBitmap( preference_xpm );
     configmenu->Append( item );
 
-    // Font selection and setup
-    AddFontSelectionMenu( configmenu );
-
     wxGetApp().AddMenuLanguageList( configmenu );
 
     configmenu->AppendSeparator();

eeschema/netform.cpp

@@ -50,13 +50,13 @@ void WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL,
                    bool use_netnames )
 /*******************************************************************************/
 
-/* Create the netlist file ( Format is given by g_NetFormat )
+/* Create the netlist file ( Format is given by frame->m_NetlistFormat )
  *  bool use_netnames is used only for Spice netlist
  */
 {
     FILE*        f = NULL;
 
-    if( g_NetFormat < NET_TYPE_CUSTOM1 )
+    if( frame->m_NetlistFormat < NET_TYPE_CUSTOM1 )
     {
         if( ( f = wxFopen( FileNameNL, wxT( "wt" ) ) ) == NULL )
         {
@@ -68,7 +68,7 @@ void WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL,
 
     wxBusyCursor Busy;
 
-    switch( g_NetFormat )
+    switch( frame->m_NetlistFormat )
     {
     case NET_TYPE_PCBNEW:
         WriteNetListPCBNEW( frame, f, TRUE );

eeschema/netlist_control.h

@@ -51,7 +51,8 @@ public:
     wxBoxSizer*       m_LowBoxSizer;
 
     EDA_NoteBookPage( wxNotebook* parent, const wxString& title,
-                      int id_NetType, int idCheckBox, int idCreateFile );
+                      int id_NetType, int idCheckBox, int idCreateFile,
+                      bool selected );
     ~EDA_NoteBookPage() { };
 };
 

eeschema/pinedit-dialog.cpp

@@ -134,10 +134,8 @@ bool WinEDA_PinPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const w
 
 void WinEDA_PinPropertiesFrame::CreateControls()
 {
-    SetFont(*g_DialogFont);
-
 ////@begin WinEDA_PinPropertiesFrame content construction
-    // Generated by DialogBlocks, 11/08/2008 19:12:48 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:24:14 (unregistered)
 
     WinEDA_PinPropertiesFrame* itemDialog1 = this;
 
@@ -177,10 +175,10 @@ void WinEDA_PinPropertiesFrame::CreateControls()
     m_PinSizeIncDecButton->SetValue(0);
     itemBoxSizer10->Add(m_PinSizeIncDecButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
 
-    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin length"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin Lenght"), wxDefaultPosition, wxDefaultSize, 0 );
     itemStaticBoxSizer9->Add(m_PinSizeText, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
-    m_CommonUnit = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMON_UNITS, _("Common to units"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
+    m_CommonUnit = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMON_UNITS, _("Common to Units"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_CommonUnit->SetValue(false);
     itemStaticBoxSizer9->Add(m_CommonUnit, 0, wxALIGN_LEFT|wxALL, 5);
 
@@ -226,12 +224,10 @@ void WinEDA_PinPropertiesFrame::CreateControls()
     itemBoxSizer24->Add(itemBoxSizer25, 0, wxGROW|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 160));
     itemBoxSizer25->Add(m_btClose, 0, wxGROW|wxALL, 5);
 
     wxButton* itemButton27 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton27->SetDefault();
-    itemButton27->SetForegroundColour(wxColour(198, 0, 0));
     itemBoxSizer25->Add(itemButton27, 0, wxGROW|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL);

eeschema/pinedit-dialog.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -1635,7 +1640,7 @@
                   <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">"0000A0"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -1702,7 +1707,7 @@
                   <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">"C60000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>

eeschema/plothpgl.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -1319,7 +1324,7 @@
                   <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">"008000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -1386,7 +1391,7 @@
                   <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-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -1453,7 +1458,7 @@
                   <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">"800000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -1546,7 +1551,7 @@
                   <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">"657B44"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>

eeschema/plotps.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -660,7 +665,7 @@
                   <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">"008000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -727,7 +732,7 @@
                   <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">"B30000"</string>
+                  <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>
@@ -794,7 +799,7 @@
                   <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-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
                   <bool name="proxy-Hidden">0</bool>
                   <bool name="proxy-Enabled">1</bool>

eeschema/protos.h

@@ -78,7 +78,7 @@ PriorQue *LoadLibraryAux(WinEDA_DrawFrame * frame, LibraryStruct * library,
             FILE *f, int *NumOfParts);
 LibraryStruct * LoadLibraryName(WinEDA_DrawFrame * frame,
                 const wxString & FullLibName, const wxString & LibName);
-void LoadLibraries(WinEDA_DrawFrame * frame);
+void LoadLibraries( WinEDA_SchematicFrame* frame );
 void FreeCmpLibrary(wxWindow * frame, const wxString & LibName);
 const wxChar **GetLibNames();
 
@@ -209,7 +209,6 @@ int CountCmpNumber();
 /***************/
 /* EECONFIG.CPP */
 /***************/
-bool Read_Config( const wxString & CfgFileName, bool ForceRereadConfig );
 bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose );
 
 
@@ -387,7 +386,8 @@ int LocateAlias( const wxArrayString & AliasData, const wxString & Name);
 /***************/
 /* OPTIONS.CPP */
 /***************/
-void DisplayOptionFrame(WinEDA_DrawFrame * parent, const wxPoint & framepos);
+void DisplayOptionFrame( WinEDA_SchematicFrame* parent,
+                         const wxPoint& framepos );
 
 /****************/
 /* CONTROLE.CPP */

eeschema/sheet.cpp

@@ -135,10 +135,8 @@ bool WinEDA_SheetPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const
 
 void WinEDA_SheetPropertiesFrame::CreateControls()
 {
-    SetFont( *g_DialogFont );
-
 ////@begin WinEDA_SheetPropertiesFrame content construction
-    // Generated by DialogBlocks, 29/04/2008 21:25:45 (unregistered)
+    // Generated by DialogBlocks, 24/04/2009 14:25:43 (unregistered)
 
     WinEDA_SheetPropertiesFrame* itemDialog1 = this;
 
@@ -184,12 +182,10 @@ void WinEDA_SheetPropertiesFrame::CreateControls()
     itemBoxSizer2->Add(itemBoxSizer15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btClose->SetForegroundColour(wxColour(0, 0, 255));
     itemBoxSizer15->Add(m_btClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton17 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton17->SetDefault();
-    itemButton17->SetForegroundColour(wxColour(196, 0, 0));
     itemBoxSizer15->Add(itemButton17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     // Set validators

eeschema/sheet.pjd

@@ -20,6 +20,7 @@
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
     <bool name="use_enums">0</bool>
+    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,7 @@
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
     <bool name="xrc_generate_id_tags">0</bool>
+    <bool name="xrc_use_name_property">0</bool>
   </header>
   <data>
     <document>
@@ -157,6 +159,7 @@
         <string name="Compiler location">"%AUTO%"</string>
         <string name="wxWidgets location">"%AUTO%"</string>
         <string name="C++ command">"%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>
@@ -168,6 +171,7 @@
         <string name="Optimizations">"%AUTO%"</string>
         <string name="Warnings">"%AUTO%"</string>
         <string name="Debug flags">"%AUTO%"</string>
+        <string name="Extra compile flags">"%AUTO%"</string>
         <string name="Libraries">"%AUTO%"</string>
         <string name="Library path">"%AUTO%"</string>
         <string name="Linker flags">"%AUTO%"</string>
@@ -180,6 +184,7 @@
         <string name="PATH variable">"%AUTO%"</string>
         <bool name="Suppress source rules">0</bool>
         <bool name="Enable makefile generation">1</bool>
+        <string name="CFG">""</string>
       </document>
     </document>
   </data>
@@ -1070,7 +1075,7 @@
                 <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-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
@@ -1137,7 +1142,7 @@
                 <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">"C40000"</string>
+                <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>

eeschema/sheetlab.cpp

@@ -61,8 +61,8 @@ private:
 };
 
 BEGIN_EVENT_TABLE( WinEDA_PinSheetPropertiesFrame, wxDialog )
-EVT_BUTTON( wxID_OK, WinEDA_PinSheetPropertiesFrame::OnOkClick )
-EVT_BUTTON( wxID_CANCEL, WinEDA_PinSheetPropertiesFrame::OnCancelClick )
+    EVT_BUTTON( wxID_OK, WinEDA_PinSheetPropertiesFrame::OnOkClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_PinSheetPropertiesFrame::OnCancelClick )
 END_EVENT_TABLE()
 
 
@@ -71,8 +71,8 @@ WinEDA_PinSheetPropertiesFrame::WinEDA_PinSheetPropertiesFrame(
     WinEDA_SchematicFrame* parent,
     Hierarchical_PIN_Sheet_Struct*  curr_pinsheet,
     const wxPoint&         framepos ) :
-    wxDialog( parent, -1, _( "PinSheet Properties:" ), framepos, wxSize( 340, 220 ),
-              DIALOG_STYLE )
+    wxDialog( parent, -1, _( "PinSheet Properties:" ), framepos,
+              wxSize( 340, 220 ), DIALOG_STYLE )
 /**********************************************************************************/
 {
     wxPoint   pos;
@@ -93,15 +93,14 @@ WinEDA_PinSheetPropertiesFrame::WinEDA_PinSheetPropertiesFrame(
 
     /* Creation des boutons de commande */
     Button = new wxButton( this, wxID_OK, _( "OK" ) );
-    Button->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     m_TextWin = new WinEDA_GraphicTextCtrl( this, _( "Text:" ),
-                                            m_CurrentPinSheet->m_Text, m_CurrentPinSheet->m_Size.x,
+                                            m_CurrentPinSheet->m_Text,
+                                            m_CurrentPinSheet->m_Size.x,
                                             g_UnitMetric, LeftBoxSizer, 200 );
 
     // Selection de la forme :

eeschema/tool_sch.cpp

@@ -310,7 +310,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event )
         break;
 
     case ID_TB_OPTIONS_HIDDEN_PINS:
-        g_ShowAllPins = m_OptionsToolBar->GetToolState( id );
+        m_ShowAllPins = m_OptionsToolBar->GetToolState( id );
         DrawPanel->ReDraw( &dc, TRUE );
         break;
 

eeschema/viewlib_frame.cpp

@@ -111,7 +111,6 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow*      father,
         m_LibList = new wxListBox( m_LibListWindow, ID_LIBVIEW_LIB_LIST, wxPoint( 0, 0 ),
                                    m_LibListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0),
                                     0, NULL, wxLB_HSCROLL );
-        m_LibList->SetFont( *g_DialogFont );
     }
     else
     {
@@ -135,7 +134,6 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow*      father,
                                wxPoint( 0, 0 ),
                                m_CmpListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0),
                                0, NULL, wxLB_HSCROLL );
-    m_CmpList->SetFont( *g_DialogFont );
 
     if( m_LibList )
         ReCreateListLib();

gerbview/edit.cpp

@@ -254,7 +254,10 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event )
         {
             wxString editorname = wxGetApp().GetEditorName();
             if( !editorname.IsEmpty() )
-                ExecuteFile( this, editorname, gerber_layer->m_FileName );
+            {
+                wxFileName fn( gerber_layer->m_FileName );
+                ExecuteFile( this, editorname, QuoteFullPath( fn ) );
+            }
         }
         break;
 

gerbview/gerberframe.cpp

@@ -37,9 +37,6 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
     EVT_TOOL( ID_NEW_BOARD, WinEDA_GerberFrame::Files_io )
     EVT_TOOL( ID_SAVE_BOARD, WinEDA_GerberFrame::Files_io )
 
-    EVT_MENU_RANGE( ID_PREFERENCES_FONT_DIALOG, ID_PREFERENCES_FONT_END,
-                    WinEDA_DrawFrame::ProcessFontPreferences )
-
 // Menu Files:
     EVT_MENU( ID_MENU_LOAD_FILE, WinEDA_GerberFrame::Files_io )
     EVT_MENU( ID_MENU_APPEND_FILE, WinEDA_GerberFrame::Files_io )

gerbview/options.cpp

@@ -158,7 +158,6 @@ WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(
  */
 {
     m_Parent = parent;
-    SetFont( *g_DialogFont );
 
     wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
     SetSizer( MainBoxSizer );
@@ -170,11 +169,9 @@ WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(
     MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
 
     wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
-    Button->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     /* Display / not display polar coordinates: */
@@ -289,7 +286,6 @@ WinEDA_LookFrame::WinEDA_LookFrame( WinEDA_BasePcbFrame* parent,
 /*******************************************************************************/
 {
     m_Parent = parent;
-    SetFont( *g_DialogFont );
 
     wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
     SetSizer( MainBoxSizer );
@@ -301,11 +297,9 @@ WinEDA_LookFrame::WinEDA_LookFrame( WinEDA_BasePcbFrame* parent,
     MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
 
     wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
-    Button->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     // Show Option Draw Tracks

gerbview/readgerb.cpp

@@ -204,8 +204,7 @@ bool WinEDA_GerberFrame::Read_GERBER_File( wxDC*           DC,
 
             case 'D':       /* Line type Dxx : Tool selection (xx > 0) or command if xx = 0..9*/
                 D_commande = gerber->ReturnDCodeNumber( text );
-                gerber->Execute_DCODE_Command( this, DC,
-                                                     text, D_commande );
+                gerber->Execute_DCODE_Command( this, DC, text, D_commande );
                 break;
 
             case 'X':

gerbview/reglage.cpp

@@ -83,7 +83,6 @@ WinEDA_ConfigFrame::WinEDA_ConfigFrame( WinEDA_GerberFrame* parent,
     wxString  title;
 
     m_Parent = parent;
-    SetFont( *g_DialogFont );
 
 	/* Shows the config filename currently used : */
     title = _( "from " ) + wxGetApp().m_CurrentOptionFile;
@@ -105,11 +104,9 @@ WinEDA_ConfigFrame::WinEDA_ConfigFrame( WinEDA_GerberFrame* parent,
     RightBoxSizer->AddSpacer( 20 );
 
     Button = new wxButton( this, wxID_OK, _( "OK" ) );
-    Button->SetForegroundColour( *wxRED );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
-    Button->SetForegroundColour( *wxBLUE );
     RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
     wxSize size;

gerbview/set_color.cpp

@@ -124,8 +124,6 @@ void WinEDA_SetColorsFrame::CreateControls()
     wxSize CorrectSize; // Used while specifying sizes of buttons and spacers
     int ButtonHeight;   // Also used for the same reason
 
-    SetFont( *g_DialogFont );
-
     OuterBoxSizer = new wxBoxSizer(wxVERTICAL);
     SetSizer(OuterBoxSizer);
 
@@ -268,7 +266,6 @@ void WinEDA_SetColorsFrame::CreateControls()
     if (WinEDA_SetColorsFrame::ShowToolTips())
         Button->SetToolTip( _("Switch on all of the Gerber layers") );
     Button->SetMinSize( wxSize( CorrectSize.x, ButtonHeight ) );
-    Button->SetForegroundColour( wxColor( 0, 100, 0 ) );
     FlexColumnBoxSizer->Add(Button, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5);
 
     // Now do everything required for providing the second button.
@@ -277,7 +274,6 @@ void WinEDA_SetColorsFrame::CreateControls()
     if (WinEDA_SetColorsFrame::ShowToolTips())
         Button->SetToolTip( _("Switch off all of the Gerber layers") );
     Button->SetMinSize( wxSize( CorrectSize.x, ButtonHeight ) );
-    Button->SetForegroundColour( wxColor( 100, 0, 0 ) );
     FlexColumnBoxSizer->Add(Button, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5);
 
     // As each column contains seventeen rows, and only six rows of the third column have been
@@ -313,11 +309,9 @@ void WinEDA_SetColorsFrame::CreateControls()
     OuterBoxSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
 
     Button = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    Button->SetForegroundColour( *wxRED );
     StdDialogButtonSizer->AddButton(Button);
 
     Button = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    Button->SetForegroundColour( *wxBLUE );
     StdDialogButtonSizer->AddButton(Button);
 
     Button = new wxButton( this, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );

gerbview/tool_gerber.cpp

@@ -91,9 +91,6 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
                             _( " Select how items are displayed" ),
                             display_options_xpm );
 
-    // Font selection and setup
-    AddFontSelectionMenu( configmenu );
-
     wxGetApp().AddMenuLanguageList( configmenu );
 
     configmenu->AppendSeparator();
@@ -242,7 +239,8 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
                          -1, -1, (wxObject*) NULL,
                          msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW );
+    msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr,
+                         HK_ZOOM_REDRAW );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxBitmap( zoom_redraw_xpm ),
                          wxNullBitmap,
                          FALSE,
@@ -271,8 +269,10 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
         choices.Add( msg );
     }
 
-    m_SelLayerBox = new WinEDAChoiceBox( m_HToolBar, ID_TOOLBARH_PCB_SELECT_LAYER,
-                                         wxDefaultPosition, wxSize( 150, -1 ), choices );
+    m_SelLayerBox = new WinEDAChoiceBox( m_HToolBar,
+                                         ID_TOOLBARH_PCB_SELECT_LAYER,
+                                         wxDefaultPosition, wxSize( 150, -1 ),
+                                         choices );
     m_SelLayerBox->SetSelection( GetScreen()->m_Active_Layer );
     m_HToolBar->AddControl( m_SelLayerBox );
 
@@ -286,8 +286,10 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
         choices.Add( msg );
     }
 
-    m_SelLayerTool = new WinEDAChoiceBox( m_HToolBar, ID_TOOLBARH_GERBER_SELECT_TOOL,
-                                          wxDefaultPosition, wxSize( 150, -1 ), choices );
+    m_SelLayerTool = new WinEDAChoiceBox( m_HToolBar,
+                                          ID_TOOLBARH_GERBER_SELECT_TOOL,
+                                          wxDefaultPosition, wxSize( 150, -1 ),
+                                          choices );
     m_HToolBar->AddControl( m_SelLayerTool );
 
 
@@ -368,7 +370,8 @@ create or update the left vertical toolbar (option toolbar
         return;
 
     // creation du tool bar options
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, FALSE );
+    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this,
+                                           ID_OPT_TOOLBAR, FALSE );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxBitmap( grid_xpm ),
                                wxNullBitmap,
@@ -376,7 +379,8 @@ create or update the left vertical toolbar (option toolbar
                                -1, -1, (wxObject*) NULL,
                                _( "Display Grid OFF" ) );
 
-    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD, wxBitmap( polar_coord_xpm ),
+    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD,
+                               wxBitmap( polar_coord_xpm ),
                                wxNullBitmap,
                                TRUE,
                                -1, -1, (wxObject*) NULL,
@@ -390,7 +394,8 @@ create or update the left vertical toolbar (option toolbar
                                wxBitmap( unit_mm_xpm ),
                                _( "Units in millimeters" ), wxITEM_CHECK );
 
-    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxBitmap( cursor_shape_xpm ),
+    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR,
+                               wxBitmap( cursor_shape_xpm ),
                                wxNullBitmap,
                                TRUE,
                                -1, -1, (wxObject*) NULL,

include/appl_wxstruct.h

@@ -131,6 +131,7 @@ public:
      * @param aList = array of PARAM_CFG_BASE pointers
      */
     void      SaveCurrentSetupValues( PARAM_CFG_BASE** aList );
+    void      SaveCurrentSetupValues( const PARAM_CFG_ARRAY& List );
 
     /** Function ReadCurrentSetupValues()
      * Raed the current setup values previously saved, from m_EDA_Config
@@ -138,6 +139,7 @@ public:
      * @param aList = array of PARAM_CFG_BASE pointers
      */
     void      ReadCurrentSetupValues( PARAM_CFG_BASE** aList );
+    void      ReadCurrentSetupValues( const PARAM_CFG_ARRAY& List );
 
     bool      ReadProjectConfig( const wxString& local_config_filename,
                                  const wxString& GroupName,

include/common.h

@@ -85,9 +85,6 @@ enum pseudokeys {
 class LibNameList;
 
 
-//#define MAX_COLOR  0x8001F
-
-
 /***********************************/
 /* Classe pour affichage de textes */
 /***********************************/

include/param_config.h

@@ -24,6 +24,8 @@ enum paramcfg_id    /* type du parametre dans la structure ParamConfig */
 };
 
 #define MAX_COLOR  0x8001F
+#define IS_VALID_COLOR( c )  ( ( c >= 0 ) && ( c <= 0x8001F ) )
+
 #define INT_MINVAL 0x80000000
 #define INT_MAXVAL 0x7FFFFFFF