CvPcb: Code cleanup. Rename WinEDA_CvpcbFrame to CVPCB_MAINFRAME, according to coding style policy.

Change in CvPcb: CvPcb now does not use .dcm files, only .mod files to read modules keywords and doc

CHANGELOG.txt

@@ -4,6 +4,16 @@ KiCad ChangeLog 2010
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2011-Feb-05, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+CvPcb:
+    Code cleanup. Rename WinEDA_CvpcbFrame to CVPCB_MAINFRAME,
+        according to coding style policy.
+    Change in CvPcb:
+        CvPcb does not use now .dcm files, only .mod files,
+        to read modules keywords and doc
+
+
 2011-Feb-2 UPDATE Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 ++common:

bitmaps/CMakeLists.txt

@@ -187,6 +187,7 @@ set(BITMAP_SRCS
     Lang_Es.xpm
     Lang_Fr.xpm
     Lang_Fi.xpm
+    Lang_Gr.xpm
     Lang_Hu.xpm
     Lang_It.xpm
     Lang_Jp.xpm

bitmaps/Lang_Gr.xpm

+/* XPM */
+const char *lang_gr_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"= c none",
+"& c #D6D8F8",
+"O c #3939DC",
+"+ c #0E12F2",
+"# c #A8A6F7",
+"o c #2826E4",
+": c #B4B6FC",
+"* c #8482F4",
+"@ c #4745F8",
+"- c #1C1EFC",
+"; c #1D22FB",
+"$ c #9C9AF4",
+". c #CAC8FA",
+"  c #0402FC",
+"% c #5456F4",
+"X c #7A79F9",
+/* pixels */
+"================",
+"  .XoOOOOOoo++++",
+"  .X @#########$",
+"%%&#%*##########",
+"&&=&&*          ",
+"  .X %.&&&&&&&&&",
+"  .X -@@@@@@@@@@",
+"@@&$@@@@@@@@@@@@",
+"                ",
+";--;-----------;",
+"*XXXXXXXXXXXXXXX",
+"&&&&&&&&&&&&&&&&",
+"                ",
+"::::::::::::::::",
+"================",
+"================"
+};

common/dialog_about/AboutDialog_main.cpp

@@ -250,8 +250,11 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
                                         wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ),
                                         new wxBitmap( lang_de_xpm ) ) );
     info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ),
-                                        wxT( "midpika@hotmail.com" ), wxT( "Japanese (JP)" ),
+                                        wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ),
                                         new wxBitmap( lang_jp_xpm ) ) );
+    info.AddTranslator( new Contributor( wxT( "Milonas Kostas" ),
+                                        wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ),
+                                        new wxBitmap( lang_gr_xpm ) ) );
 
     /* TODO: are these all russian translators, placed them here now, or else align them below other language maintainer with mail adress */
     info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) );

common/edaappl.cpp

@@ -148,6 +148,14 @@ static struct LANGUAGE_DESCR s_Language_List[] =
         _( "German" )
     },
 
+    /* Greek language */
+    {
+        wxLANGUAGE_GREEK,
+        ID_LANGUAGE_GREEK,
+        lang_gr_xpm,
+        _( "Greek" )
+    },
+
     /* Slovenian language */
     {
         wxLANGUAGE_SLOVENIAN,
@@ -702,6 +710,11 @@ bool WinEDA_App::SetLanguage( bool first_time )
         m_Locale->Init();
         retv = false;
     }
