Freeroute dialog: remove freeroute access via java web start, because... (21cc8e0d) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_freeroute_exchange.cpp

+72 −138

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@
	*/		*/

	#include <fctsys.h>		#include <fctsys.h>
	//#include <pgm_base.h>
	#include <kiface_i.h>		#include <kiface_i.h>
	#include <confirm.h>		#include <confirm.h>
	#include <gestfich.h>		#include <gestfich.h>
	@@ -45,7 +44,6 @@
	#endif		#endif


	#define FREEROUTE_URL_KEY wxT( "freeroute_url" )
	#define FREEROUTE_RUN_KEY wxT( "freeroute_command" )		#define FREEROUTE_RUN_KEY wxT( "freeroute_command" )


	@@ -63,7 +61,7 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ):
	m_Parent = parent;		m_Parent = parent;
	MyInit();		MyInit();

	m_sdbSizer1OK->SetDefault();		m_sdbSizerOK->SetDefault();
	GetSizer()->SetSizeHints( this );		GetSizer()->SetSizeHints( this );
	Centre();		Centre();
	}		}
	@@ -76,27 +74,25 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ):
	void DIALOG_FREEROUTE::MyInit()		void DIALOG_FREEROUTE::MyInit()
	{		{
	SetFocus();		SetFocus();
	m_FreeRouteSetupChanged = false;		m_freeRouterFound = false;
	m_freeRouterIsLocal = false;

	wxString msg;

			/* wxString msg;
	wxConfigBase* cfg = Kiface().KifaceSettings();		wxConfigBase* cfg = Kiface().KifaceSettings();
			cfg->Read( FREEROUTE_RUN_KEY, &msg );
	cfg->Read( FREEROUTE_URL_KEY, &msg );		*/

	if( msg.IsEmpty() )
	m_FreerouteURLName->SetValue( wxT( "http://www.freerouting.net/" ) );
	else
	m_FreerouteURLName->SetValue( msg );

	wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );		wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );

	if( fileName.FileExists() )		if( fileName.FileExists() )
	{		{
	m_freeRouterIsLocal = true;		m_freeRouterFound = true;
	m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File and Launch FreeRouter") );		m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File and Launch FreeRouter") );
	}		}

			else
			m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File") );

			m_buttonLaunchFreeroute->Enable( m_freeRouterFound );

	}		}

	const char * s_FreeRouteHelpInfo =		const char * s_FreeRouteHelpInfo =
	@@ -138,36 +134,29 @@ void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event )
	*/		*/
	void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )		void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
	{		{
	wxString javaCommand;		wxString dsnFile;
	wxString command;

	if( m_freeRouterIsLocal )		if( m_freeRouterFound )
	{		{
	javaCommand = CmdRunFreeRouterLocal();		dsnFile = createDSN_File();

	if( javaCommand.IsEmpty() ) // Something is wrong		if( dsnFile.IsEmpty() ) // Something is wrong or command cancelled
	return;		return;
	}		}
	else
	javaCommand = wxT( "javaws" );

	wxString url;
	wxFileName fileName( FindKicadFile( wxT( "freeroute.jnlp" ) ), wxPATH_UNIX );

	if( m_freeRouterIsLocal \|\| fileName.FileExists() )		wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
	{		wxString command;

	// Find the Java web start application on Windows.		// Find the Java application on Windows.
			// Colud be no more needed since we now have to run only java, not java web start
	#ifdef __WINDOWS__		#ifdef __WINDOWS__
	#if wxCHECK_VERSION( 2, 9, 0 )

	// If you thought the registry was brain dead before, now you have to deal with		// If you thought the registry was brain dead before, now you have to deal with
	// accessing it in either 64 or 32 bit mode depending on the build version of		// accessing it in either 64 or 32 bit mode depending on the build version of
	// Windows and the build version of KiCad.		// Windows and the build version of KiCad.

	// This key works for 32 bit Java on 32 bit Windows and 64 bit Java on 64 bit Windows.		// This key works for 32 bit Java on 32 bit Windows and 64 bit Java on 64 bit Windows.
	wxString keyName = m_freeRouterIsLocal ? wxT( "SOFTWARE\\JavaSoft\\Java Runtime Environment" )		wxString keyName = wxT( "SOFTWARE\\JavaSoft\\Java Runtime Environment" );
	: wxT( "SOFTWARE\\JavaSoft\\Java Web Start" );
	wxRegKey key( wxRegKey::HKLM, keyName,		wxRegKey key( wxRegKey::HKLM, keyName,
	wxIsPlatform64Bit() ? wxRegKey::WOW64ViewMode_64 :		wxIsPlatform64Bit() ? wxRegKey::WOW64ViewMode_64 :
	wxRegKey::WOW64ViewMode_Default );		wxRegKey::WOW64ViewMode_Default );
	@@ -175,9 +164,7 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
	// It's possible that 32 bit Java is installed on 64 bit Windows.		// It's possible that 32 bit Java is installed on 64 bit Windows.
	if( !key.Exists() && wxIsPlatform64Bit() )		if( !key.Exists() && wxIsPlatform64Bit() )
	{		{
	keyName = m_freeRouterIsLocal ?		keyName = wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment" );
	wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment" )
	: wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Web Start" );
	key.SetName( wxRegKey::HKLM, keyName );		key.SetName( wxRegKey::HKLM, keyName );
	}		}

	@@ -197,87 +184,47 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
	key.QueryValue( wxT( "CurrentVersion" ), value );		key.QueryValue( wxT( "CurrentVersion" ), value );
	key.SetName( key.GetName() + wxT( "\\" ) + value );		key.SetName( key.GetName() + wxT( "\\" ) + value );

	key.QueryValue( m_freeRouterIsLocal ? wxT( "JavaHome" ) : wxT( "Home" ), value );		key.QueryValue( wxT( "JavaHome" ), value );
	wxString javaCommandPath = value + wxFileName::GetPathSeparator();		command = value + wxFileName::GetPathSeparator();
	command = javaCommandPath;		command << wxT("bin\\java");
	#else
	#warning Kicad needs wxWidgets >= 2.9.4. version 2.8 is only supported for testing purposes
	#endif // wxCHECK_VERSION( 2, 9, 0 )

	if( m_freeRouterIsLocal )
	command << wxT("bin\\") << javaCommand;
	#else // __WINDOWS__		#else // __WINDOWS__
			command = wxT( "java" );;
	if( m_freeRouterIsLocal )
	command << javaCommand;
	#endif		#endif
	else
	// Wrap FullFileName in double quotes in case it has C:\Program Files in it.
	// The space is interpreted as an argument separator.
	command << javaCommand << wxChar( ' ' ) << wxChar( '"' )
	<< fileName.GetFullPath() << wxChar( '"' );

	ProcessExecute( command );
	return;
	}

	url = m_FreerouteURLName->GetValue() + wxT( "/java/freeroute.jnlp" );

	wxLaunchDefaultBrowser( url );
	}

	wxString DIALOG_FREEROUTE::CmdRunFreeRouterLocal()
	{
	wxString fullFileName = m_Parent->GetBoard()->GetFileName();
	wxString path;
	wxString name;
	wxString ext;
	wxString dsn_ext = wxT( ".dsn" );
	wxString mask = wxT( "*" ) + dsn_ext;

	wxFileName::SplitPath( fullFileName, &path, &name, &ext );

	name += dsn_ext;

	fullFileName = EDA_FileSelector( _( "Specctra DSN file:" ),
	path,
	name, // name.ext without path!
	dsn_ext,
	mask,
	this,
	wxFD_SAVE,
	false
	);

	if( fullFileName == wxEmptyString )
	return fullFileName;

	if( ! m_Parent->ExportSpecctraFile( fullFileName ) ) // the file was not created
	return fullFileName;

	wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );		command << wxT(" -jar ");

	wxString command = wxT("java -jar ");
	// add "freeroute.jar" to command line:		// add "freeroute.jar" to command line:
	command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );		command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
	// add option to load the .dsn file		// add option to load the .dsn file
	command << wxT( " -de " );		command << wxT( " -de " );
	// add *.dsn full filename (quoted):		// add *.dsn full filename (quoted):
	command << wxChar( '"' ) << fullFileName << wxChar( '"' );		command << wxChar( '"' ) << dsnFile << wxChar( '"' );

	return command;		ProcessExecute( command );
	}		}

	/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON		const wxString DIALOG_FREEROUTE::createDSN_File()
	*/
	void DIALOG_FREEROUTE::OnVisitButtonClick( wxCommandEvent& event )
	{		{
	wxString command = m_FreerouteURLName->GetValue();		wxFileName fn( m_Parent->GetBoard()->GetFileName() );
			wxString dsn_ext = wxT( "dsn" );
			fn.SetExt( dsn_ext );
			wxString mask = wxT( "*." ) + dsn_ext;

			wxString fullFileName = EDA_FileSelector( _( "Specctra DSN file:" ),
			fn.GetPath(), fn.GetFullName(),
			dsn_ext, mask,
			this, wxFD_SAVE, false );

	wxLaunchDefaultBrowser( command );		if( !fullFileName.IsEmpty() )
			{
			if( ! m_Parent->ExportSpecctraFile( fullFileName ) ) // the file was not created
			return wxEmptyString;
			}

			return fullFileName;
	}		}



	/* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE		/* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
	*/		*/
	void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event )		void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event )
	@@ -288,19 +235,6 @@ void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event )

	void DIALOG_FREEROUTE::OnOKButtonClick( wxCommandEvent& event )		void DIALOG_FREEROUTE::OnOKButtonClick( wxCommandEvent& event )
	{		{
	if( m_FreeRouteSetupChanged ) // Save new config
	{
	Kiface().KifaceSettings()->Write(
	FREEROUTE_URL_KEY, m_FreerouteURLName->GetValue() );
	}

	EndModal(wxID_OK);		EndModal(wxID_OK);
	}		}


	/* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXT_EDIT_FR_URL
	*/
	void DIALOG_FREEROUTE::OnTextEditFrUrlUpdated( wxCommandEvent& event )
	{
	m_FreeRouteSetupChanged = true;
	}

