haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhanced dialog for BOM generation and updated french and korean translationd

This commit is contained in:
CHARRAS 2007-07-02 12:48:10 +00:00
parent eeab554183
commit 75ce192333
11 changed files with 1755 additions and 1045 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
eeschema/dialog_build_BOM.cpp
View File

@ -75,6 +75,7 @@ static bool s_ListHierarchicalPinByName;
static bool s_ListBySheet;
static bool s_BrowsList;
static int s_OutputFormOpt;
static int s_OutputSeparatorOpt;
static bool s_Add_F1_state;
static bool s_Add_F2_state;
static bool s_Add_F3_state;
@ -83,7 +84,27 @@ static bool s_Add_F5_state;
static bool s_Add_F6_state;
static bool s_Add_F7_state;
static bool s_Add_F8_state;
static bool * s_AddFieldList[] = {
& s_Add_F1_state,
& s_Add_F2_state,
& s_Add_F3_state,
& s_Add_F4_state,
& s_Add_F5_state,
& s_Add_F6_state,
& s_Add_F7_state,
& s_Add_F8_state,
NULL
};
#define OPTION_BOM_FORMAT wxT("BomFormat")
#define OPTION_BOM_SEPARATOR wxT("BomExportSeparator")
#define OPTION_BOM_ADD_FIELD wxT("BomAddField")
/* list of separators used in bom export to spreadsheet
(selected by s_OutputSeparatorOpt, and s_OutputSeparatorOpt radiobox) */
static char s_ExportSeparator[] = ("\t;,.");
static char s_ExportSeparatorSymbol;
/*!
* WinEDA_Build_BOM_Frame type definition
*/
@ -99,6 +120,8 @@ BEGIN_EVENT_TABLE( WinEDA_Build_BOM_Frame, wxDialog )
////@begin WinEDA_Build_BOM_Frame event table entries
EVT_CLOSE( WinEDA_Build_BOM_Frame::OnCloseWindow )
EVT_RADIOBOX( ID_RADIOBOX_SELECT_FORMAT, WinEDA_Build_BOM_Frame::OnRadioboxSelectFormatSelected )
EVT_BUTTON( wxID_OK, WinEDA_Build_BOM_Frame::OnOkClick )
EVT_BUTTON( wxID_EXIT, WinEDA_Build_BOM_Frame::OnExitClick )
@ -128,7 +151,28 @@ WinEDA_Build_BOM_Frame::WinEDA_Build_BOM_Frame( WinEDA_DrawFrame* parent,
const wxSize& size, long style )
{
m_Parent = parent;
/* Get options */
s_OutputFormOpt = m_Parent->m_Parent->m_EDA_Config->Read(OPTION_BOM_FORMAT, (long) 0);
s_OutputSeparatorOpt = m_Parent->m_Parent->m_EDA_Config->Read(OPTION_BOM_SEPARATOR, (long) 0);
long addfields = m_Parent->m_Parent->m_EDA_Config->Read(OPTION_BOM_ADD_FIELD, (long) 0);
for ( int ii = 0, bitmask = 1; s_AddFieldList[ii] != NULL; ii++ )
{
if ( (addfields & bitmask) ) * s_AddFieldList[ii] = true;
else * s_AddFieldList[ii] = false;
bitmask <<= 1;
}
Create(parent, id, caption, pos, size, style);
m_OutputFormCtrl->SetSelection(s_OutputFormOpt);
m_OutputSeparatorCtrl->SetSelection(s_OutputSeparatorOpt);
if ( s_OutputFormOpt == 1 )
m_OutputSeparatorCtrl->Enable(true);
else
m_OutputSeparatorCtrl->Enable(false);
}
/*!
@ -144,6 +188,8 @@ bool WinEDA_Build_BOM_Frame::Create( wxWindow* parent, wxWindowID id, const wxSt
m_GenListLabelsbyVal = NULL;
m_GenListLabelsbySheet = NULL;
m_OutputFormCtrl = NULL;
m_OutputSeparatorCtrl = NULL;
m_GetListBrowser = NULL;
m_FieldsToAppendListSizer = NULL;
m_AddField1 = NULL;
m_AddField2 = NULL;
@ -153,7 +199,6 @@ bool WinEDA_Build_BOM_Frame::Create( wxWindow* parent, wxWindowID id, const wxSt
m_AddField6 = NULL;
m_AddField7 = NULL;
m_AddField8 = NULL;
m_GetListBrowser = NULL;
////@end WinEDA_Build_BOM_Frame member initialisation
////@begin WinEDA_Build_BOM_Frame creation
@ -179,7 +224,7 @@ void WinEDA_Build_BOM_Frame::CreateControls()
SetFont(*g_DialogFont);
////@begin WinEDA_Build_BOM_Frame content construction
// Generated by DialogBlocks, 09/05/2007 13:11:12 (unregistered)
// Generated by DialogBlocks, 01/07/2007 21:25:39 (unregistered)
WinEDA_Build_BOM_Frame* itemDialog1 = this;
@ -190,42 +235,61 @@ void WinEDA_Build_BOM_Frame::CreateControls()
itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW|wxALL, 5);
itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5);
wxStaticBox* itemStaticBoxSizer5Static = new wxStaticBox(itemDialog1, wxID_ANY, _("List items : "));
wxStaticBoxSizer* itemStaticBoxSizer5 = new wxStaticBoxSizer(itemStaticBoxSizer5Static, wxVERTICAL);
itemBoxSizer4->Add(itemStaticBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
itemBoxSizer4->Add(itemStaticBoxSizer5, 0, wxGROW|wxALL, 5);
m_ListCmpbyRefItems = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Components by Reference"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_ListCmpbyRefItems->SetValue(true);
itemStaticBoxSizer5->Add(m_ListCmpbyRefItems, 0, wxGROW|wxALL, 5);
itemStaticBoxSizer5->Add(m_ListCmpbyRefItems, 0, wxALIGN_LEFT|wxALL, 5);
m_ListSubCmpItems = new wxCheckBox( itemDialog1, ID_CHECKBOX2, _("Sub Components (i.e U2A, U2B..)"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_ListSubCmpItems->SetValue(false);
itemStaticBoxSizer5->Add(m_ListSubCmpItems, 0, wxGROW|wxALL, 5);
itemStaticBoxSizer5->Add(m_ListSubCmpItems, 0, wxALIGN_LEFT|wxALL, 5);
m_ListCmpbyValItems = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Components by Value"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_ListCmpbyValItems->SetValue(true);
itemStaticBoxSizer5->Add(m_ListCmpbyValItems, 0, wxGROW|wxALL, 5);
itemStaticBoxSizer5->Add(m_ListCmpbyValItems, 0, wxALIGN_LEFT|wxALL, 5);
m_GenListLabelsbyVal = new wxCheckBox( itemDialog1, ID_CHECKBOX3, _("Hierachy Pins by name"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_GenListLabelsbyVal->SetValue(false);
itemStaticBoxSizer5->Add(m_GenListLabelsbyVal, 0, wxGROW|wxALL, 5);
itemStaticBoxSizer5->Add(m_GenListLabelsbyVal, 0, wxALIGN_LEFT|wxALL, 5);
m_GenListLabelsbySheet = new wxCheckBox( itemDialog1, ID_CHECKBOX4, _("Hierachy Pins by Sheets"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_GenListLabelsbySheet->SetValue(false);
itemStaticBoxSizer5->Add(m_GenListLabelsbySheet, 0, wxGROW|wxALL, 5);
itemStaticBoxSizer5->Add(m_GenListLabelsbySheet, 0, wxALIGN_LEFT|wxALL, 5);
wxArrayString m_OutputFormCtrlStrings;
m_OutputFormCtrlStrings.Add(_("Print as list"));
m_OutputFormCtrlStrings.Add(_("Print as text for spreadsheet import"));
m_OutputFormCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Ouput:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlStrings, 1, wxRA_SPECIFY_COLS );
m_OutputFormCtrlStrings.Add(_("List"));
m_OutputFormCtrlStrings.Add(_("Text for spreadsheet import"));
m_OutputFormCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlStrings, 1, wxRA_SPECIFY_COLS );
m_OutputFormCtrl->SetSelection(0);
itemBoxSizer4->Add(m_OutputFormCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
itemBoxSizer4->Add(m_OutputFormCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Fields to Add"));
m_FieldsToAppendListSizer = new wxStaticBoxSizer(itemStaticBoxSizer12Static, wxVERTICAL);
itemBoxSizer3->Add(m_FieldsToAppendListSizer, 0, wxGROW|wxALL, 5);
wxArrayString m_OutputSeparatorCtrlStrings;
m_OutputSeparatorCtrlStrings.Add(_("Tab"));
m_OutputSeparatorCtrlStrings.Add(_(";"));
m_OutputSeparatorCtrlStrings.Add(_(","));
m_OutputSeparatorCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX_SEPARATOR, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlStrings, 1, wxRA_SPECIFY_ROWS );
m_OutputSeparatorCtrl->SetSelection(0);
itemBoxSizer4->Add(m_OutputSeparatorCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Options"));
wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL);
itemBoxSizer4->Add(itemStaticBoxSizer13, 0, wxGROW|wxALL, 5);
m_GetListBrowser = new wxCheckBox( itemDialog1, ID_CHECKBOX6, _("Launch list browser"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_GetListBrowser->SetValue(false);
itemStaticBoxSizer13->Add(m_GetListBrowser, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer15, 0, 0, 0);
wxStaticBox* itemStaticBoxSizer16Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Fields to Add"));
m_FieldsToAppendListSizer = new wxStaticBoxSizer(itemStaticBoxSizer16Static, wxVERTICAL);
itemBoxSizer15->Add(m_FieldsToAppendListSizer, 0, wxGROW|wxALL, 5);
m_AddField1 = new wxCheckBox( itemDialog1, ID_CHECKBOX_FIELD1, _("Add Field 1"), wxDefaultPosition, wxDefaultSize, 0 );
m_AddField1->SetValue(false);
@ -259,25 +323,19 @@ void WinEDA_Build_BOM_Frame::CreateControls()
m_AddField8->SetValue(false);
m_FieldsToAppendListSizer->Add(m_AddField8, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer21 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer15->Add(5, 5, 0, wxGROW|wxALL, 15);
wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&Create List"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton22->SetDefault();
itemButton22->SetForegroundColour(wxColour(166, 0, 0));
itemBoxSizer21->Add(itemButton22, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer15->Add(itemBoxSizer26, 0, wxGROW|wxALL, 5);
wxButton* itemButton23 = new wxButton( itemDialog1, wxID_EXIT, _("&Quit"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton23->SetForegroundColour(wxColour(0, 0, 210));
itemBoxSizer21->Add(itemButton23, 0, wxGROW|wxALL, 5);
wxButton* itemButton27 = new wxButton( itemDialog1, wxID_OK, _("&Create List"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton27->SetDefault();
itemButton27->SetForegroundColour(wxColour(166, 0, 0));
itemBoxSizer26->Add(itemButton27, 0, wxGROW|wxALL, 5);
wxStaticBox* itemStaticBoxSizer24Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Options"));
wxStaticBoxSizer* itemStaticBoxSizer24 = new wxStaticBoxSizer(itemStaticBoxSizer24Static, wxHORIZONTAL);
itemBoxSizer2->Add(itemStaticBoxSizer24, 0, wxGROW|wxALL, 10);
m_GetListBrowser = new wxCheckBox( itemDialog1, ID_CHECKBOX5, _("Launch list browser"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_GetListBrowser->SetValue(false);
itemStaticBoxSizer24->Add(m_GetListBrowser, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton28 = new wxButton( itemDialog1, wxID_EXIT, _("&Quit"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton28->SetForegroundColour(wxColour(0, 0, 210));
itemBoxSizer26->Add(itemButton28, 0, wxGROW|wxALL, 5);
// Set validators
m_ListCmpbyRefItems->SetValidator( wxGenericValidator(& s_ListByRef) );
@ -286,6 +344,8 @@ void WinEDA_Build_BOM_Frame::CreateControls()
m_GenListLabelsbyVal->SetValidator( wxGenericValidator(& s_ListHierarchicalPinByName) );
m_GenListLabelsbySheet->SetValidator( wxGenericValidator(& s_ListBySheet) );
m_OutputFormCtrl->SetValidator( wxGenericValidator(& s_OutputFormOpt) );
m_OutputSeparatorCtrl->SetValidator( wxGenericValidator(& s_OutputSeparatorOpt) );
m_GetListBrowser->SetValidator( wxGenericValidator(& s_BrowsList) );
m_AddField1->SetValidator( wxGenericValidator(& s_Add_F1_state) );
m_AddField2->SetValidator( wxGenericValidator(& s_Add_F2_state) );
m_AddField3->SetValidator( wxGenericValidator(& s_Add_F3_state) );
@ -294,7 +354,6 @@ void WinEDA_Build_BOM_Frame::CreateControls()
m_AddField6->SetValidator( wxGenericValidator(& s_Add_F6_state) );
m_AddField7->SetValidator( wxGenericValidator(& s_Add_F7_state) );
m_AddField8->SetValidator( wxGenericValidator(& s_Add_F8_state) );
m_GetListBrowser->SetValidator( wxGenericValidator(& s_BrowsList) );
////@end WinEDA_Build_BOM_Frame content construction
}
@ -349,15 +408,7 @@ void WinEDA_Build_BOM_Frame::OnOkClick( wxCommandEvent& event )
void WinEDA_Build_BOM_Frame::OnExitClick( wxCommandEvent& event )
{
s_Add_F1_state = m_AddField1->GetValue();
s_Add_F2_state = m_AddField2->GetValue();
s_Add_F3_state = m_AddField3->GetValue();
s_Add_F4_state = m_AddField4->GetValue();
s_Add_F5_state = m_AddField5->GetValue();
s_Add_F6_state = m_AddField6->GetValue();
s_Add_F7_state = m_AddField7->GetValue();
s_Add_F8_state = m_AddField8->GetValue();
s_OutputFormOpt = m_OutputFormCtrl->GetSelection();
SavePreferences();
EndModal(0);
}
@ -375,6 +426,9 @@ wxString mask, filename;
s_ListBySheet = m_GenListLabelsbySheet->GetValue();
s_BrowsList = m_GetListBrowser->GetValue();
s_OutputFormOpt = m_OutputFormCtrl->GetSelection();
s_OutputSeparatorOpt = m_OutputSeparatorCtrl->GetSelection();
if ( s_OutputSeparatorOpt < 0 ) s_OutputSeparatorOpt = 0;
s_ExportSeparatorSymbol = s_ExportSeparator[s_OutputSeparatorOpt];
m_ListFileName = ScreenSch->m_FileName;
ChangeFileNameExt(m_ListFileName, EXT_LIST);
@ -861,7 +915,8 @@ wxCheckBox * FieldCtrl = FieldListCtrl[0];
if ( CompactForm )
{
fprintf(f, ";%s", CONV_TO_UTF8(DrawLibItem->m_Field[FOOTPRINT].m_Text));
fprintf(f, "%c%s", s_ExportSeparatorSymbol,
CONV_TO_UTF8(DrawLibItem->m_Field[FOOTPRINT].m_Text));
}
for ( ii = FIELD1; ii <= FIELD8; ii ++ )
@ -869,7 +924,8 @@ wxCheckBox * FieldCtrl = FieldListCtrl[0];
FieldCtrl = FieldListCtrl[ii-FIELD1];
if ( FieldCtrl == NULL ) continue;
if ( ! FieldCtrl->IsChecked() ) continue;
if ( CompactForm ) fprintf(f, ";%s", CONV_TO_UTF8(DrawLibItem->m_Field[ii].m_Text));
if ( CompactForm ) fprintf(f, "%c%s", s_ExportSeparatorSymbol,
CONV_TO_UTF8(DrawLibItem->m_Field[ii].m_Text));
else fprintf(f, "; %-12s", CONV_TO_UTF8(DrawLibItem->m_Field[ii].m_Text));
}
}
@ -890,7 +946,9 @@ wxString msg;
if ( CompactForm )
{
fprintf(f, "ref;value;sheet number;sheet name;footprint" );
fprintf(f, "ref%cvalue%csheet number%csheet name%cfootprint",
s_ExportSeparatorSymbol, s_ExportSeparatorSymbol,
s_ExportSeparatorSymbol, s_ExportSeparatorSymbol );
wxCheckBox * FieldListCtrl[FIELD8-FIELD1+1] = {
m_AddField1,
m_AddField2,
@ -907,7 +965,7 @@ wxString msg;
if ( FieldCtrl == NULL ) continue;
if ( ! FieldCtrl->IsChecked() ) continue;
msg = _("Field");
fprintf(f, ";%s%d", CONV_TO_UTF8(msg), ii - FIELD1 + 1);
fprintf(f, "%c%s%d", s_ExportSeparatorSymbol, CONV_TO_UTF8(msg), ii - FIELD1 + 1);
}
fprintf( f, "\n");
}
@ -937,7 +995,7 @@ wxString msg;
sprintf( NameCmp,"%s", CONV_TO_UTF8(DrawLibItem->m_Field[REFERENCE].m_Text) );
if ( ! CompactForm || Unit != ' ' ) sprintf( NameCmp+strlen(NameCmp),"%c", Unit);
if ( CompactForm ) fprintf(f, "%s;%s", NameCmp,
if ( CompactForm ) fprintf(f, "%s%c%s", NameCmp, s_ExportSeparatorSymbol,
CONV_TO_UTF8(DrawLibItem->m_Field[VALUE].m_Text));
else fprintf(f, "| %-10s %-12s", NameCmp,
CONV_TO_UTF8(DrawLibItem->m_Field[VALUE].m_Text));
@ -950,7 +1008,7 @@ wxString msg;
sheetname = sheet->m_SheetName;
else sheetname = _("Root");
if ( CompactForm )
fprintf(f, ";%d;%s", DrawLibItem->m_FlagControlMulti,
fprintf(f, "%c%d;%s", s_ExportSeparatorSymbol, DrawLibItem->m_FlagControlMulti,
CONV_TO_UTF8(sheetname));
else fprintf(f, " (Sheet %.2d: \"%s\")", DrawLibItem->m_FlagControlMulti,
CONV_TO_UTF8(sheetname));
@ -1078,6 +1136,14 @@ wxString msg;
*/
void WinEDA_Build_BOM_Frame::OnCloseWindow( wxCloseEvent& event )
{
SavePreferences();
EndModal(0);
}
/**************************************************/
void WinEDA_Build_BOM_Frame::SavePreferences(void)
/**************************************************/
{
s_Add_F1_state = m_AddField1->GetValue();
s_Add_F2_state = m_AddField2->GetValue();
@ -1087,7 +1153,32 @@ void WinEDA_Build_BOM_Frame::OnCloseWindow( wxCloseEvent& event )
s_Add_F6_state = m_AddField6->GetValue();
s_Add_F7_state = m_AddField7->GetValue();
s_Add_F8_state = m_AddField8->GetValue();
EndModal(0);
s_OutputFormOpt = m_OutputFormCtrl->GetSelection();
s_OutputSeparatorOpt = m_OutputSeparatorCtrl->GetSelection();
m_Parent->m_Parent->m_EDA_Config->Write(OPTION_BOM_FORMAT, (long)s_OutputFormOpt);
m_Parent->m_Parent->m_EDA_Config->Write(OPTION_BOM_SEPARATOR, (long) s_OutputSeparatorOpt);
long addfields = 0;
for ( int ii = 0, bitmask = 1; s_AddFieldList[ii] != NULL; ii++ )
{
if ( * s_AddFieldList[ii] ) addfields |= bitmask;
bitmask <<= 1;
}
m_Parent->m_Parent->m_EDA_Config->Write(OPTION_BOM_ADD_FIELD, addfields);
}
/*!
* wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX1
*/
void WinEDA_Build_BOM_Frame::OnRadioboxSelectFormatSelected( wxCommandEvent& event )
{
if ( m_OutputFormCtrl->GetSelection() == 1 )
m_OutputSeparatorCtrl->Enable(true);
else
m_OutputSeparatorCtrl->Enable(false);
}

