specctra dialog refinements (e6717b3f) · Commits · Elphel / kicad-source-mirror

change_log.txt

+12 −0

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


			2008-Mar-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
			================================================================================
			+pcbnew
			refined the dialog_freeroute_exchange.pjd file, adding tooltips, wording
			changes, and added this comment also:
			// @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.


	2008-Mar-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>		2008-Mar-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
	================================================================================		================================================================================
	+pcbnew		+pcbnew

pcbnew/dialog_freeroute_exchange.cpp

+70 −88

Original line number	Original line	Diff line number	Diff line
	@@ -97,14 +97,14 @@ dialog_freeroute_exchange::dialog_freeroute_exchange()
	}		}


	dialog_freeroute_exchange::dialog_freeroute_exchange( WinEDA_PcbFrame* parent,		dialog_freeroute_exchange::dialog_freeroute_exchange( wxWindow* parent,
	wxWindowID id,		wxWindowID id,
	const wxString& caption,		const wxString& caption,
	const wxPoint& pos,		const wxPoint& pos,
	const wxSize& size,		const wxSize& size,
	long style )		long style )
	{		{
	m_Parent = parent;		m_Parent = (WinEDA_PcbFrame*) parent;
	Init();		Init();
	Create( parent, id, caption, pos, size, style );		Create( parent, id, caption, pos, size, style );
	}		}
	@@ -131,7 +131,6 @@ bool dialog_freeroute_exchange::Create( wxWindow* parent,
	GetSizer()->SetSizeHints(this);		GetSizer()->SetSizeHints(this);
	}		}
	Centre();		Centre();

	////@end dialog_freeroute_exchange creation		////@end dialog_freeroute_exchange creation
	return true;		return true;
	}		}
	@@ -158,7 +157,6 @@ void dialog_freeroute_exchange::Init()
	m_FreeRouteSetupChanged = false;		m_FreeRouteSetupChanged = false;
	m_FreerouteURLName = NULL;		m_FreerouteURLName = NULL;
	m_FreerouteURLCommandString = NULL;		m_FreerouteURLCommandString = NULL;

	////@end dialog_freeroute_exchange member initialisation		////@end dialog_freeroute_exchange member initialisation
	}		}

	@@ -170,78 +168,59 @@ void dialog_freeroute_exchange::Init()
	void dialog_freeroute_exchange::CreateControls()		void dialog_freeroute_exchange::CreateControls()
	{		{
	////@begin dialog_freeroute_exchange content construction		////@begin dialog_freeroute_exchange content construction
	// Generated by DialogBlocks, 14/03/2008 16:00:48 (unregistered)		// Generated by DialogBlocks, Tue 18 Mar 2008 16:15:58 CDT (unregistered)

	dialog_freeroute_exchange* itemDialog1 = this;		dialog_freeroute_exchange* itemDialog1 = this;

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

	itemDialog1->SetSizer(itemBoxSizer2);		itemDialog1->SetSizer(itemBoxSizer2);

	wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW\|wxALL, 5);		itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton4 = new wxButton( itemDialog1, ID_CREATE_EXPORT_DSN_FILE,		wxButton* itemButton4 = new wxButton( itemDialog1, ID_CREATE_EXPORT_DSN_FILE, _("Export a Specctra Design (*.dsn) File"), wxDefaultPosition, wxDefaultSize, 0 );
	_(
	"Create Export Dsn File" ), wxDefaultPosition,
	wxDefaultSize, 0 );
	itemButton4->SetHelpText( _( "Create an export DNS file to freeroute" ) );
	if (dialog_freeroute_exchange::ShowToolTips())		if (dialog_freeroute_exchange::ShowToolTips())
	itemButton4->SetToolTip( _( "Create an export DNS file to freeroute" ) );		itemButton4->SetToolTip(_("Export a Specctra DSN file (to FreeRouter)"));
	itemBoxSizer3->Add(itemButton4, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemButton4, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton5 = new wxButton( itemDialog1, ID_RUN_FREEROUTE, _(		wxButton* itemButton5 = new wxButton( itemDialog1, ID_RUN_FREEROUTE, _("Launch FreeRouter via Browser"), wxDefaultPosition, wxDefaultSize, 0 );
	"Connect to FreeROUTE" ), wxDefaultPosition,
	wxDefaultSize, 0 );
	itemButton5->SetHelpText( _( "Run the WEb Based Freeroute Router" ) );
	if (dialog_freeroute_exchange::ShowToolTips())		if (dialog_freeroute_exchange::ShowToolTips())
	itemButton5->SetToolTip( _( "Run the WEb Based Freeroute Router" ) );		itemButton5->SetToolTip(_("User your browser's Java Web Start function to run FreeRouter via Internet"));
	itemBoxSizer3->Add(itemButton5, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemButton5, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton6 = new wxButton( itemDialog1, ID_IMPORT_FREEROUTE_DSN_FILE,		wxButton* itemButton6 = new wxButton( itemDialog1, ID_IMPORT_FREEROUTE_DSN_FILE, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 );
	_(
	"Read Design File" ), wxDefaultPosition,
	wxDefaultSize, 0 );
	itemButton6->SetHelpText( _( "Read the design file created by freeroute" ) );
	if (dialog_freeroute_exchange::ShowToolTips())		if (dialog_freeroute_exchange::ShowToolTips())
	itemButton6->SetToolTip( _( "Read the design file created by freeroute" ) );		itemButton6->SetToolTip(_("Merge a session file created by FreeRouter with the current board."));
	itemBoxSizer3->Add(itemButton6, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemButton6, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton7 = new wxButton( itemDialog1, wxID_CLOSE, _(		wxButton* itemButton7 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
	"&Close" ), wxDefaultPosition, wxDefaultSize, 0 );		if (dialog_freeroute_exchange::ShowToolTips())
			itemButton7->SetToolTip(_("Close this dialog window"));
	itemBoxSizer3->Add(itemButton7, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemButton7, 0, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
	itemBoxSizer2->Add(itemBoxSizer8, 1, wxGROW\|wxALL, 5);		itemBoxSizer2->Add(itemBoxSizer8, 1, wxGROW\|wxALL, 5);

	wxButton* itemButton9 = new wxButton( itemDialog1, ID_GOTO_FREEROUTE_WEB_SITE,		wxButton* itemButton9 = new wxButton( itemDialog1, ID_GOTO_FREEROUTE_WEB_SITE, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 );
	_(
	"Access to FreeROUTE Web Site" ),
	wxDefaultPosition, wxDefaultSize, 0 );
	itemButton9->SetHelpText( _( "Run the WEb Based Freeroute Router" ) );
	if (dialog_freeroute_exchange::ShowToolTips())		if (dialog_freeroute_exchange::ShowToolTips())
	itemButton9->SetToolTip( _( "Run the WEb Based Freeroute Router" ) );		itemButton9->SetToolTip(_("Launch your browser and go to the FreeRouting.net website"));
	itemBoxSizer8->Add(itemButton9, 0, wxGROW\|wxALL, 5);		itemBoxSizer8->Add(itemButton9, 0, wxGROW\|wxALL, 5);

	wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC,		wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("FreeRouting.net URL"), wxDefaultPosition, wxDefaultSize, 0 );
	_(
	"FreeRoute URL" ), wxDefaultPosition,
	wxDefaultSize, 0 );
	itemBoxSizer8->Add(itemStaticText10, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxTOP, 5);		itemBoxSizer8->Add(itemStaticText10, 0, wxGROW\|wxLEFT\|wxRIGHT\|wxTOP, 5);

	m_FreerouteURLName = new wxTextCtrl( itemDialog1, ID_TEXT_EDIT_FR_URL, _T(		m_FreerouteURLName = new wxTextCtrl( itemDialog1, ID_TEXT_EDIT_FR_URL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
	"" ), wxDefaultPosition, wxDefaultSize, 0 );		if (dialog_freeroute_exchange::ShowToolTips())
	itemBoxSizer8->Add( m_FreerouteURLName, 0, wxGROW \| wxLEFT \| wxRIGHT \| wxBOTTOM, 5 );		m_FreerouteURLName->SetToolTip(_("The URL of the FreeRouting.net website"));
			itemBoxSizer8->Add(m_FreerouteURLName, 1, wxGROW\|wxLEFT\|wxRIGHT\|wxBOTTOM, 5);

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

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

	////@end dialog_freeroute_exchange content construction		////@end dialog_freeroute_exchange content construction

	@@ -281,7 +260,6 @@ wxBitmap dialog_freeroute_exchange::GetBitmapResource( const wxString& name )
	////@begin dialog_freeroute_exchange bitmap retrieval		////@begin dialog_freeroute_exchange bitmap retrieval
	wxUnusedVar(name);		wxUnusedVar(name);
	return wxNullBitmap;		return wxNullBitmap;

	////@end dialog_freeroute_exchange bitmap retrieval		////@end dialog_freeroute_exchange bitmap retrieval
	}		}

	@@ -296,7 +274,6 @@ wxIcon dialog_freeroute_exchange::GetIconResource( const wxString& name )
	////@begin dialog_freeroute_exchange icon retrieval		////@begin dialog_freeroute_exchange icon retrieval
	wxUnusedVar(name);		wxUnusedVar(name);
	return wxNullIcon;		return wxNullIcon;

	////@end dialog_freeroute_exchange icon retrieval		////@end dialog_freeroute_exchange icon retrieval
	}		}

	@@ -329,6 +306,11 @@ void dialog_freeroute_exchange::OnRunFreerouteClick( wxCommandEvent& event )
	{		{
	wxString command = m_FreerouteURLCommandString->GetValue();		wxString command = m_FreerouteURLCommandString->GetValue();

			// @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.

	wxLaunchDefaultBrowser( command );		wxLaunchDefaultBrowser( command );
	}		}

