minor updates (de9fb14f) · Commits · Elphel / kicad-source-mirror

eeschema/class_text-label.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ bool SCH_TEXT::Save( FILE* aFile ) const
		break;

		text.erase( i, 1 );
		text.insert( i, _( "\\n" ) );
		text.insert( i, wxT( "\\n" ) );
		}

		if( fprintf( aFile, "Text Notes %-4d %-4d %-4d %-4d %s %d\n%s\n",

eeschema/dialog_eeschema_config.cpp

+0 −23

Original line number	Diff line number	Diff line
		@@ -93,26 +93,6 @@ void DIALOG_EESCHEMA_CONFIG::Init()
		m_LibPathChanged = false;
		m_UserLibDirBufferImg = m_Parent->m_UserLibraryPath;

		// Init currently availlable netlist formats
		wxArrayString NetlistNameItems;
		NetlistNameItems.Add( wxT( "Pcbnew" ) );
		NetlistNameItems.Add( wxT( "OrcadPcb2" ) );
		NetlistNameItems.Add( wxT( "CadStar" ) );
		NetlistNameItems.Add( wxT( "Spice" ) );

		// Add extra neltlist format (using external converter)
		msg = ReturnUserNetlistTypeName( true );
		while( !msg.IsEmpty() )
		{
		NetlistNameItems.Add( msg );
		msg = ReturnUserNetlistTypeName( false );
		}

		m_NetFormatBox->InsertItems( NetlistNameItems, 0 );

		if( m_Parent->m_NetlistFormat > (int) m_NetFormatBox->GetCount() )
		m_Parent->m_NetlistFormat = NET_TYPE_PCBNEW;
		m_NetFormatBox->SetSelection( m_Parent->m_NetlistFormat - NET_TYPE_PCBNEW );

		m_ListLibr->InsertItems( m_Parent->m_ComponentLibFiles, 0 );

		@@ -158,9 +138,6 @@ void DIALOG_EESCHEMA_CONFIG::OnCancelClick( wxCommandEvent& event )
		void DIALOG_EESCHEMA_CONFIG::OnOkClick( wxCommandEvent& event )
		/**************************************************************/
		{
		// Set new netlist format
		m_Parent->m_NetlistFormat = m_NetFormatBox->GetSelection() + NET_TYPE_PCBNEW;

		// Recreate the user lib path
		if ( m_LibPathChanged )
		{

eeschema/dialog_eeschema_config_fbp.cpp

+1 −12

Original line number	Diff line number	Diff line
		@@ -16,23 +16,12 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind
		wxBoxSizer* bMainSizer;
		bMainSizer = new wxBoxSizer( wxVERTICAL );

		wxStaticBoxSizer* sbSizer5;
		sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Default netlist format") ), wxHORIZONTAL );

		m_NetFormatBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxSize( 150,70 ), 0, NULL, wxLB_NEEDED_SB\|wxLB_SINGLE );
		sbSizer5->Add( m_NetFormatBox, 0, wxALL\|wxEXPAND, 5 );


		sbSizer5->Add( 0, 15, 0, wxEXPAND, 5 );

		bMainSizer->Add( sbSizer5, 0, wxALL, 5 );

		wxStaticBoxSizer* sbLibsChoiceSizer;
		sbLibsChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Component library files") ), wxHORIZONTAL );

		m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL\|wxLB_NEEDED_SB\|wxLB_SINGLE );
		m_ListLibr->SetToolTip( _("List of active library files.\nOnly library files in this list are loaded by Eeschema.\nThe order of this list is important:\nEeschema searchs for a given component using this list order priority.") );
		m_ListLibr->SetMinSize( wxSize( 400,90 ) );
		m_ListLibr->SetMinSize( wxSize( 400,250 ) );

		sbLibsChoiceSizer->Add( m_ListLibr, 1, wxALL\|wxEXPAND, 5 );

eeschema/dialog_eeschema_config_fbp.fbp

+1 −77

Original line number	Diff line number	Diff line
		@@ -75,82 +75,6 @@
		<property name="name">bMainSizer</property>
		<property name="orient">wxVERTICAL</property>
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="proportion">0</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<property name="id">wxID_ANY</property>
		<property name="label">Default netlist format</property>
		<property name="minimum_size"></property>
		<property name="name">sbSizer5</property>
		<property name="orient">wxHORIZONTAL</property>
		<property name="permission">none</property>
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxListBox" expanded="1">
		<property name="bg"></property>
		<property name="choices"></property>
		<property name="context_help"></property>
		<property name="enabled">1</property>
		<property name="fg"></property>
		<property name="font"></property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="maximum_size"></property>
		<property name="minimum_size"></property>
		<property name="name">m_NetFormatBox</property>
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size">150,70</property>
		<property name="style">wxLB_NEEDED_SB\|wxLB_SINGLE</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		<event name="OnKeyDown"></event>
		<event name="OnKeyUp"></event>
		<event name="OnKillFocus"></event>
		<event name="OnLeaveWindow"></event>
		<event name="OnLeftDClick"></event>
		<event name="OnLeftDown"></event>
		<event name="OnLeftUp"></event>
		<event name="OnListBox"></event>
		<event name="OnListBoxDClick"></event>
		<event name="OnMiddleDClick"></event>
		<event name="OnMiddleDown"></event>
		<event name="OnMiddleUp"></event>
		<event name="OnMotion"></event>
		<event name="OnMouseEvents"></event>
		<event name="OnMouseWheel"></event>
		<event name="OnPaint"></event>
		<event name="OnRightDClick"></event>
		<event name="OnRightDown"></event>
		<event name="OnRightUp"></event>
		<event name="OnSetFocus"></event>
		<event name="OnSize"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="spacer" expanded="1">
		<property name="height">15</property>
		<property name="permission">protected</property>
		<property name="width">0</property>
		</object>
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		@@ -177,7 +101,7 @@
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="maximum_size"></property>
		<property name="minimum_size">400,90</property>
		<property name="minimum_size">400,250</property>
		<property name="name">m_ListLibr</property>
		<property name="permission">protected</property>
		<property name="pos"></property>

eeschema/dialog_eeschema_config_fbp.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@
		#include <wx/font.h>
		#include <wx/colour.h>
		#include <wx/settings.h>
		#include <wx/button.h>
		#include <wx/sizer.h>
		#include <wx/statbox.h>
		#include <wx/button.h>
		#include <wx/statline.h>
		#include <wx/dialog.h>

		@@ -41,8 +41,6 @@ class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog
		wxID_REMOVE_PATH,
		};

		wxListBox* m_NetFormatBox;

		wxListBox* m_ListLibr;
		wxButton* m_buttonAddLib;
		wxButton* m_buttonIns;

Admin message