12
eeschema/dialog_build_BOM.h
View File

@ -44,7 +44,9 @@
#define ID_CHECKBOX1 10003
#define ID_CHECKBOX3 10005
#define ID_CHECKBOX4 10006
#define ID_RADIOBOX1 10009
#define ID_RADIOBOX_SELECT_FORMAT 10009
#define ID_RADIOBOX_SEPARATOR 10015
#define ID_CHECKBOX6 10016
#define ID_CHECKBOX_FIELD1 10007
#define ID_CHECKBOX_FIELD2 10008
#define ID_CHECKBOX_FIELD4 10010
@ -52,7 +54,6 @@
#define ID_CHECKBOX_FIELD6 10012
#define ID_CHECKBOX_FIELD7 10013
#define ID_CHECKBOX_FIELD8 10014
#define ID_CHECKBOX5 10002
#define SYMBOL_WINEDA_BUILD_BOM_FRAME_STYLE wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxSTAY_ON_TOP|wxCLOSE_BOX
#define SYMBOL_WINEDA_BUILD_BOM_FRAME_TITLE _("List of Material")
#define SYMBOL_WINEDA_BUILD_BOM_FRAME_IDNAME ID_DIALOG
@ -101,6 +102,9 @@ public:
/// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
void OnCloseWindow( wxCloseEvent& event );
/// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX_SELECT_FORMAT
void OnRadioboxSelectFormatSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
void OnOkClick( wxCommandEvent& event );
@ -124,6 +128,7 @@ public:
int PrintListeCmpByRef( FILE * f, EDA_BaseStruct ** List, int NbItems, bool CompactForm = FALSE );
int PrintListeCmpByVal( FILE *f, EDA_BaseStruct **List, int NbItems);
void PrintFieldData(FILE * f, EDA_SchComponentStruct * DrawLibItem, bool CompactForm = FALSE);
void SavePreferences(void);
/// Should we show tooltips?
@ -136,6 +141,8 @@ public:
wxCheckBox* m_GenListLabelsbyVal;
wxCheckBox* m_GenListLabelsbySheet;
wxRadioBox* m_OutputFormCtrl;
wxRadioBox* m_OutputSeparatorCtrl;
wxCheckBox* m_GetListBrowser;
wxStaticBoxSizer* m_FieldsToAppendListSizer;
wxCheckBox* m_AddField1;
wxCheckBox* m_AddField2;
@ -145,7 +152,6 @@ public:
wxCheckBox* m_AddField6;
wxCheckBox* m_AddField7;
wxCheckBox* m_AddField8;
wxCheckBox* m_GetListBrowser;
////@end WinEDA_Build_BOM_Frame member variables
WinEDA_DrawFrame * m_Parent;