+    else if( !first_time )
+    {
+        wxLogDebug( wxT( "Search for dictionary %s.mo in %s" ),
+                GetChars( DictionaryName ), GetChars( m_Locale->GetName() ) );
+    }
 
     if( !first_time )
     {

cvpcb/autosel.cpp

@@ -13,6 +13,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 
 
@@ -68,7 +69,7 @@ char * ReadQuotedText(wxString & aTarget, char * aText)
  * format of a line:
  * 'cmp_ref' 'footprint_name'
  */
-void WinEDA_CvpcbFrame::AssocieModule( wxCommandEvent& event )
+void CVPCB_MAINFRAME::AssocieModule( wxCommandEvent& event )
 {
     FOOTPRINT_ALIAS_LIST aliases;
     FOOTPRINT_ALIAS*     alias;

cvpcb/cfg.cpp

@@ -9,7 +9,7 @@
 #include "param_config.h"
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 
 
 #define GROUP wxT("/cvpcb")
@@ -26,7 +26,7 @@
  * to define local variables.  The old method of statically building the array
  * at compile time requiring global variable definitions.
  */
-PARAM_CFG_ARRAY& WinEDA_CvpcbFrame::GetProjectFileParameters( void )
+PARAM_CFG_ARRAY& CVPCB_MAINFRAME::GetProjectFileParameters( void )
 {
     if( !m_projectFileParams.empty() )
         return m_projectFileParams;
@@ -59,7 +59,7 @@ PARAM_CFG_ARRAY& WinEDA_CvpcbFrame::GetProjectFileParameters( void )
  * The path of the executable must be in cvpcb.exe.
  *
  */
-void WinEDA_CvpcbFrame::LoadProjectFile( const wxString& FileName )
+void CVPCB_MAINFRAME::LoadProjectFile( const wxString& FileName )
 {
     wxFileName fn = FileName;
 
@@ -82,13 +82,13 @@ void WinEDA_CvpcbFrame::LoadProjectFile( const wxString& FileName )
 }
 
 
-void WinEDA_CvpcbFrame::Update_Config( wxCommandEvent& event )
+void CVPCB_MAINFRAME::Update_Config( wxCommandEvent& event )
 {
     SaveProjectFile( m_NetlistFileName.GetFullPath() );
 }
 
 
-void WinEDA_CvpcbFrame::SaveProjectFile( const wxString& fileName )
+void CVPCB_MAINFRAME::SaveProjectFile( const wxString& fileName )
 {
     wxFileName fn = fileName;
 

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -12,7 +12,7 @@
 #include "cvpcb.h"
 #include "bitmaps.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 #include "class_DisplayFootprintsFrame.h"
 #include "cvpcb_id.h"
 
@@ -46,7 +46,7 @@ END_EVENT_TABLE()
 /* DISPLAY_FOOTPRINTS_FRAME: the frame to display the current focused footprint */
 /***************************************************************************/
 
-DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
+DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
                                           const wxString& title,
                                           const wxPoint& pos,
                                           const wxSize& size, long style ) :
@@ -129,7 +129,7 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
     delete GetScreen();
     SetScreen( NULL );
 
-    ( (WinEDA_CvpcbFrame*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
+    ( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
 }
 
 /* Called when the frame is closed

cvpcb/class_DisplayFootprintsFrame.h

@@ -10,7 +10,7 @@ class DISPLAY_FOOTPRINTS_FRAME : public WinEDA_BasePcbFrame
 public:
 
 public:
-    DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
+    DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
                          const wxString& title,
                          const wxPoint& pos, const wxSize& size,
                          long style = KICAD_DEFAULT_DRAWFRAME_STYLE );

cvpcb/class_components_listbox.cpp

@@ -8,6 +8,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 
 
@@ -15,7 +16,7 @@
 /* ListBox handling the schematic components list */
 /**************************************************/
 
-COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
+COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
                                         const wxPoint& loc, const wxSize& size,
                                         int nbitems, wxString choice[] ) :
     ITEMS_LISTBOX_BASE( parent, id, loc, size )

cvpcb/class_footprints_listbox.cpp

@@ -8,6 +8,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 
 
@@ -15,7 +16,7 @@
 /* ListBox handling the footprint list */
 /***************************************/
 
-FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( WinEDA_CvpcbFrame* parent,
+FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent,
                                         wxWindowID id, const wxPoint& loc,
                                         const wxSize& size,
                                         int nbitems, wxString choice[] ) :

cvpcb/cvpcb.cpp

@@ -13,7 +13,7 @@
 #include "zones.h"
 #include "bitmaps.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 #include "colors_selection.h"
 #include "cvpcb_id.h"
 
@@ -44,7 +44,7 @@ void WinEDA_App::MacOpenFile(const wxString &fileName)
 {
     wxFileName    filename = fileName;
     wxString      oldPath;
-    WinEDA_CvpcbFrame * frame = ((WinEDA_CvpcbFrame*)GetTopWindow());
+    CVPCB_MAINFRAME * frame = ((CVPCB_MAINFRAME*)GetTopWindow());
 
     if(!filename.FileExists())
 	return;
@@ -94,7 +94,7 @@ bool WinEDA_App::OnInit()
 
     wxFileName         filename;
     wxString           message;
-    WinEDA_CvpcbFrame* frame   = NULL;
+    CVPCB_MAINFRAME* frame   = NULL;
 
     InitEDA_Appl( wxT( "CvPCB" ), APP_TYPE_CVPCB );
 
@@ -117,7 +117,7 @@ bool WinEDA_App::OnInit()
     g_DrawBgColor = BLACK;
 
     wxString Title = GetTitle() + wxT( " " ) + GetBuildVersion();
-    frame = new WinEDA_CvpcbFrame( Title );
+    frame = new CVPCB_MAINFRAME( Title );
 
     // Show the frame
     SetTopWindow( frame );
@@ -137,7 +137,7 @@ bool WinEDA_App::OnInit()
         }
     }
 
-    LoadFootprintFiles( frame->m_ModuleLibNames, frame->m_footprints );
+    frame->LoadFootprintFiles();
     frame->m_NetlistFileExtension = wxT( "net" );
     frame->m_NetlistFileName.Clear();
     frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() +

cvpcb/cvpcb_mainframe.h

+/**
+ * @file cvpcb_mainframe.h
+ */
+
+#ifndef _CVPCB_MAINFRAME_H_
+#define _CVPCB_MAINFRAME_H_
+
+#include "wx/listctrl.h"
+#include <wx/filename.h>
+#include "param_config.h"
+#include "cvpcb.h"
+
+/*  Forward declarations of all top-level window classes. */
+class FOOTPRINTS_LISTBOX;
+class COMPONENTS_LISTBOX;
+class DISPLAY_FOOTPRINTS_FRAME;
+
+
+
+/**
+ * The CVPcb application main window.
+ */
+class CVPCB_MAINFRAME : public EDA_BASE_FRAME
+{
+public:
+
+    bool m_KeepCvpcbOpen;
+    FOOTPRINTS_LISTBOX*  m_FootprintList;
+    COMPONENTS_LISTBOX*  m_ListCmp;
+    DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
+    WinEDA_Toolbar*      m_HToolBar;
+    wxFileName           m_NetlistFileName;
+    wxArrayString        m_ModuleLibNames;
+    wxArrayString        m_AliasLibNames;
+    wxString             m_UserLibraryPath;
+    wxString             m_NetlistFileExtension;
+    wxString             m_DocModulesFileName;
+    FOOTPRINT_LIST       m_footprints;
+    COMPONENT_LIST       m_components;
+
+protected:
+    int             m_undefinedComponentCnt;
+    bool            m_modified;
+    bool            m_rightJustify;
+    bool            m_isEESchemaNetlist;
+    PARAM_CFG_ARRAY m_projectFileParams;
+
+public:
+    CVPCB_MAINFRAME( const wxString& title,
+                       long            style = KICAD_DEFAULT_DRAWFRAME_STYLE );
+    ~CVPCB_MAINFRAME();
+
+    void             OnLeftClick( wxListEvent& event );
+    void             OnLeftDClick( wxListEvent& event );
+    void             OnSelectComponent( wxListEvent& event );
+
+    void             Update_Config( wxCommandEvent& event );
+    void             OnQuit( wxCommandEvent& event );
+    void             OnCloseWindow( wxCloseEvent& Event );
+    void             OnSize( wxSizeEvent& SizeEvent );
+    void             OnChar( wxKeyEvent& event );
+    void             ReCreateHToolbar();
+    virtual void     ReCreateMenuBar();
+    void             SetLanguage( wxCommandEvent& event );
+
+    void             ToFirstNA( wxCommandEvent& event );
+    void             ToPreviousNA( wxCommandEvent& event );
+    void             DelAssociations( wxCommandEvent& event );
+    void             SaveQuitCvpcb( wxCommandEvent& event );
+    void             LoadNetList( wxCommandEvent& event );
+    void             ConfigCvpcb( wxCommandEvent& event );
+    void             OnKeepOpenOnSave( wxCommandEvent& event );
+    void             DisplayModule( wxCommandEvent& event );
+    void             AssocieModule( wxCommandEvent& event );
+    void             WriteStuffList( wxCommandEvent& event );
+    void             DisplayDocFile( wxCommandEvent& event );
+    void             OnSelectFilteringFootprint( wxCommandEvent& event );
+
+    void             OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event );
+
+    void             SetNewPkg( const wxString& package );
+    void             BuildCmpListBox();
+    void             BuildFOOTPRINTS_LISTBOX();
+    void             CreateScreenCmp();
+    int              SaveNetList( const wxString& FullFileName );
+    int              SaveComponentList( const wxString& FullFileName );
+    bool             ReadNetList();
+    int              ReadSchematicNetlist();
+    void             LoadProjectFile( const wxString& FileName );
+    void             SaveProjectFile( const wxString& fileName );
+    virtual void     LoadSettings();
+    virtual void     SaveSettings();
+    /** DisplayStatus()
+     * Displays info to the status line at bottom of the main frame
+     */
+    void             DisplayStatus();
+
+    /**
+     * Function LoadFootprintFiles
+     * Read the list of libraries (*.mod files) and generate the list of modules.
+     * for each module are stored
+     *      the module name
+     *      documentation string
+     *      associated keywords
+     * m_ModuleLibNames is the list of library that must be read (loaded)
+     * fills m_footprints
+     * @return true if libraries are found, false otherwise.
+     */
+    bool LoadFootprintFiles( );
+
+    PARAM_CFG_ARRAY& GetProjectFileParameters( void );
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif  //#ifndef _CVPCB_MAINFRAME_H_

cvpcb/cvstruct.h

@@ -6,99 +6,10 @@
 #define CVSTRUCT_H
 
 #include "wx/listctrl.h"
-#include <wx/filename.h>
-#include "param_config.h"
 #include "cvpcb.h"
 
 /*  Forward declarations of all top-level window classes. */
-class FOOTPRINTS_LISTBOX;
-class COMPONENTS_LISTBOX;
-class DISPLAY_FOOTPRINTS_FRAME;
-
-
-
-/**
- * The CVPcb application main window.
- */
-class WinEDA_CvpcbFrame : public EDA_BASE_FRAME
-{
-public:
-
-    bool m_KeepCvpcbOpen;
-    FOOTPRINTS_LISTBOX*  m_FootprintList;
-    COMPONENTS_LISTBOX*  m_ListCmp;
-    DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
-    WinEDA_Toolbar*      m_HToolBar;
-    wxFileName           m_NetlistFileName;
-    wxArrayString        m_ModuleLibNames;
-    wxArrayString        m_AliasLibNames;
-    wxString             m_UserLibraryPath;
-    wxString             m_NetlistFileExtension;
-    wxString             m_DocModulesFileName;
-    FOOTPRINT_LIST       m_footprints;
-    COMPONENT_LIST       m_components;
-
-protected:
-    int             m_undefinedComponentCnt;
-    bool            m_modified;
-    bool            m_rightJustify;
-    bool            m_isEESchemaNetlist;
-    PARAM_CFG_ARRAY m_projectFileParams;
-
-public:
-    WinEDA_CvpcbFrame( const wxString& title,
-                       long            style = KICAD_DEFAULT_DRAWFRAME_STYLE );
-    ~WinEDA_CvpcbFrame();
-
-    void             OnLeftClick( wxListEvent& event );
-    void             OnLeftDClick( wxListEvent& event );
-    void             OnSelectComponent( wxListEvent& event );
-
-    void             Update_Config( wxCommandEvent& event );
-    void             OnQuit( wxCommandEvent& event );
-    void             OnCloseWindow( wxCloseEvent& Event );
-    void             OnSize( wxSizeEvent& SizeEvent );
-    void             OnChar( wxKeyEvent& event );
-    void             ReCreateHToolbar();
-    virtual void     ReCreateMenuBar();
-    void             SetLanguage( wxCommandEvent& event );
-
-    void             ToFirstNA( wxCommandEvent& event );
-    void             ToPreviousNA( wxCommandEvent& event );
-    void             DelAssociations( wxCommandEvent& event );
-    void             SaveQuitCvpcb( wxCommandEvent& event );
-    void             LoadNetList( wxCommandEvent& event );
-    void             ConfigCvpcb( wxCommandEvent& event );
-    void             OnKeepOpenOnSave( wxCommandEvent& event );
-    void             DisplayModule( wxCommandEvent& event );
-    void             AssocieModule( wxCommandEvent& event );
-    void             WriteStuffList( wxCommandEvent& event );
-    void             DisplayDocFile( wxCommandEvent& event );
-    void             OnSelectFilteringFootprint( wxCommandEvent& event );
-
-    void             OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event );
-
-    void             SetNewPkg( const wxString& package );
-    void             BuildCmpListBox();
-    void             BuildFOOTPRINTS_LISTBOX();
-    void             CreateScreenCmp();
-    int              SaveNetList( const wxString& FullFileName );
-    int              SaveComponentList( const wxString& FullFileName );
-    bool             ReadNetList();
-    int              ReadSchematicNetlist();
-    void             LoadProjectFile( const wxString& FileName );
-    void             SaveProjectFile( const wxString& fileName );
-    virtual void     LoadSettings();
-    virtual void     SaveSettings();
-    /** DisplayStatus()
-     * Displays info to the status line at bottom of the main frame
-     */
-    void             DisplayStatus();
-
-    PARAM_CFG_ARRAY& GetProjectFileParameters( void );
-
-    DECLARE_EVENT_TABLE()
-};
+class CVPCB_MAINFRAME;
 
 
 /*********************************************************************/
@@ -107,7 +18,7 @@ public:
 class ITEMS_LISTBOX_BASE : public wxListView
 {
 public:
-    ITEMS_LISTBOX_BASE( WinEDA_CvpcbFrame* aParent, wxWindowID aId,
+    ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
                         const wxPoint& aLocation, const wxSize& aSize );
 
     ~ITEMS_LISTBOX_BASE();
@@ -115,7 +26,7 @@ public:
     int                        GetSelection();
     void                       OnSize( wxSizeEvent& event );
 
-    virtual WinEDA_CvpcbFrame* GetParent();
+    virtual CVPCB_MAINFRAME* GetParent();
 };
 
 /******************************************/
@@ -132,7 +43,7 @@ public:
     bool           m_UseFootprintFullList;
 
 public:
-    FOOTPRINTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
+    FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
                         const wxPoint& loc, const wxSize& size,
                         int nbitems, wxString choice[] );
     ~FOOTPRINTS_LISTBOX();
@@ -165,11 +76,11 @@ class COMPONENTS_LISTBOX : public ITEMS_LISTBOX_BASE
 {
 public:
     wxArrayString      m_ComponentList;
-    WinEDA_CvpcbFrame* m_Parent;
+    CVPCB_MAINFRAME* m_Parent;
 
 public:
 
-    COMPONENTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
+    COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
                         const wxPoint& loc, const wxSize& size,
                         int nbitems, wxString choice[] );
 

cvpcb/dialogs/dialog_cvpcb_config.cpp

@@ -12,14 +12,14 @@
 #include "gestfich.h"
 
 #include "cvpcb.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 
 #include "protos.h"
 
 #include "dialog_cvpcb_config.h"
 
 
-DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( WinEDA_CvpcbFrame* parent ) :
+DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent ) :
     DIALOG_CVPCB_CONFIG_FBP( parent )
 {
     wxString title;
@@ -121,8 +121,7 @@ void DIALOG_CVPCB_CONFIG::OnOkClick( wxCommandEvent& event )
         for( unsigned ii = 0; ii < m_ListEquiv->GetCount(); ii++ )
             m_Parent->m_AliasLibNames.Add( m_ListEquiv->GetString( ii ) );
 
-        LoadFootprintFiles( m_Parent->m_ModuleLibNames,
-                            m_Parent->m_footprints );
+        m_Parent->LoadFootprintFiles();
         m_Parent->BuildFOOTPRINTS_LISTBOX();
     }
 

