Commit e0742b62 authored by charras's avatar charras
Browse files

fixed labels errors in dilaoge_global_edit_tracks and vias_base 

fixed some problems in gencad export (not all)
fixed a size problem when opening dialog_layers_setup2 (windows specific)
parent 98bc9bb9

internat/fr/kicad.mo

−708 B (193 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

internat/fr/kicad.po

+3393 −3163

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialog_global_edit_tracks_and_vias_base.cpp

+8 −9
Original line number Diff line number Diff line
@@ -61,11 +61,10 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE 
	m_gridDisplayCurrentSettings->EnableDragColSize( true );

	m_gridDisplayCurrentSettings->SetColLabelSize( 30 );

	m_gridDisplayCurrentSettings->SetColLabelValue( 0, _("Track size") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 1, _("Via size") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 2, _("Via Diameter") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 3, _("Via drill") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 4, _("uVia size") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 5, _("uVia Drill") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 1, _("Via diameter") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 2, _("Via drill") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 3, _("uVia size") );

	m_gridDisplayCurrentSettings->SetColLabelValue( 4, _("uVia Drill") );

	m_gridDisplayCurrentSettings->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );

	

	// Rows
@@ -80,9 +79,9 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE 
	

	// Cell Defaults

	m_gridDisplayCurrentSettings->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );

	sbCurrSettingsSizer->Add( m_gridDisplayCurrentSettings, 0, wxTOP|wxBOTTOM, 5 );

	sbCurrSettingsSizer->Add( m_gridDisplayCurrentSettings, 0, wxALL|wxEXPAND, 5 );

	

	bMainSizer->Add( sbCurrSettingsSizer, 0, wxEXPAND, 5 );

	bMainSizer->Add( sbCurrSettingsSizer, 1, wxALL|wxEXPAND, 5 );

	

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
@@ -135,7 +134,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE 
	

	sbSizerCommands->Add( fgSizer2, 1, wxEXPAND, 5 );

	

	bLowerSizer->Add( sbSizerCommands, 1, 0, 5 );

	bLowerSizer->Add( sbSizerCommands, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bbuttonsSizer;

	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
@@ -145,7 +144,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE 
	

	bLowerSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	bMainSizer->Add( bLowerSizer, 1, wxEXPAND, 5 );

	bMainSizer->Add( bLowerSizer, 1, wxEXPAND|wxALL, 5 );

	

	this->SetSizer( bMainSizer );

	this->Layout();

pcbnew/dialog_global_edit_tracks_and_vias_base.fbp

+7 −7
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
            <property name="minimum_size"></property>

            <property name="name">DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE</property>

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

            <property name="size">647,380</property>

            <property name="size">711,418</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

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

            <property name="title"></property>
@@ -77,8 +77,8 @@ 
                <property name="permission">none</property>

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

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

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

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

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

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

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

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

                        <property name="label">Current Settings</property>
@@ -311,7 +311,7 @@ 
                        </object>

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

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

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

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

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

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

                                <property name="autosize_cols">1</property>
@@ -324,7 +324,7 @@ 
                                <property name="cell_vert_alignment">wxALIGN_CENTRE</property>

                                <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>

                                <property name="col_label_size">30</property>

                                <property name="col_label_values">&quot;Track size&quot; &quot;Via size&quot; &quot;Via Diameter&quot; &quot;Via drill&quot; &quot;uVia size&quot; &quot;uVia Drill&quot;</property>

                                <property name="col_label_values">&quot;Track size&quot; &quot;Via diameter&quot; &quot;Via drill&quot; &quot;uVia size&quot; &quot;uVia Drill&quot;</property>

                                <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>

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

                                <property name="column_sizes"></property>
@@ -473,7 +473,7 @@ 
                </object>

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

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

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

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

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

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

                        <property name="minimum_size"></property>
@@ -482,7 +482,7 @@ 
                        <property name="permission">none</property>

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

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

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

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

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

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

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

pcbnew/dialog_global_edit_tracks_and_vias_base.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public wxDialog 
		

	

	public:

		DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 647,380 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 711,418 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE();

	

};