Fix issues in fp lib table wizard (c27b2fbf) · Commits · Elphel / kicad-source-mirror

common/basicframe.cpp

+9 −2

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
		* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
		* Copyright (C) 2013 Wayne Stambaugh <stambaughw@verizon.net>
		* Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
		* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		@@ -629,6 +629,13 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
		tmp << wxT( "OFF\n" );
		#endif

		tmp << wxT( " KICAD_USE_WEBKIT=" );
		#ifdef KICAD_USE_WEBKIT
		tmp << wxT( "ON\n" );
		#else
		tmp << wxT( "OFF\n" );
		#endif

		wxMessageBox( tmp, _("Version Information (copied to the clipboard)") );

		wxTheClipboard->SetData( new wxTextDataObject( tmp ) );

common/build_version.cpp

+3 −3

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
		* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
		* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
		* Copyright (C) 2015 KiCad Developers, see CHANGELOG.TXT for contributors.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		@@ -30,7 +30,7 @@
		#endif

		#ifndef KICAD_BUILD_VERSION
		# define KICAD_BUILD_VERSION "(2014-jul-16 BZR unknown)"
		# define KICAD_BUILD_VERSION "(after 2015-jan-16 BZR unknown)"
		#endif

		/**

pcbnew/dialogs/wizard_add_fplib.cpp

+26 −10

Original line number	Diff line number	Diff line
		@@ -136,13 +136,17 @@ void WIZARD_FPLIB_TABLE::initDlg( wxArrayString& aEnvVariableList )

		wxString msg;
		wxConfigBase* cfg = Pgm().CommonSettings();
		cfg->Read( KICAD_FPLIBS_URL_KEY, &msg );
		cfg->Read( WIZARD_LAST_PLUGIN_KEY, &m_last_plugin_choice );
		cfg->Read( WIZARD_LAST_PATHOPTION_KEY, &m_last_defaultpath_choice );
		cfg->Read( KICAD_FPLIBS_URL_KEY, &msg );

		if( msg.IsEmpty() ) // Give our current KiCad github URL
		msg = wxT( "http://github.com/KiCad" );

		// Be sure there is no trailing '/' at the end of the repo name
		if( msg.EndsWith( wxT("/" ) ) )
		msg.RemoveLast();

		if( msg.IsEmpty() )
		m_textCtrlGithubURL->SetValue( wxT( "http://github.com/KiCad/" ) );
		else
		m_textCtrlGithubURL->SetValue( msg );

		// KIGITHUB is frequently used (examples in docs, and other place)
		@@ -744,11 +748,13 @@ void WIZARD_FPLIB_TABLE::selectLibsGithubWithWebViewer() // select a set of l
		defaultURL = wxT( "https://github.com/KiCad" );
		#ifdef KICAD_USE_WEBKIT
		RunWebViewer( this, defaultURL, &urls );
		installGithubLibsFromList( urls );
		#else
		urls.Add( defaultURL + wxT("newlibname.pretty") );
		// If the Web Viewer is not available, just add a template
		// to the fp lib table.
		// The user have to edit it
		urls.Add( defaultURL + wxT("/newlibname.pretty") );
		#endif

		installGithubLibsFromList( urls );
		}

		void WIZARD_FPLIB_TABLE::installGithubLibsFromList( wxArrayString& aUrlList )
		@@ -843,12 +849,22 @@ void WIZARD_FPLIB_TABLE::OnGithubLibsList( wxCommandEvent& event )
		void WIZARD_FPLIB_TABLE::getLibsListGithub( wxArrayString& aList )
		{
		wxBeginBusyCursor();
		GITHUB_GETLIBLIST getter( m_textCtrlGithubURL->GetValue() );
		wxEndBusyCursor();

		// Be sure there is no trailing '/' at the end of the repo name
		wxString git_url = m_textCtrlGithubURL->GetValue();
		if( git_url.EndsWith( wxT("/" ) ) )
		{
		git_url.RemoveLast();
		m_textCtrlGithubURL->SetValue( git_url );
		}

		GITHUB_GETLIBLIST getter( git_url );

		wxArrayString fullList;
		getter.GetLibraryList( fullList );

		wxEndBusyCursor();

		wxArrayInt choices;
		wxString msg( _( "Urls detected as footprint .pretty libraries.\n"
		"Selected urls will be added to the current footprint library list" ) );

common/geometry/shape_collisions.cpp

+77 −77

File changed.

Contains only whitespace changes.

Admin message