Commit 1f18ff28 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

merge from testing

parents 4eb80203 8d777fc6

CHANGELOG.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ email address. 
2010-jul-27, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++all:

    Updated boost to version 1.34

    Updated boost to version 1.43

    Added boost::polygon (experimental)

++pcbnew:

    Added experimental zone fill calculations with boost::polygon

eeschema/dialog_edit_component_in_lib_base.cpp

+269 −269
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	m_PanelBasic->SetSizer( bSizerBasicPanel );

	m_PanelBasic->Layout();

	bSizerBasicPanel->Fit( m_PanelBasic );

	m_NoteBook->AddPage( m_PanelBasic, _("Options"), true );

	m_NoteBook->AddPage( m_PanelBasic, _("Options"), false );

	m_PanelDoc = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );

	wxBoxSizer* m_PanelDocBoxSizer;

	m_PanelDocBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -123,7 +123,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	

	m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextKeywords->Wrap( -1 );

	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant\nkeys words cannot have spaces and are separated by a space") );

	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant.\nKey words cannot have spaces and are separated by a space.") );

	

	m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
@@ -153,7 +153,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	m_PanelDoc->SetSizer( m_PanelDocBoxSizer );

	m_PanelDoc->Layout();

	m_PanelDocBoxSizer->Fit( m_PanelDoc );

	m_NoteBook->AddPage( m_PanelDoc, _("Description"), false );

	m_NoteBook->AddPage( m_PanelDoc, _("Description"), true );

	m_PanelAlias = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );

	wxBoxSizer* bSizerMainPanelAlias;

	bSizerMainPanelAlias = new wxBoxSizer( wxHORIZONTAL );

eeschema/dialog_edit_component_in_lib_base.fbp

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
                        <object class="notebookpage" expanded="1">

                            <property name="bitmap"></property>

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

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

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

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

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

                                <property name="context_help"></property>
@@ -851,7 +851,7 @@ 
                        <object class="notebookpage" expanded="1">

                            <property name="bitmap"></property>

                            <property name="label">Description</property>

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

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

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

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

                                <property name="context_help"></property>
@@ -1026,7 +1026,7 @@ 
                                            <property name="size"></property>

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

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

                                            <property name="tooltip">Enter keys words that can be used to select this composant&#x0A;keys words cannot have spaces and are separated by a space</property>

                                            <property name="tooltip">Enter keys words that can be used to select this composant.&#x0A;Key words cannot have spaces and are separated by a space.</property>

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

                                            <property name="window_name"></property>

                                            <property name="window_style"></property>

eeschema/dialog_eeschema_options_base.cpp

+267 −262
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Dec 21 2009)

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -20,8 +20,8 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	wxBoxSizer* mainSizer;

	mainSizer = new wxBoxSizer( wxVERTICAL );

	

	wxBoxSizer* bSizer5;

	bSizer5 = new wxBoxSizer( wxVERTICAL );

	wxBoxSizer* bOptionsSizer;

	bOptionsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );

	m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
@@ -90,7 +90,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_staticText9->Wrap( -1 );

	fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 500, 0 );

	m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 0 );

	fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -101,7 +101,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_staticText12->Wrap( -1 );

	fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 500, 100 );

	m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 100 );

	fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -124,18 +124,23 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	bSizer2 = new wxBoxSizer( wxVERTICAL );

	

	m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 );

	

	m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 );

	

	m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 );

	

	m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 );

	

	m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 );

	

	bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );

	

	bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
@@ -238,7 +243,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	bSizer6->Fit( m_panel2 );

	m_notebook1->AddPage( m_panel2, _("Template Field Names"), false );

	

	bSizer5->Add( m_notebook1, 1, wxEXPAND, 0 );

	bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 );

	

	m_sdbSizer1 = new wxStdDialogButtonSizer();

	m_sdbSizer1OK = new wxButton( this, wxID_OK );
@@ -246,9 +251,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );

	m_sdbSizer1->Realize();

	bSizer5->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 12 );

	bOptionsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 12 );

	

	mainSizer->Add( bSizer5, 1, 0, 12 );

	mainSizer->Add( bOptionsSizer, 1, 0, 12 );

	

	this->SetSizer( mainSizer );

	this->Layout();

eeschema/dialog_eeschema_options_base.fbp

+2536 −2717

File changed.

Preview size limit exceeded, changes collapsed.