pcbnew/dialogs/dialog_freeroute_exchange.h

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,7 @@ class DIALOG_FREEROUTE : public DIALOG_FREEROUTE_BASE
	{		{
	private:		private:
	PCB_EDIT_FRAME* m_Parent;		PCB_EDIT_FRAME* m_Parent;
	bool m_FreeRouteSetupChanged;		bool m_freeRouterFound;
	bool m_freeRouterIsLocal;

	private:		private:
	// Virtual event handlers		// Virtual event handlers
	@@ -40,12 +39,11 @@ private:
	void OnExportButtonClick( wxCommandEvent& event );		void OnExportButtonClick( wxCommandEvent& event );
	void OnLaunchButtonClick( wxCommandEvent& event );		void OnLaunchButtonClick( wxCommandEvent& event );
	void OnImportButtonClick( wxCommandEvent& event );		void OnImportButtonClick( wxCommandEvent& event );
	void OnVisitButtonClick( wxCommandEvent& event );
	void OnHelpButtonClick( wxCommandEvent& event );		void OnHelpButtonClick( wxCommandEvent& event );
	void OnCancelButtonClick( wxCommandEvent& event );		void OnCancelButtonClick( wxCommandEvent& event );
	void OnTextEditFrUrlUpdated( wxCommandEvent& event );
	void MyInit ( );		void MyInit ( );
	wxString CmdRunFreeRouterLocal();		const wxString createDSN_File();

	public:		public:
	DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent );		DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent );

pcbnew/dialogs/dialog_freeroute_exchange_base.cpp

+17 −64

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 10 2012)		// C++ code generated with wxFormBuilder (version Jun 5 2014)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -42,7 +42,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c

	bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL\|wxEXPAND, 5 );		bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL\|wxEXPAND, 5 );

	m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter via Java Web Start"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter and Launch FreeRouter"), wxDefaultPosition, wxDefaultSize, 0 );
	m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") );		m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") );

	bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL\|wxEXPAND, 5 );		bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL\|wxEXPAND, 5 );
	@@ -61,65 +61,22 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c

	bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP\|wxALL\|wxEXPAND, 5 );		bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP\|wxALL\|wxEXPAND, 5 );

	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
	bUpperSizer->Add( m_staticline2, 0, wxALL\|wxEXPAND, 5 );

	wxBoxSizer* bRightSizer;
	bRightSizer = new wxBoxSizer( wxVERTICAL );

	m_staticText3 = new wxStaticText( this, wxID_ANY, _("FreeRoute Info:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText3->Wrap( -1 );
	m_staticText3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	bRightSizer->Add( m_staticText3, 0, wxALL, 5 );

	wxBoxSizer* bRightSubSizer;
	bRightSubSizer = new wxBoxSizer( wxHORIZONTAL );


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

	wxBoxSizer* bRightButtonsSizer;
	bRightButtonsSizer = new wxBoxSizer( wxVERTICAL );

	m_buttonVisit = new wxButton( this, wxID_BUTTON_VISIT, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 );
	bRightButtonsSizer->Add( m_buttonVisit, 0, wxALL\|wxEXPAND, 5 );

	m_staticText1 = new wxStaticText( this, wxID_ANY, _("FreeRouting.net URL"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText1->Wrap( -1 );
	bRightButtonsSizer->Add( m_staticText1, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_FreerouteURLName = new wxTextCtrl( this, wxID_TEXT_URL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_FreerouteURLName->SetToolTip( _("The URL of the FreeRouting.net website") );

	bRightButtonsSizer->Add( m_FreerouteURLName, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

	m_buttonHelp = new wxButton( this, wxID_BUTTON_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
	bRightButtonsSizer->Add( m_buttonHelp, 0, wxALL\|wxEXPAND, 5 );


	bRightSubSizer->Add( bRightButtonsSizer, 1, wxEXPAND, 5 );


	bRightSizer->Add( bRightSubSizer, 1, wxEXPAND, 5 );


	bUpperSizer->Add( bRightSizer, 1, wxALIGN_TOP\|wxALL\|wxEXPAND, 5 );


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

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );		m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
	bMainSizer->Add( m_staticline1, 0, wxEXPAND\|wxALL, 5 );		bMainSizer->Add( m_staticline1, 0, wxEXPAND\|wxALL, 5 );

	m_sdbSizer1 = new wxStdDialogButtonSizer();		m_sdbSizer = new wxStdDialogButtonSizer();
	m_sdbSizer1OK = new wxButton( this, wxID_OK );		m_sdbSizerOK = new wxButton( this, wxID_OK );
	m_sdbSizer1->AddButton( m_sdbSizer1OK );		m_sdbSizer->AddButton( m_sdbSizerOK );
	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );		m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );		m_sdbSizer->AddButton( m_sdbSizerCancel );
	m_sdbSizer1->Realize();		m_sdbSizerHelp = new wxButton( this, wxID_HELP );
			m_sdbSizer->AddButton( m_sdbSizerHelp );
			m_sdbSizer->Realize();

	bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND\|wxALL, 5 );		bMainSizer->Add( m_sdbSizer, 0, wxEXPAND\|wxALL, 5 );


	this->SetSizer( bMainSizer );		this->SetSizer( bMainSizer );
	@@ -130,11 +87,9 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c
	m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );		m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );
	m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );		m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );
	m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );		m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );
	m_buttonVisit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this );		m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
	m_FreerouteURLName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this );		m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );
	m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );		m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );
	m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );
	}		}

	DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE()		DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE()
	@@ -143,10 +98,8 @@ DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE()
	m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );		m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );
	m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );		m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );
	m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );		m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );
	m_buttonVisit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this );		m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
	m_FreerouteURLName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this );		m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );
	m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );		m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );
	m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
	m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );

	}		}