pcbnew/dialog_freeroute_exchange.h

+31 −45

Original line number	Original line	Diff line number	Diff line
	@@ -42,13 +42,11 @@
	#define ID_GOTO_FREEROUTE_WEB_SITE 10004		#define ID_GOTO_FREEROUTE_WEB_SITE 10004
	#define ID_TEXT_EDIT_FR_URL 10005		#define ID_TEXT_EDIT_FR_URL 10005
	#define ID_TEXT_EDIT_FR_CMD 10006		#define ID_TEXT_EDIT_FR_CMD 10006
	#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE wxCAPTION \| wxRESIZE_BORDER \| wxTHICK_FRAME \|\		#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE wxCAPTION\|wxRESIZE_BORDER\|wxSYSTEM_MENU\|wxCLOSE_BOX\|wxTAB_TRAVERSAL
	wxSYSTEM_MENU \| wxCLOSE_BOX \| wxTAB_TRAVERSAL
	#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE _("dialog_freeroute_exchange")		#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE _("dialog_freeroute_exchange")
	#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME ID_DIALOG_FREEROUTE_EXCHANGE		#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME ID_DIALOG_FREEROUTE_EXCHANGE
	#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE wxSize(400, 300)		#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE wxSize(400, 300)
	#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION wxDefaultPosition		#define SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION wxDefaultPosition

	////@end control identifiers		////@end control identifiers


	@@ -62,23 +60,12 @@ class dialog_freeroute_exchange : public wxDialog
	DECLARE_EVENT_TABLE()		DECLARE_EVENT_TABLE()

	public:		public:

	/// Constructors		/// Constructors
	dialog_freeroute_exchange();		dialog_freeroute_exchange();
	dialog_freeroute_exchange( WinEDA_PcbFrame* parent,		dialog_freeroute_exchange( wxWindow* parent, wxWindowID id = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME, const wxString& caption = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE, const wxPoint& pos = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION, const wxSize& size = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE, long style = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE );
	wxWindowID id = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME,
	const wxString& caption = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE,
	const wxPoint& pos = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION,
	const wxSize& size = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE,
	long style = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE );

	/// Creation		/// Creation
	bool Create( wxWindow* parent,		bool Create( wxWindow* parent, wxWindowID id = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME, const wxString& caption = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE, const wxPoint& pos = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION, const wxSize& size = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE, long style = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE );
	wxWindowID id = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_IDNAME,
	const wxString& caption = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_TITLE,
	const wxPoint& pos = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_POSITION,
	const wxSize& size = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_SIZE,
	long style = SYMBOL_DIALOG_FREEROUTE_EXCHANGE_STYLE );

	/// Destructor		/// Destructor
	~dialog_freeroute_exchange();		~dialog_freeroute_exchange();
	@@ -127,7 +114,6 @@ public:

	/// Retrieves icon resources		/// Retrieves icon resources
	wxIcon GetIconResource( const wxString& name );		wxIcon GetIconResource( const wxString& name );

	////@end dialog_freeroute_exchange member function declarations		////@end dialog_freeroute_exchange member function declarations

	/// Should we show tooltips?		/// Should we show tooltips?