1389
eeschema/dialog_build_BOM.pjd
View File

File diff suppressed because it is too large Load Diff

2
include/build_version.h
View File

@ -5,7 +5,7 @@
COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE
(wxT("(2007-06-26)"))
(wxT("(2007-07-02)"))
#endif
;

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

405
internat/fr/kicad.po
View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2007-06-26 09:46+0100\n"
"Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n"
"PO-Revision-Date: 2007-07-01 21:10+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@ -4525,11 +4525,11 @@ msgstr "P&ostprocesseurs"
msgid "Module Editor: module modified!, Continue ?"
msgstr "Editeur de Module: module modifié! Continuer ?"
#: pcbnew/hotkeys.cpp:127
#: pcbnew/hotkeys.cpp:156
msgid "Footprint found, but locked"
msgstr "Module trouvé, mais verrouillé"
#: pcbnew/hotkeys.cpp:248
#: pcbnew/hotkeys.cpp:277
msgid "Delete module?"
msgstr "Effacer Module?"
@ -4717,13 +4717,13 @@ msgid "Componant properties"
msgstr "Propriétés du composant"
#: eeschema/fieldedi.cpp:223
#: eeschema/dialog_build_BOM.cpp:274
#: eeschema/dialog_erc.cpp:237
#: eeschema/dialog_edit_component_in_lib.cpp:166
#: eeschema/dialog_create_component.cpp:176
#: eeschema/libedpart.cpp:241
#: eeschema/dialog_edit_component_in_schematic.cpp:204
#: eeschema/editpart.cpp:204
#: eeschema/dialog_build_BOM.cpp:327
#: cvpcb/options.cpp:138
#: cvpcb/dialog_display_options.h:43
msgid "Options"
@ -5631,196 +5631,6 @@ msgstr "Incr
msgid "Default Label Size"
msgstr "Taille Label par défaut:"
#: eeschema/dialog_build_BOM.cpp:195
msgid "List items : "
msgstr "Liste éléments:"
#: eeschema/dialog_build_BOM.cpp:199
#: eeschema/genliste.cpp:126
msgid "Components by Reference"
msgstr "Composants par référence"
#: eeschema/dialog_build_BOM.cpp:203
#: eeschema/genliste.cpp:132
msgid "Sub Components (i.e U2A, U2B..)"
msgstr "Sous Composants (i.e U2A, U2B..)"
#: eeschema/dialog_build_BOM.cpp:207
#: eeschema/genliste.cpp:129
msgid "Components by Value"
msgstr "Composants par valeur"
#: eeschema/dialog_build_BOM.cpp:211
#: eeschema/genliste.cpp:135
msgid "Hierachy Pins by name"
msgstr "Pins de hierarchie par nom"
#: eeschema/dialog_build_BOM.cpp:215
#: eeschema/genliste.cpp:138
msgid "Hierachy Pins by Sheets"
msgstr "Pins de hiérarchie par feuilles"
#: eeschema/dialog_build_BOM.cpp:220
msgid "Print as list"
msgstr "Imprimer comme liste"
#: eeschema/dialog_build_BOM.cpp:221
msgid "Print as text for spreadsheet import"
msgstr "Générer comme text pour importation dans un tableur"
#: eeschema/dialog_build_BOM.cpp:222
msgid "Ouput:"
msgstr "Sortie:"
#: eeschema/dialog_build_BOM.cpp:226
msgid "Fields to Add"
msgstr "Champ à ajouterr"
#: eeschema/dialog_build_BOM.cpp:230
msgid "Add Field 1"
msgstr "Ajouter Champ 1"
#: eeschema/dialog_build_BOM.cpp:234
msgid "Add Field 2"
msgstr "Ajouter Champ 2"
#: eeschema/dialog_build_BOM.cpp:238
msgid "Add Field 3"
msgstr "Ajouter Champ 3"
#: eeschema/dialog_build_BOM.cpp:242
msgid "Add Field 4"
msgstr "Ajouter Champ 4"
#: eeschema/dialog_build_BOM.cpp:246
msgid "Add Field 5"
msgstr "Ajouter Champ 5"
#: eeschema/dialog_build_BOM.cpp:250
msgid "Add Field 6"
msgstr "Ajouter Champ 6"
#: eeschema/dialog_build_BOM.cpp:254
msgid "Add Field 7"
msgstr "Ajouter Champ 7"
#: eeschema/dialog_build_BOM.cpp:258
msgid "Add Field 8"
msgstr "Ajouter Champ 8"
#: eeschema/dialog_build_BOM.cpp:265
#: eeschema/genliste.cpp:144
msgid "&Create List"
msgstr "&Créer Liste"
#: eeschema/dialog_build_BOM.cpp:270
#: eeschema/dialog_erc.cpp:218
msgid "&Quit"
msgstr "&Quitter"
#: eeschema/dialog_build_BOM.cpp:278
msgid "Launch list browser"
msgstr "Lancer le visualisateur de liste"
#: eeschema/dialog_build_BOM.cpp:383
msgid "Bill of material:"
msgstr "Liste du materiel:"
#: eeschema/dialog_build_BOM.cpp:427
#: eeschema/dialog_build_BOM.cpp:479
#: eeschema/genliste.cpp:214
msgid "Failed to open file "
msgstr "Erreur ouverture "
#: eeschema/dialog_build_BOM.cpp:543
#, c-format
msgid ""
"\n"
"#Glob labels ( order = Sheet Number ) count = %d\n"
msgstr ""
"\n"
"#Glob labels ( ordre = Numéro de feuiller ) nombre = %d\n"
#: eeschema/dialog_build_BOM.cpp:553
#, c-format
msgid ""
"\n"
"#Glob labels ( order = Alphab. ) count = %d\n"
"\n"
msgstr ""
"\n"
"#Glob labels ( ordre = Alphab. ) nombre = %d\n"
#: eeschema/dialog_build_BOM.cpp:560
#: eeschema/genliste.cpp:294
msgid ""
"\n"
"#End List\n"
msgstr ""
"\n"
"#End List\n"
#: eeschema/dialog_build_BOM.cpp:909
#: eeschema/component_class.cpp:53
msgid "Field"
msgstr "Champ"
#: eeschema/dialog_build_BOM.cpp:916
#: eeschema/genliste.cpp:584
msgid ""
"\n"
"#Cmp ( order = Reference )"
msgstr ""
"\n"
"#Cmp ( ordre = Reference )"
#: eeschema/dialog_build_BOM.cpp:917
#: eeschema/dialog_build_BOM.cpp:983
#: eeschema/genliste.cpp:585
#: eeschema/genliste.cpp:640
msgid " (with SubCmp)"
msgstr "avec sub-composants"
#: eeschema/dialog_build_BOM.cpp:951
#: eeschema/genliste.cpp:616
#: eeschema/hierarch.cpp:134
#: eeschema/erc.cpp:690
msgid "Root"
msgstr "Racine"
#: eeschema/dialog_build_BOM.cpp:965
#: eeschema/dialog_build_BOM.cpp:1017
#: eeschema/genliste.cpp:623
#: eeschema/genliste.cpp:672
msgid "#End Cmp\n"
msgstr "#End Cmp\n"
#: eeschema/dialog_build_BOM.cpp:982
#: eeschema/genliste.cpp:639
msgid ""
"\n"
"#Cmp ( order = Value )"
msgstr ""
"\n"
"#Cmp ( ordre = Valeur )"
#: eeschema/dialog_build_BOM.cpp:1042
#: eeschema/genliste.cpp:697
#, c-format
msgid "> %-28.28s Global (Sheet %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Global (feuille %.2d) pos: %3.3f, %3.3f\n"
#: eeschema/dialog_build_BOM.cpp:1058
#: eeschema/genliste.cpp:713
#, c-format
msgid "> %-28.28s Sheet %-7.7s (Sheet %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n"
#: eeschema/dialog_build_BOM.cpp:1071
#: eeschema/genliste.cpp:726
msgid "#End labels\n"
msgstr "#End labels\n"
#: eeschema/netlist_control.cpp:98
#: eeschema/netlist_control.cpp:252
#: gerbview/options.cpp:207
@ -5924,6 +5734,11 @@ msgstr "&Test Erc"
msgid "&Del Markers"
msgstr "&Supprimer Marqueurs"
#: eeschema/dialog_erc.cpp:218
#: eeschema/dialog_build_BOM.cpp:323
msgid "&Quit"
msgstr "&Quitter"
#: eeschema/dialog_erc.cpp:222
msgid "erc"
msgstr "erc"
@ -6152,7 +5967,7 @@ msgid " Normal"
msgstr " Normal"
#: eeschema/genliste.cpp:101
#: eeschema/dialog_build_BOM.h:57
#: eeschema/dialog_build_BOM.h:58
msgid "List of Material"
msgstr "Liste du Matériel"
@ -6160,6 +5975,36 @@ msgstr "Liste du Mat
msgid " List items : "
msgstr " Liste éléments: "
#: eeschema/genliste.cpp:126
#: eeschema/dialog_build_BOM.cpp:244
msgid "Components by Reference"
msgstr "Composants par référence"
#: eeschema/genliste.cpp:129
#: eeschema/dialog_build_BOM.cpp:252
msgid "Components by Value"
msgstr "Composants par valeur"
#: eeschema/genliste.cpp:132
#: eeschema/dialog_build_BOM.cpp:248
msgid "Sub Components (i.e U2A, U2B..)"
msgstr "Sous Composants (i.e U2A, U2B..)"
#: eeschema/genliste.cpp:135
#: eeschema/dialog_build_BOM.cpp:256
msgid "Hierachy Pins by name"
msgstr "Pins de hierarchie par nom"
#: eeschema/genliste.cpp:138
#: eeschema/dialog_build_BOM.cpp:260
msgid "Hierachy Pins by Sheets"
msgstr "Pins de hiérarchie par feuilles"
#: eeschema/genliste.cpp:144
#: eeschema/dialog_build_BOM.cpp:318
msgid "&Create List"
msgstr "&Créer Liste"
#: eeschema/genliste.cpp:149
#: 3d-viewer/3d_toolbar.cpp:112
msgid "&Exit"
@ -6169,6 +6014,12 @@ msgstr "&Quitter"
msgid "List of material:"
msgstr "Liste du Matériel:"
#: eeschema/genliste.cpp:214
#: eeschema/dialog_build_BOM.cpp:476
#: eeschema/dialog_build_BOM.cpp:528
msgid "Failed to open file "
msgstr "Erreur ouverture "
#: eeschema/genliste.cpp:277
msgid ""
"\n"
@ -6185,6 +6036,71 @@ msgstr ""
"\n"
"#Glob labels ( ordre = Alphab. )\n"
#: eeschema/genliste.cpp:294
#: eeschema/dialog_build_BOM.cpp:609
msgid ""
"\n"
"#End List\n"
msgstr ""
"\n"
"#End List\n"
#: eeschema/genliste.cpp:584
#: eeschema/dialog_build_BOM.cpp:969
msgid ""
"\n"
"#Cmp ( order = Reference )"
msgstr ""
"\n"
"#Cmp ( ordre = Reference )"
#: eeschema/genliste.cpp:585
#: eeschema/genliste.cpp:640
#: eeschema/dialog_build_BOM.cpp:970
#: eeschema/dialog_build_BOM.cpp:1036
msgid " (with SubCmp)"
msgstr "avec sub-composants"
#: eeschema/genliste.cpp:616
#: eeschema/hierarch.cpp:134
#: eeschema/erc.cpp:690
#: eeschema/dialog_build_BOM.cpp:1004
msgid "Root"
msgstr "Racine"
#: eeschema/genliste.cpp:623
#: eeschema/genliste.cpp:672
#: eeschema/dialog_build_BOM.cpp:1018
#: eeschema/dialog_build_BOM.cpp:1070
msgid "#End Cmp\n"
msgstr "#End Cmp\n"
#: eeschema/genliste.cpp:639
#: eeschema/dialog_build_BOM.cpp:1035
msgid ""
"\n"
"#Cmp ( order = Value )"
msgstr ""
"\n"
"#Cmp ( ordre = Valeur )"
#: eeschema/genliste.cpp:697
#: eeschema/dialog_build_BOM.cpp:1095
#, c-format
msgid "> %-28.28s Global (Sheet %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Global (feuille %.2d) pos: %3.3f, %3.3f\n"
#: eeschema/genliste.cpp:713
#: eeschema/dialog_build_BOM.cpp:1111
#, c-format
msgid "> %-28.28s Sheet %-7.7s (Sheet %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n"
#: eeschema/genliste.cpp:726
#: eeschema/dialog_build_BOM.cpp:1124
msgid "#End labels\n"
msgstr "#End labels\n"
#: eeschema/eeschema.cpp:56
msgid "Eeschema is already running, Continue?"
msgstr "Eeschema est est cours d'exécution. Continuer ?"
@ -6593,6 +6509,11 @@ msgstr "Ref"
msgid "Sheet"
msgstr "Feuille"
#: eeschema/component_class.cpp:53
#: eeschema/dialog_build_BOM.cpp:962
msgid "Field"
msgstr "Champ"
#: eeschema/sheetlab.cpp:77
msgid "PinSheet Properties:"
msgstr "Propriétés des Pins de Hierarchie"
@ -6994,6 +6915,7 @@ msgstr "Chemin par d
#: eeschema/netlist.cpp:96
#: eeschema/netlist.cpp:129
#: eeschema/dialog_build_BOM.cpp:265
msgid "List"
msgstr "Liste"
@ -7928,6 +7850,97 @@ msgstr ""
"\n"
" >> Erreurs ERC: %d\n"
#: eeschema/dialog_build_BOM.cpp:240
msgid "List items : "
msgstr "Liste éléments:"
#: eeschema/dialog_build_BOM.cpp:266
msgid "Text for spreadsheet import"
msgstr "Texte pour import dans tableur:"
#: eeschema/dialog_build_BOM.cpp:267
msgid "Output format:"
msgstr "Format de sortie"
#: eeschema/dialog_build_BOM.cpp:272
msgid "Tab"
msgstr "Tab"
#: eeschema/dialog_build_BOM.cpp:273
msgid ";"
msgstr ";"
#: eeschema/dialog_build_BOM.cpp:274
msgid ","
msgstr ","
#: eeschema/dialog_build_BOM.cpp:275
msgid "Field separator for spreadsheet import:"
msgstr "Separateur de champ pour import dans tableu:"
#: eeschema/dialog_build_BOM.cpp:279
msgid "Fields to Add"
msgstr "Champ à ajouterr"
#: eeschema/dialog_build_BOM.cpp:283
msgid "Add Field 1"
msgstr "Ajouter Champ 1"
#: eeschema/dialog_build_BOM.cpp:287
msgid "Add Field 2"
msgstr "Ajouter Champ 2"
#: eeschema/dialog_build_BOM.cpp:291
msgid "Add Field 3"
msgstr "Ajouter Champ 3"
#: eeschema/dialog_build_BOM.cpp:295
msgid "Add Field 4"
msgstr "Ajouter Champ 4"
#: eeschema/dialog_build_BOM.cpp:299
msgid "Add Field 5"
msgstr "Ajouter Champ 5"
#: eeschema/dialog_build_BOM.cpp:303
msgid "Add Field 6"
msgstr "Ajouter Champ 6"
#: eeschema/dialog_build_BOM.cpp:307
msgid "Add Field 7"
msgstr "Ajouter Champ 7"
#: eeschema/dialog_build_BOM.cpp:311
msgid "Add Field 8"
msgstr "Ajouter Champ 8"
#: eeschema/dialog_build_BOM.cpp:331
msgid "Launch list browser"
msgstr "Lancer le visualisateur de liste"
#: eeschema/dialog_build_BOM.cpp:432
msgid "Bill of material:"
msgstr "Liste du materiel:"
#: eeschema/dialog_build_BOM.cpp:592
#, c-format
msgid ""
"\n"
"#Glob labels ( order = Sheet Number ) count = %d\n"
msgstr ""
"\n"
"#Glob labels ( ordre = Numéro de feuiller ) nombre = %d\n"
#: eeschema/dialog_build_BOM.cpp:602
#, c-format
msgid ""
"\n"
"#Glob labels ( order = Alphab. ) count = %d\n"
"\n"
msgstr ""
"\n"
"#Glob labels ( ordre = Alphab. ) nombre = %d\n"
#: cvpcb/dialog_display_options.cpp:141
#: cvpcb/options.cpp:159
msgid "Pad &Num"

