Commit e5390617 authored by charras's avatar charras
Browse files

eeschema: fixed bug in BOM dialog

parent 2751b177

eeschema/dialog_build_BOM_base.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -48,13 +48,13 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	int m_OutputFormCtrlNChoices = sizeof( m_OutputFormCtrlChoices ) / sizeof( wxString );

	int m_OutputFormCtrlNChoices = sizeof( m_OutputFormCtrlChoices ) / sizeof( wxString );

	m_OutputFormCtrl = new wxRadioBox( this, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlNChoices, m_OutputFormCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_OutputFormCtrl = new wxRadioBox( this, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlNChoices, m_OutputFormCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_OutputFormCtrl->SetSelection( 0 );

	m_OutputFormCtrl->SetSelection( 0 );

	sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxALL|wxEXPAND, 5 );

	sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxEXPAND|wxTOP, 5 );

	

	

	wxString m_OutputSeparatorCtrlChoices[] = { _("Tab"), _(";"), _(",") };

	wxString m_OutputSeparatorCtrlChoices[] = { _("Tab"), _(";"), _(",") };

	int m_OutputSeparatorCtrlNChoices = sizeof( m_OutputSeparatorCtrlChoices ) / sizeof( wxString );

	int m_OutputSeparatorCtrlNChoices = sizeof( m_OutputSeparatorCtrlChoices ) / sizeof( wxString );

	m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_COLS|wxRA_SPECIFY_ROWS );

	m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_ROWS );

	m_OutputSeparatorCtrl->SetSelection( 0 );

	m_OutputSeparatorCtrl->SetSelection( 0 );

	sbOptionsSizer->Add( m_OutputSeparatorCtrl, 1, wxALL, 5 );

	sbOptionsSizer->Add( m_OutputSeparatorCtrl, 0, wxEXPAND|wxTOP, 5 );

	

	

	wxStaticBoxSizer* sbBrowseOptSizer;

	wxStaticBoxSizer* sbBrowseOptSizer;

	sbBrowseOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );

	sbBrowseOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
@@ -63,9 +63,9 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	

	

	sbBrowseOptSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 );

	sbBrowseOptSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 );

	

	

	sbOptionsSizer->Add( sbBrowseOptSizer, 0, wxEXPAND, 5 );

	sbOptionsSizer->Add( sbBrowseOptSizer, 0, wxEXPAND|wxTOP, 5 );

	

	

	bMainSizer->Add( sbOptionsSizer, 0, 0, 5 );

	bMainSizer->Add( sbOptionsSizer, 10, wxALL|wxEXPAND, 5 );

	

	

	wxBoxSizer* bRightSizer;

	wxBoxSizer* bRightSizer;

	bRightSizer = new wxBoxSizer( wxVERTICAL );

	bRightSizer = new wxBoxSizer( wxVERTICAL );
@@ -121,9 +121,9 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	

	

	sbUsersFiledsSizer->Add( m_AddAllFields, 0, wxALL, 5 );

	sbUsersFiledsSizer->Add( m_AddAllFields, 0, wxALL, 5 );

	

	

	sbFieldsSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND, 5 );

	sbFieldsSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND|wxTOP, 5 );

	

	

	bRightSizer->Add( sbFieldsSelectionSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );

	bRightSizer->Add( sbFieldsSelectionSizer, 1, wxEXPAND, 5 );

	

	

	

	

	bRightSizer->Add( 10, 10, 0, 0, 5 );

	bRightSizer->Add( 10, 10, 0, 0, 5 );
@@ -139,7 +139,7 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	

	

	bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );

	bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	

	bMainSizer->Add( bRightSizer, 1, wxRIGHT|wxLEFT, 5 );

	bMainSizer->Add( bRightSizer, 8, wxALL|wxEXPAND, 5 );

	

	

	this->SetSizer( bMainSizer );

	this->SetSizer( bMainSizer );

	this->Layout();

	this->Layout();

eeschema/dialog_build_BOM_base.fbp

+1230 −1230
Original line number Original line Diff line number Diff line
@@ -77,8 +77,8 @@ 
                <property name="permission">none</property>

                <property name="permission">none</property>

                <object class="sizeritem" expanded="1">

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="border">5</property>

                    <property name="flag"></property>

                    <property name="flag">wxALL|wxEXPAND</property>

                    <property name="proportion">0</property>

                    <property name="proportion">10</property>

                    <object class="wxStaticBoxSizer" expanded="1">

                    <object class="wxStaticBoxSizer" expanded="1">

                        <property name="id">wxID_ANY</property>

                        <property name="id">wxID_ANY</property>

                        <property name="label">Options:</property>

                        <property name="label">Options:</property>
