refined the dialog_freeroute_exchange. See changelog (9e35d3ef) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ add_subdirectory(internat)
		add_subdirectory(template)

		install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/install.txt DESTINATION ${KICAD_DOCS} COMPONENT resources)
		install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/freeroute.jnlp DESTINATION ${KICAD_BIN} COMPONENT resources)

		if(UNIX)
		install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/share/kicad.desktop
		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications COMPONENT resources)

change_log.txt

+8 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,13 @@ Started 2007-June-11
		Please add newer entries at the top, list the date and your name with
		email address.

		2008-Mar-20 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
		================================================================================
		+pcbnew
		refined the dialog_freeroute_exchange
		If possible (i.e. if freeroute.jnlp is found in kicad binary directory) javaws is called insteed of the default browser)
		So @todo removed

		2008-Mar-19 UPDATE Dick Hollenbeck <dick@softplc.com>
		================================================================================
		+eeschema
		@@ -35,7 +42,7 @@ email address.
		* how-to-build-for-windows.txt deprecated.


		2008-Mar-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
		2008-Mar-18 UPDATE Dick Hollenbeck <dick@softplc.com>
		================================================================================
		+pcbnew
		refined the dialog_freeroute_exchange.pjd file, adding tooltips, wording

internat/fr/kicad.mo