pcbnew/dialog_freeroute_exchange.pjd

+22 −20

Original line number	Original line	Diff line number	Diff line
	@@ -128,6 +128,7 @@
	<long name="locked">0</long>		<long name="locked">0</long>
	<string name="template-name">""</string>		<string name="template-name">""</string>
	<bool name="dirty">1</bool>		<bool name="dirty">1</bool>
			<long name="makefile-last-written">0</long>
	<string name="Compiler name">""</string>		<string name="Compiler name">""</string>
	<string name="Build mode">"Debug"</string>		<string name="Build mode">"Debug"</string>
	<string name="Unicode mode">"ANSI"</string>		<string name="Unicode mode">"ANSI"</string>
	@@ -169,6 +170,8 @@
	<string name="wxWidgets build command">"%AUTO%"</string>		<string name="wxWidgets build command">"%AUTO%"</string>
	<string name="wxWidgets clean command">"%AUTO%"</string>		<string name="wxWidgets clean command">"%AUTO%"</string>
	<string name="PATH variable">"%AUTO%"</string>		<string name="PATH variable">"%AUTO%"</string>
			<bool name="Suppress source rules">0</bool>
			<bool name="Enable makefile generation">1</bool>
	</document>		</document>
	</document>		</document>
	</data>		</data>
	@@ -242,7 +245,6 @@
	<bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>		<bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
	<bool name="proxy-wxCAPTION">1</bool>		<bool name="proxy-wxCAPTION">1</bool>
	<bool name="proxy-wxRESIZE_BORDER">1</bool>		<bool name="proxy-wxRESIZE_BORDER">1</bool>
	<bool name="proxy-wxTHICK_FRAME">1</bool>
	<bool name="proxy-wxSYSTEM_MENU">1</bool>		<bool name="proxy-wxSYSTEM_MENU">1</bool>
	<bool name="proxy-wxSTAY_ON_TOP">0</bool>		<bool name="proxy-wxSTAY_ON_TOP">0</bool>
	<bool name="proxy-wxDIALOG_NO_PARENT">0</bool>		<bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
	@@ -336,10 +338,10 @@
	<string name="proxy-Implementation filename">""</string>		<string name="proxy-Implementation filename">""</string>
	<string name="proxy-Header filename">""</string>		<string name="proxy-Header filename">""</string>
	<string name="proxy-Member variable name">""</string>		<string name="proxy-Member variable name">""</string>
	<string name="proxy-Label">"Create Export Dsn File"</string>		<string name="proxy-Label">"Export a Specctra Design (*.dsn) File"</string>
	<bool name="proxy-Default">0</bool>		<bool name="proxy-Default">0</bool>
	<string name="proxy-Help text">"Create an export DNS file to freeroute"</string>		<string name="proxy-Help text">""</string>
	<string name="proxy-Tooltip text">""</string>		<string name="proxy-Tooltip text">"Export a Specctra DSN file (to FreeRouter)"</string>
	<string name="proxy-Data variable">""</string>		<string name="proxy-Data variable">""</string>
	<string name="proxy-Data validator">""</string>		<string name="proxy-Data validator">""</string>
	<string name="proxy-Data source">""</string>		<string name="proxy-Data source">""</string>
	@@ -403,10 +405,10 @@
	<string name="proxy-Implementation filename">""</string>		<string name="proxy-Implementation filename">""</string>
	<string name="proxy-Header filename">""</string>		<string name="proxy-Header filename">""</string>
	<string name="proxy-Member variable name">""</string>		<string name="proxy-Member variable name">""</string>