Set minimum cmake version to 2.6.4. Added footprint name edition in the module... (0dddb720) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,9 @@ project(kicad)

	# test the minimum Cmake version requirement (could be different under unix or Windows		# test the minimum Cmake version requirement (could be different under unix or Windows
	if(WIN32)		if(WIN32)
	cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)		cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
	else(WIN32)		else(WIN32)
	cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)		cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
	endif(WIN32)		endif(WIN32)

	# Path to local CMake modules.		# Path to local CMake modules.

common/confirm.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -121,8 +121,8 @@ bool IsOK( wxWindow* parent, const wxString& text )
	* Leading and trailing spaces are removed		* Leading and trailing spaces are removed
	* Buffer is the initial text displayed, anr the returned text		* Buffer is the initial text displayed, anr the returned text
	* Return:		* Return:
	* 1 if OK		* 0 if OK
	* 0 if ESCAPE		* 1 if CANCEL
	*/		*/
	int Get_Message( const wxString& title, // The question		int Get_Message( const wxString& title, // The question
	const wxString& frame_caption, // The frame caption		const wxString& frame_caption, // The frame caption

demos/interf_u/interf_u.pro

+89 −125

Original line number	Original line	Diff line number	Diff line
	update=13/5/2006-07:55:36		update=16/05/2010 14:21:37
	version=1		version=1
	last_client=pcbnew		last_client=pcbnew
	[common]		[common]
	@@ -62,64 +62,28 @@ NetType=0
	EquName1=devcms		EquName1=devcms
	[pcbnew]		[pcbnew]
	version=1		version=1
	PadDril=1200		PadDrlX=430
	PadDimH=1500		PadDimH=550
	PadDimV=1500		PadDimV=550
	PadForm=1		BoardThickness=630
	PadMask=14745599
	ViaDiam=600
	ViaDril=250
	Isol=110
	Countlayer=2
	Lpiste=170
	RouteTo=15
	RouteBo=0
	TypeVia=3
	Segm45=1
	Racc45=1
	Unite=0
	SegFill=1
	SegAffG=0
	NewAffG=1
	PadFill=1
	PadAffG=1
	PadSNum=1
	ModAffC=1
	ModAffT=1
	PcbAffT=1
	SgPcb45=1		SgPcb45=1
	TxtPcbV=800		TxtPcbV=800
	TxtPcbH=600		TxtPcbH=600
	TxtModV=600		TxtModV=600
	TxtModH=600		TxtModH=600
	TxtModW=120		TxtModW=120
	HPGLnum=1
	HPGdiam=15
	HPGLSpd=20
	HPGLrec=2
	HPGLorg=0
	GERBmin=15
	VEgarde=100		VEgarde=100
	DrawLar=150		DrawLar=150
	EdgeLar=150		EdgeLar=50
	TxtLar=170		TxtLar=170
	MSegLar=150		MSegLar=150
	ForPlot=1		LastNetListRead=interf_u.net
	WpenSer=10
	UserGrX=0,1
	UserGrY=0,1
	UserGrU=0
	DivGrPc=1
	TimeOut=600
	MaxLnkS=3
	ShowRat=0
	ShowMRa=1
	[pcbnew/libraries]		[pcbnew/libraries]
	LibDir=		LibDir=
	LibName1=connect		LibName1=connect
	LibName2=discret		LibName2=discret
	LibName3=pin_array		LibName3=pin_array
	LibName4=divers		LibName4=sockets
	LibName5=libcms		LibName5=divers
	LibName6=supports		LibName6=libcms
	LibName7=display		LibName7=display

pcbnew/dialog_edit_module_for_Modedit.cpp

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,8 @@ void DIALOG_MODULE_MODULE_EDITOR::InitModeditProperties()
	m_ValueCopy->Copy(m_CurrentModule->m_Value);		m_ValueCopy->Copy(m_CurrentModule->m_Value);
	m_ReferenceCtrl->SetValue( m_ReferenceCopy->m_Text );		m_ReferenceCtrl->SetValue( m_ReferenceCopy->m_Text );
	m_ValueCtrl->SetValue( m_ValueCopy->m_Text );		m_ValueCtrl->SetValue( m_ValueCopy->m_Text );
			m_ValueCtrl->SetValue( m_ValueCopy->m_Text );
			m_FootprintNameCtrl->SetValue( m_CurrentModule->m_LibRef );

	#if wxCHECK_VERSION( 2, 8, 0 )		#if wxCHECK_VERSION( 2, 8, 0 )
	m_AttributsCtrl->SetItemToolTip( 0, _( "Use this attribute for most non smd components" ) );		m_AttributsCtrl->SetItemToolTip( 0, _( "Use this attribute for most non smd components" ) );
	@@ -343,6 +344,10 @@ void DIALOG_MODULE_MODULE_EDITOR::OnOkClick( wxCommandEvent& event )
	m_CurrentModule->m_Doc = m_DocCtrl->GetValue();		m_CurrentModule->m_Doc = m_DocCtrl->GetValue();
	m_CurrentModule->m_KeyWord = m_KeywordCtrl->GetValue();		m_CurrentModule->m_KeyWord = m_KeywordCtrl->GetValue();

			// Init footprint name in library
			if( ! m_FootprintNameCtrl->GetValue( ).IsEmpty() )
			m_CurrentModule->m_LibRef = m_FootprintNameCtrl->GetValue( );

	// Init Fields:		// Init Fields:
	m_CurrentModule->m_Reference->Copy(m_ReferenceCopy );		m_CurrentModule->m_Reference->Copy(m_ReferenceCopy );
	m_CurrentModule->m_Value->Copy(m_ValueCopy );		m_CurrentModule->m_Value->Copy(m_ValueCopy );
	@@ -429,3 +434,4 @@ void DIALOG_MODULE_MODULE_EDITOR::OnEditValue(wxCommandEvent& event)
	m_Parent->GetScreen()->m_Curseur = tmp;		m_Parent->GetScreen()->m_Curseur = tmp;
	m_ValueCtrl->SetValue(m_ValueCopy->m_Text);		m_ValueCtrl->SetValue(m_ValueCopy->m_Text);
	}		}

pcbnew/dialog_edit_module_for_Modedit_base.cpp

+279 −265

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,20 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa

	PropLeftSizer->Add( sbSizerValue, 0, wxEXPAND, 5 );		PropLeftSizer->Add( sbSizerValue, 0, wxEXPAND, 5 );


			PropLeftSizer->Add( 0, 20, 0, 0, 5 );

			wxStaticBoxSizer* sbSizerFootprintName;
			sbSizerFootprintName = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Footprint Name in Lib") ), wxHORIZONTAL );

			m_FootprintNameCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			sbSizerFootprintName->Add( m_FootprintNameCtrl, 1, 0, 5 );


			sbSizerFootprintName->Add( 0, 0, 0, 0, 5 );

			PropLeftSizer->Add( sbSizerFootprintName, 0, wxEXPAND, 5 );

	m_PanelPropertiesBoxSizer->Add( PropLeftSizer, 1, wxEXPAND, 5 );		m_PanelPropertiesBoxSizer->Add( PropLeftSizer, 1, wxEXPAND, 5 );

	m_PropRightSizer = new wxBoxSizer( wxVERTICAL );		m_PropRightSizer = new wxBoxSizer( wxVERTICAL );

Admin message