BIN
internat/ko/kicad.mo
View File

Binary file not shown.

779
internat/ko/kicad.po
View File

File diff suppressed because it is too large Load Diff

17
libs.linux
View File

@ -9,6 +9,10 @@
# non-standard location edit common/gestfich.ccp so it knows where to
# load help/data/etc. files from.
# Current supported PREFIXes are /usr, /usr/local & /usr/local/kicad
STD_INSTALL = 1
ifeq ($(STD_INSTALL), 1)
PREFIX = /usr
KICAD_BIN = $(PREFIX)/bin
KICAD_PLUGINS = $(PREFIX)/lib/kicad/plugins
@ -19,6 +23,19 @@ KICAD_LIBRARY=$(KICAD_DATA)/library
KICAD_INTERNAT=$(KICAD_DATA)/internat
KICAD_TEMPLATE=$(KICAD_DATA)/template
# used by myself (JP Charras) to build a staticcaly linked distribution intalled in /usr/local (with STD_INSTALL = 0)
else
PREFIX = /usr/local/linux
KICAD_BIN = $(PREFIX)/bin
KICAD_PLUGINS = $(PREFIX)/linux/plugins
KICAD_DOCS=$(PREFIX)/help
KICAD_DATA=$(PREFIX)
KICAD_MODULES=$(KICAD_DATA)/modules
KICAD_LIBRARY=$(KICAD_DATA)/library
KICAD_INTERNAT=$(KICAD_DATA)/internat
KICAD_TEMPLATE=$(KICAD_DATA)/template
endif
# http://www.gnu.org/software/autoconf/manual/make/Catalogue-of-Rules.html#Catalogue-of-Rules
CXX = g++
LD = g++

3
news.txt
View File

@ -1,5 +1,5 @@
**************************************************************
Update 25 jun 2007
Update 02 jul 2007
pcbnew:
bug fix (problem in postscript generation due to the internationalization
of floating point number notation )
@ -10,6 +10,7 @@ pcbnew:
bug fix:
crash libedit when loading certain components (linux only)
incomplete generation of erc file list
some other enhancements
**************************************************************

4
version.txt
View File

@ -1,4 +1,4 @@
release version:
25 jun 2007
02 jul 2007
files (.zip,.tgz):
kicad-2007-06-25
kicad-2007-07-02