@@ -363,7 +363,7 @@ 
                        </object>

                        </object>

                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxEXPAND</property>

                            <property name="flag">wxEXPAND|wxTOP</property>

                            <property name="proportion">0</property>

                            <property name="proportion">0</property>

                            <object class="wxRadioBox" expanded="1">

                            <object class="wxRadioBox" expanded="1">

                                <property name="bg"></property>

                                <property name="bg"></property>
@@ -417,8 +417,8 @@ 
                        </object>

                        </object>

                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxALL</property>

                            <property name="flag">wxEXPAND|wxTOP</property>

                            <property name="proportion">1</property>

                            <property name="proportion">0</property>

                            <object class="wxRadioBox" expanded="1">

                            <object class="wxRadioBox" expanded="1">

                                <property name="bg"></property>

                                <property name="bg"></property>

                                <property name="choices">&quot;Tab&quot; &quot;;&quot; &quot;,&quot;</property>

                                <property name="choices">&quot;Tab&quot; &quot;;&quot; &quot;,&quot;</property>
@@ -437,7 +437,7 @@ 
                                <property name="pos"></property>

                                <property name="pos"></property>

                                <property name="selection">0</property>

                                <property name="selection">0</property>

                                <property name="size"></property>

                                <property name="size"></property>

                                <property name="style">wxRA_SPECIFY_COLS|wxRA_SPECIFY_ROWS</property>

                                <property name="style">wxRA_SPECIFY_ROWS</property>

                                <property name="subclass"></property>

                                <property name="subclass"></property>

                                <property name="tooltip"></property>

                                <property name="tooltip"></property>

                                <property name="window_extra_style"></property>

                                <property name="window_extra_style"></property>
@@ -471,7 +471,7 @@ 
                        </object>

                        </object>

                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxEXPAND</property>

                            <property name="flag">wxEXPAND|wxTOP</property>

                            <property name="proportion">0</property>

                            <property name="proportion">0</property>

                            <object class="wxStaticBoxSizer" expanded="1">

                            <object class="wxStaticBoxSizer" expanded="1">

                                <property name="id">wxID_ANY</property>

                                <property name="id">wxID_ANY</property>
@@ -539,8 +539,8 @@ 
                </object>

                </object>

                <object class="sizeritem" expanded="1">

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="border">5</property>

                    <property name="flag">wxRIGHT|wxLEFT</property>

                    <property name="flag">wxALL|wxEXPAND</property>

                    <property name="proportion">1</property>

                    <property name="proportion">8</property>

                    <object class="wxBoxSizer" expanded="1">

                    <object class="wxBoxSizer" expanded="1">

                        <property name="minimum_size"></property>

                        <property name="minimum_size"></property>

                        <property name="name">bRightSizer</property>

                        <property name="name">bRightSizer</property>
@@ -548,7 +548,7 @@ 
                        <property name="permission">none</property>

                        <property name="permission">none</property>

                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxBOTTOM</property>

                            <property name="flag">wxEXPAND</property>

                            <property name="proportion">1</property>

                            <property name="proportion">1</property>

                            <object class="wxStaticBoxSizer" expanded="1">

                            <object class="wxStaticBoxSizer" expanded="1">

                                <property name="id">wxID_ANY</property>

                                <property name="id">wxID_ANY</property>
@@ -626,7 +626,7 @@ 
                                </object>

                                </object>

                                <object class="sizeritem" expanded="1">

                                <object class="sizeritem" expanded="1">

                                    <property name="border">5</property>

                                    <property name="border">5</property>

                                    <property name="flag">wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxTOP</property>

                                    <property name="proportion">0</property>

                                    <property name="proportion">0</property>

                                    <object class="wxStaticBoxSizer" expanded="1">

                                    <object class="wxStaticBoxSizer" expanded="1">

                                        <property name="id">wxID_ANY</property>

                                        <property name="id">wxID_ANY</property>

version.txt

+1 −1
Original line number Original line Diff line number Diff line 
release version:

release version:

16 feb 2009

16 feb 2009

files (.zip,.tgz):

files (.zip,.tgz):

kicad-2009-02-16-RC5
 
kicad-2009-02-16-RC6