pcbnew/dialogs/dialog_freeroute_exchange_base.fbp

+7 −562

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_freeroute_exchange_base.h

+8 −17

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 10 2012)		// C++ code generated with wxFormBuilder (version Jun 5 2014)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -11,6 +11,8 @@
	#include <wx/artprov.h>		#include <wx/artprov.h>
	#include <wx/xrc/xmlres.h>		#include <wx/xrc/xmlres.h>
	#include <wx/intl.h>		#include <wx/intl.h>
			class DIALOG_SHIM;

	#include "dialog_shim.h"		#include "dialog_shim.h"
	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/stattext.h>		#include <wx/stattext.h>
	@@ -21,7 +23,6 @@
	#include <wx/button.h>		#include <wx/button.h>
	#include <wx/sizer.h>		#include <wx/sizer.h>
	#include <wx/statline.h>		#include <wx/statline.h>
	#include <wx/textctrl.h>
	#include <wx/dialog.h>		#include <wx/dialog.h>

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	@@ -29,9 +30,6 @@
	#define ID_BUTTON_EXPORT_DSN 1000		#define ID_BUTTON_EXPORT_DSN 1000
	#define wxID_BUTTON_LAUNCH 1001		#define wxID_BUTTON_LAUNCH 1001
	#define wxID_BUTTON_IMPORT 1002		#define wxID_BUTTON_IMPORT 1002
	#define wxID_BUTTON_VISIT 1003
	#define wxID_TEXT_URL 1004
	#define wxID_BUTTON_HELP 1005

	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	/// Class DIALOG_FREEROUTE_BASE		/// Class DIALOG_FREEROUTE_BASE
	@@ -45,25 +43,18 @@ class DIALOG_FREEROUTE_BASE : public DIALOG_SHIM
	wxButton* m_ExportDSN;		wxButton* m_ExportDSN;
	wxButton* m_buttonLaunchFreeroute;		wxButton* m_buttonLaunchFreeroute;
	wxButton* m_buttonImport;		wxButton* m_buttonImport;
	wxStaticLine* m_staticline2;
	wxStaticText* m_staticText3;
	wxButton* m_buttonVisit;
	wxStaticText* m_staticText1;
	wxTextCtrl* m_FreerouteURLName;
	wxButton* m_buttonHelp;
	wxStaticLine* m_staticline1;		wxStaticLine* m_staticline1;
	wxStdDialogButtonSizer* m_sdbSizer1;		wxStdDialogButtonSizer* m_sdbSizer;
	wxButton* m_sdbSizer1OK;		wxButton* m_sdbSizerOK;
	wxButton* m_sdbSizer1Cancel;		wxButton* m_sdbSizerCancel;
			wxButton* m_sdbSizerHelp;

	// Virtual event handlers, overide them in your derived class		// Virtual event handlers, overide them in your derived class
	virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); }		virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); }		virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); }		virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnVisitButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnTextEditFrUrlUpdated( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }		virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
			virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); }
	virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }

Admin message