−441 B (143 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

internat/fr/kicad.po

+3899 −3894

File changed.

File size exceeds preview limit.

View original file

View changed file

pcbnew/dialog_freeroute_exchange.cpp

+20 −44

Original line number	Diff line number	Diff line
		@@ -79,8 +79,6 @@ BEGIN_EVENT_TABLE( dialog_freeroute_exchange, wxDialog )

		EVT_TEXT( ID_TEXTCTRL2, dialog_freeroute_exchange::OnTextEditFrUrlUpdated )

		EVT_TEXT( ID_TEXTCTRL3, dialog_freeroute_exchange::OnTextEditFrCmdUpdated )

		EVT_BUTTON( wxID_CANCEL, dialog_freeroute_exchange::OnCancelClick )

		////@end dialog_freeroute_exchange event table entries
		@@ -158,7 +156,6 @@ void dialog_freeroute_exchange::Init()
		m_FreeRouteSetupChanged = false;
		m_ExportDSN = NULL;
		m_FreerouteURLName = NULL;
		m_FreerouteURLCommandString = NULL;
		////@end dialog_freeroute_exchange member initialisation
		}

		@@ -170,7 +167,7 @@ void dialog_freeroute_exchange::Init()
		void dialog_freeroute_exchange::CreateControls()
		{
		////@begin dialog_freeroute_exchange content construction
		// Generated by DialogBlocks, Wed 19 Mar 2008 10:23:32 CDT (unregistered)
		// Generated by DialogBlocks, 20/03/2008 09:26:34 (unregistered)

		dialog_freeroute_exchange* itemDialog1 = this;

		@@ -192,9 +189,9 @@ void dialog_freeroute_exchange::CreateControls()
		m_ExportDSN->SetToolTip(_("Export a Specctra DSN file (to FreeRouter)"));
		itemStaticBoxSizer5->Add(m_ExportDSN, 0, wxGROW\|wxALL, 5);

		wxButton* itemButton7 = new wxButton( itemPanel3, ID_BUTTON5, _("Launch FreeRouter via Browser"), wxDefaultPosition, wxDefaultSize, 0 );
		wxButton* itemButton7 = new wxButton( itemPanel3, ID_BUTTON5, _("Launch FreeRouter via Java Web Start"), wxDefaultPosition, wxDefaultSize, 0 );
		if (dialog_freeroute_exchange::ShowToolTips())
		itemButton7->SetToolTip(_("User your browser's Java Web Start function to run FreeRouter via Internet"));
		itemButton7->SetToolTip(_("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)"));
		itemStaticBoxSizer5->Add(itemButton7, 0, wxGROW\|wxALL, 5);

		wxButton* itemButton8 = new wxButton( itemPanel3, ID_BUTTON6, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 );
		@@ -204,7 +201,7 @@ void dialog_freeroute_exchange::CreateControls()

		wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemPanel3, wxID_ANY, _T(""));
		wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxVERTICAL);
		itemBoxSizer4->Add(itemStaticBoxSizer9, 1, wxGROW\|wxALL, 5);
		itemBoxSizer4->Add(itemStaticBoxSizer9, 1, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

		wxButton* itemButton10 = new wxButton( itemPanel3, ID_BUTTON7, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 );
		if (dialog_freeroute_exchange::ShowToolTips())
		@@ -217,23 +214,15 @@ void dialog_freeroute_exchange::CreateControls()
		m_FreerouteURLName = new wxTextCtrl( itemPanel3, ID_TEXTCTRL2, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
		if (dialog_freeroute_exchange::ShowToolTips())
		m_FreerouteURLName->SetToolTip(_("The URL of the FreeRouting.net website"));
		itemStaticBoxSizer9->Add(m_FreerouteURLName, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

		wxStaticText* itemStaticText13 = new wxStaticText( itemPanel3, wxID_STATIC, _("FreeRouting.net Command"), wxDefaultPosition, wxDefaultSize, 0 );
		itemStaticBoxSizer9->Add(itemStaticText13, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxTOP, 5);

		m_FreerouteURLCommandString = new wxTextCtrl( itemPanel3, ID_TEXTCTRL3, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
		if (dialog_freeroute_exchange::ShowToolTips())
		m_FreerouteURLCommandString->SetToolTip(_("The URL of the JNLP file which Java Web Start uses to launch the FreeRouter"));
		itemStaticBoxSizer9->Add(m_FreerouteURLCommandString, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);
		itemStaticBoxSizer9->Add(m_FreerouteURLName, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

		wxStdDialogButtonSizer* itemStdDialogButtonSizer15 = new wxStdDialogButtonSizer;
		wxStdDialogButtonSizer* itemStdDialogButtonSizer13 = new wxStdDialogButtonSizer;

		itemBoxSizer2->Add(itemStdDialogButtonSizer15, 0, wxGROW\|wxALL, 5);
		wxButton* itemButton16 = new wxButton( itemDialog1, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
		itemStdDialogButtonSizer15->AddButton(itemButton16);
		itemBoxSizer2->Add(itemStdDialogButtonSizer13, 0, wxGROW\|wxALL, 5);
		wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
		itemStdDialogButtonSizer13->AddButton(itemButton14);

		itemStdDialogButtonSizer15->Realize();
		itemStdDialogButtonSizer13->Realize();

		////@end dialog_freeroute_exchange content construction

		@@ -243,13 +232,6 @@ void dialog_freeroute_exchange::CreateControls()
		m_FreerouteURLName->SetValue( wxT( "http://www.freerouting.net/" ) );
		else
		m_FreerouteURLName->SetValue( msg );
		msg.Empty();
		m_Parent->m_Parent->m_EDA_Config->Read( FREEROUTE_RUN_KEY, &msg );
		if( msg.IsEmpty() )
		m_FreerouteURLCommandString->SetValue( wxT(
		"http://www.freerouting.net/java/freeroute.jnlp" ) );
		else
		m_FreerouteURLCommandString->SetValue( msg );
		}


		@@ -317,12 +299,17 @@ void dialog_freeroute_exchange::OnButton6Click( wxCommandEvent& event )

		void dialog_freeroute_exchange::OnButton5Click( wxCommandEvent& event )
		{
		wxString command = m_FreerouteURLCommandString->GetValue();
		wxString FullFileName = FindKicadFile( wxT( "freeroute.jnlp" ) );
		wxString command;

		if( wxFileExists( FullFileName ) )
		{
		command << wxT("javaws") << wxT( " " ) + FullFileName;
		wxExecute( command );
		return;
		}

		// @todo:
		// 1) add freeroute.jnlp to the Kicad project
		// 2) change this next C++ line simply run $ "javaws freeroute.jnlp" as a system
		// command, bypassing the browser altogether. Merely need a PATH to javaws.
		command = m_FreerouteURLName->GetValue() + wxT( "/java/freeroute.jnlp" );

		wxLaunchDefaultBrowser( command );
		}
		@@ -363,8 +350,6 @@ void dialog_freeroute_exchange::OnCloseWindow( wxCloseEvent& event )
		{
		m_Parent->m_Parent->m_EDA_Config->Write( FREEROUTE_URL_KEY,
		m_FreerouteURLName->GetValue() );
		m_Parent->m_Parent->m_EDA_Config->Write( FREEROUTE_RUN_KEY,
		m_FreerouteURLCommandString->GetValue() );
		}

		Destroy();
		@@ -381,15 +366,6 @@ void dialog_freeroute_exchange::OnTextEditFrUrlUpdated( wxCommandEvent& event )
		}


		/*!
		* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXT_EDIT_FR_CMD
		*/

		void dialog_freeroute_exchange::OnTextEditFrCmdUpdated( wxCommandEvent& event )
		{
		m_FreeRouteSetupChanged = true;
		}


		/*!
		* wxEVT_INIT_DIALOG event handler for ID_DIALOG_FREEROUTE_EXCHANGE

Admin message