cvpcb/dialogs/dialog_cvpcb_config.h

@@ -13,7 +13,7 @@
 class DIALOG_CVPCB_CONFIG : public DIALOG_CVPCB_CONFIG_FBP
 {
 private:
-    WinEDA_CvpcbFrame* m_Parent;
+    CVPCB_MAINFRAME* m_Parent;
     wxConfig * m_Config;
     wxString             m_UserLibDirBufferImg;
     bool m_LibListChanged;
@@ -36,7 +36,7 @@ private:
 
 
 public:
-    DIALOG_CVPCB_CONFIG( WinEDA_CvpcbFrame* parent );
+    DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent );
     ~DIALOG_CVPCB_CONFIG() {};
 };
 

cvpcb/genequiv.cpp

@@ -10,10 +10,10 @@
 
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 
 
-void WinEDA_CvpcbFrame::WriteStuffList( wxCommandEvent& event )
+void CVPCB_MAINFRAME::WriteStuffList( wxCommandEvent& event )
 {
     FILE*      FileEquiv;
     wxString   Line;

cvpcb/init.cpp

@@ -11,6 +11,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 
 #include "build_version.h"
@@ -19,7 +20,7 @@
  * Set the module to the selected component
  * Selects the next component
  */
-void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
+void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
 {
     COMPONENT* Component;
     bool       isUndefined = false;
@@ -69,7 +70,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
 /*
  * Read the netlist format and file components.
  */
-bool WinEDA_CvpcbFrame::ReadNetList()
+bool CVPCB_MAINFRAME::ReadNetList()
 {
     wxString   msg;
     int        error_level;
@@ -90,7 +91,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
         return false;
 
     LoadProjectFile( m_NetlistFileName.GetFullPath() );
-    LoadFootprintFiles( m_ModuleLibNames, m_footprints );
+    LoadFootprintFiles( );
     BuildFOOTPRINTS_LISTBOX();
 
     m_ListCmp->Clear();
@@ -124,7 +125,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
  * The full name of the netlist file must be in FFileName.
  * The file name is deducted in cmp
  */
-int WinEDA_CvpcbFrame::SaveNetList( const wxString& fileName )
+int CVPCB_MAINFRAME::SaveNetList( const wxString& fileName )
 {
     wxFileName fn;
 

cvpcb/listboxes.cpp

@@ -8,6 +8,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 #include "cvpcb_id.h"
 
@@ -20,7 +21,7 @@
 #define LISTB_STYLE wxSUNKEN_BORDER | wxLC_NO_HEADER | \
     wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_VIRTUAL
 
-ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( WinEDA_CvpcbFrame* aParent, wxWindowID aId,
+ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
                                         const wxPoint& aLocation, const wxSize& aSize ) :
     wxListView( aParent, aId, aLocation, aSize, LISTB_STYLE )
 {
@@ -57,16 +58,16 @@ int ITEMS_LISTBOX_BASE::GetSelection()
 }
 
 
-WinEDA_CvpcbFrame* ITEMS_LISTBOX_BASE::GetParent()
+CVPCB_MAINFRAME* ITEMS_LISTBOX_BASE::GetParent()
 {
-    return (WinEDA_CvpcbFrame*) wxListView::GetParent();
+    return (CVPCB_MAINFRAME*) wxListView::GetParent();
 }
 
 
 /*
  * Create or update the schematic components list.
  */
-void WinEDA_CvpcbFrame::BuildCmpListBox()
+void CVPCB_MAINFRAME::BuildCmpListBox()
 {
     wxString msg;
     wxSize   size( 10, 10 );
@@ -103,7 +104,7 @@ void WinEDA_CvpcbFrame::BuildCmpListBox()
 /*
  * Create or update the footprint list.
  */
-void WinEDA_CvpcbFrame::BuildFOOTPRINTS_LISTBOX()
+void CVPCB_MAINFRAME::BuildFOOTPRINTS_LISTBOX()
 {
     wxString msg;
     wxSize   size( 10, 10 );

cvpcb/loadcmp.cpp

@@ -13,7 +13,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 #include "class_DisplayFootprintsFrame.h"
 #include "richio.h"
 #include "filter_reader.h"
@@ -36,7 +36,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& CmpName )
     wxString   tmp, msg;
     wxFileName fn;
     MODULE*    Module = NULL;
-    WinEDA_CvpcbFrame* parent = ( WinEDA_CvpcbFrame* ) GetParent();
+    CVPCB_MAINFRAME* parent = ( CVPCB_MAINFRAME* ) GetParent();
 
     for( ii = 0; ii < parent->m_ModuleLibNames.GetCount(); ii++ )
     {

cvpcb/menubar.cpp

@@ -9,13 +9,13 @@
 #include "gestfich.h"
 
 #include "cvpcb.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 #include "cvpcb_id.h"
 
 #include "bitmaps.h"
 
 
-void WinEDA_CvpcbFrame::ReCreateMenuBar()
+void CVPCB_MAINFRAME::ReCreateMenuBar()
 {
     wxMenuItem* item;
     wxMenuBar*  menuBar = GetMenuBar();

cvpcb/protos.h

@@ -10,8 +10,6 @@ extern int GenNetlistPcbnew( FILE* f, COMPONENT_LIST& list,
                              bool rightJustify = false );
 extern bool LoadComponentFile( const wxString& fileName,
                                COMPONENT_LIST& list );
-extern bool LoadFootprintFiles( const wxArrayString& libNames,
-                                FOOTPRINT_LIST& list );
 
 FOOTPRINT* GetModuleDescrByName( const wxString& FootprintName,
                                  FOOTPRINT_LIST& list );

cvpcb/readschematicnetlist.cpp

@@ -3,8 +3,6 @@
 /****************************/
 
 /* Read a nelist type Eeschema or OrcadPCB2 and build the component list
- * Manages the lines like :
- * ( XXXXXX VALEUR|(pin1,pin2,...=newalim) ID VALEUR
  */
 
 #include "fctsys.h"
@@ -16,7 +14,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 
 #include "richio.h"
 
@@ -86,7 +84,7 @@ static int ReadFootprintFilterList( FILE_LINE_READER& aNetlistReader, COMPONENT_
  * $endfootprintlist
  * }
  */
-int WinEDA_CvpcbFrame::ReadSchematicNetlist()
+int CVPCB_MAINFRAME::ReadSchematicNetlist()
 {
     char       alim[1024];
     int        idx, jj, k, l;

cvpcb/savecmp.cpp

@@ -13,7 +13,7 @@
 
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 
 #include "build_version.h"
 
@@ -30,7 +30,7 @@ const wxString titleComponentLibErr( _( "Component Library Error" ) );
  * @param NetlistFullFileName - Name of net list file to save.
  * @returns - 1 if OK, 0 if error.
  */
-int WinEDA_CvpcbFrame::SaveComponentList( const wxString& NetlistFullFileName )
+int CVPCB_MAINFRAME::SaveComponentList( const wxString& NetlistFullFileName )
 {
     FILE*       dest;
     wxFileName  fn( NetlistFullFileName );

cvpcb/setvisu.cpp

@@ -9,6 +9,7 @@
 #include "bitmaps.h"
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvpcb_mainframe.h"
 #include "cvstruct.h"
 #include "class_DisplayFootprintsFrame.h"
 
@@ -25,7 +26,7 @@
  * Create or Update the frame showing the current highlighted footprint
  * and (if showed) the 3D display frame
  */
-void WinEDA_CvpcbFrame::CreateScreenCmp()
+void CVPCB_MAINFRAME::CreateScreenCmp()
 {
     wxString msg, FootprintName;
     bool     IsNew = FALSE;

cvpcb/tool_cvpcb.cpp

@@ -10,11 +10,11 @@
 #include "bitmaps.h"
 #include "cvpcb.h"
 #include "protos.h"
-#include "cvstruct.h"
+#include "cvpcb_mainframe.h"
 #include "cvpcb_id.h"
 
 
-void WinEDA_CvpcbFrame::ReCreateHToolbar()
+void CVPCB_MAINFRAME::ReCreateHToolbar()
 {
     wxConfig* config = wxGetApp().m_EDA_Config;
 

demos/interf_u/interf_u-cache.lib

-EESchema-LIBRARY Version 2.3  Date: 07/12/2010 12:09:24
+EESchema-LIBRARY Version 2.3  Date: 02/02/2011 07:13:37
 #
 # 4003APG120
 #

demos/interf_u/interf_u.cmp

-Cmp-Mod V01 Genere par PcbNew le 17/01/2011 13:55:19
-
-BeginCmp
-TimeStamp = /322D3011;
-Reference = BUS1;
-ValeurCmp = BUSPC;
-IdModule  = BUS_PC;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DE2;
-Reference = C1;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307ECF;
-Reference = C2;
-ValeurCmp = 47pF;
-IdModule  = C1;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307ED4;
-Reference = C3;
-ValeurCmp = 47pF;
-IdModule  = C1;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DCF;
-Reference = C4;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DCA;
-Reference = C5;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DC0;
-Reference = C6;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32AC;
-Reference = D1;
-ValeurCmp = LED;
-IdModule  = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32BE;
-Reference = D2;
-ValeurCmp = LED;
-IdModule  = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /32568D1E;
-Reference = JP1;
-ValeurCmp = CONN_8X2;
-IdModule  = pin_array_8x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /3256759C;
-Reference = P1;
-ValeurCmp = DB25FEMELLE;
-IdModule  = DB25FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EA1;
-Reference = R1;
-ValeurCmp = 100K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EAA;
-Reference = R2;
-ValeurCmp = 1K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /324002E6;
-Reference = R3;
-ValeurCmp = 10K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D3295;
-Reference = R4;
-ValeurCmp = 330;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32A0;
-Reference = R5;
-ValeurCmp = 330;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /325679C1;
-Reference = RR1;
-ValeurCmp = 9x1K;
-IdModule  = r_pack9;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D31F4;
-Reference = U1;
-ValeurCmp = 74LS245;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D35B4;
-Reference = U2;
-ValeurCmp = 74LS688;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A087146;
-Reference = U3;
-ValeurCmp = 74LS541;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /3240023F;
-Reference = U5;
-ValeurCmp = 628128;
-IdModule  = DIP-32__600;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D321C;
-Reference = U8;
-ValeurCmp = EP600;
-IdModule  = 24dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32FA;
-Reference = U9;
-ValeurCmp = 4003APG120;
-IdModule  = PGA120;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EC0;
-Reference = X1;
-ValeurCmp = 8MHz;
-IdModule  = HC-18UH;
-EndCmp
+Cmp-Mod V01 Created by CvPCB (2011-02-04 BZR 2793)-testing date = 05/02/2011 15:42:18
 
 EndListe

demos/interf_u/interf_u.pro

-update=01/02/2011 18:49:08
+update=04/02/2011 22:02:33
 version=1
-last_client=eeschema
+last_client=pcbnew
 [common]
 NetDir=
 [general]
@@ -12,33 +12,6 @@ version=1
 NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[pcbnew]
-version=1
-PadDrlX=354
-PadDimH=550
-PadDimV=550
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=50
-TxtLar=170
-MSegLar=400
-LastNetListRead=interf_u.net
-[pcbnew/libraries]
-LibDir=F:\\kicad\\share\\modules\\packages3d
-LibName1=connect
-LibName2=discret
-LibName3=dip_sockets
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
 [eeschema]
 version=1
 LibDir=
@@ -82,3 +55,30 @@ LibName8=adc-dac
 LibName9=memory
 LibName10=xilinx
 LibName11=special
+[pcbnew]
+version=1
+PadDrlX=354
+PadDimH=550
+PadDimV=550
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=50
+TxtLar=170
+MSegLar=400
+LastNetListRead=interf_u.net
+[pcbnew/libraries]
+LibDir=F:\\kicad\\share\\modules\\packages3d
+LibName1=connect
+LibName2=discret
+LibName3=dip_sockets
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display

demos/interf_u/interf_u.sch

-EESchema Schematic File Version 2  date 07/12/2010 12:09:23
+EESchema Schematic File Version 2  date 02/02/2011 07:13:59
 LIBS:power
 LIBS:device
 LIBS:conn

include/bitmaps.h

@@ -180,6 +180,7 @@ extern const char* lang_en_xpm[];
 extern const char* lang_es_xpm[];
 extern const char* lang_fr_xpm[];
 extern const char* lang_fi_xpm[];
+extern const char* lang_gr_xpm[];
 extern const char* lang_hu_xpm[];
 extern const char* lang_it_xpm[];
 extern const char* lang_jp_xpm[];

include/id.h

@@ -88,6 +88,7 @@ enum main_id
     ID_LANGUAGE_FINNISH,
     ID_LANGUAGE_SPANISH,
     ID_LANGUAGE_GERMAN,
+    ID_LANGUAGE_GREEK,
     ID_LANGUAGE_RUSSIAN,
     ID_LANGUAGE_PORTUGUESE,
     ID_LANGUAGE_ITALIAN,

pcbnew/class_module.cpp

@@ -22,6 +22,7 @@
 #include "3d_struct.h"
 #include "protos.h"
 #include "richio.h"
+#include "filter_reader.h"
 
 
 /*********************************************/