Pcbnew: netlist dialog: add silent mode option, and tool tip to the 2 options... (781cc00a) · Commits · Elphel / kicad-source-mirror

common/build_version.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,9 +7,9 @@

	#ifndef KICAD_BUILD_VERSION		#ifndef KICAD_BUILD_VERSION
	#if defined KICAD_GOST		#if defined KICAD_GOST
	# define KICAD_BUILD_VERSION "(2013-mar-13 GOST)"		# define KICAD_BUILD_VERSION "(2013-jun-18 GOST)"
	#else		#else
	# define KICAD_BUILD_VERSION "(2013-mar-13)"		# define KICAD_BUILD_VERSION "(2013-jun-18)"
	#endif		#endif
	#endif		#endif

common/dialogs/dialog_display_info_HTML_base.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 16 2008)		// C++ code generated with wxFormBuilder (version Oct 8 2012)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -9,7 +9,7 @@

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////

	DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )		DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
	{		{
	this->SetSizeHints( wxSize( 400,120 ), wxDefaultSize );		this->SetSizeHints( wxSize( 400,120 ), wxDefaultSize );

	@@ -23,6 +23,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent,
	m_buttonClose->SetDefault();		m_buttonClose->SetDefault();
	bMainSizer->Add( m_buttonClose, 0, wxALIGN_RIGHT\|wxRIGHT\|wxLEFT, 5 );		bMainSizer->Add( m_buttonClose, 0, wxALIGN_RIGHT\|wxRIGHT\|wxLEFT, 5 );


	this->SetSizer( bMainSizer );		this->SetSizer( bMainSizer );
	this->Layout();		this->Layout();

	@@ -36,4 +37,5 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::~DIALOG_DISPLAY_HTML_TEXT_BASE()
	// Disconnect Events		// Disconnect Events
	m_htmlWindow->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnHTMLLinkClicked ), NULL, this );		m_htmlWindow->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnHTMLLinkClicked ), NULL, this );
	m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnCloseButtonClick ), NULL, this );		m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnCloseButtonClick ), NULL, this );

	}		}

common/dialogs/dialog_display_info_HTML_base.fbp

+203 −119

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,13 @@
	<wxFormBuilder_Project>		<wxFormBuilder_Project>
	<FileVersion major="1" minor="11" />		<FileVersion major="1" minor="11" />
	<object class="Project" expanded="1">		<object class="Project" expanded="1">
	<property name="class_decoration" />		<property name="class_decoration"></property>
	<property name="code_generation">C++</property>		<property name="code_generation">C++</property>
	<property name="disconnect_events">1</property>		<property name="disconnect_events">1</property>
			<property name="disconnect_mode">source_name</property>
			<property name="disconnect_php_events">0</property>
			<property name="disconnect_python_events">0</property>
			<property name="embedded_files_path">res</property>
	<property name="encoding">UTF-8</property>		<property name="encoding">UTF-8</property>
	<property name="event_generation">connect</property>		<property name="event_generation">connect</property>
	<property name="file">dialog_display_info_HTML_base</property>		<property name="file">dialog_display_info_HTML_base</property>
	@@ -12,64 +16,76 @@
	<property name="help_provider">none</property>		<property name="help_provider">none</property>
	<property name="internationalize">1</property>		<property name="internationalize">1</property>
	<property name="name">dialog_display_info_HTML</property>		<property name="name">dialog_display_info_HTML</property>
	<property name="namespace" />		<property name="namespace"></property>
	<property name="path">.</property>		<property name="path">.</property>
	<property name="precompiled_header" />		<property name="precompiled_header"></property>
	<property name="relative_path">1</property>		<property name="relative_path">1</property>
			<property name="skip_php_events">1</property>
			<property name="skip_python_events">1</property>
	<property name="use_enum">0</property>		<property name="use_enum">0</property>
	<property name="use_microsoft_bom">0</property>		<property name="use_microsoft_bom">0</property>
	<object class="Dialog" expanded="1">		<object class="Dialog" expanded="1">
	<property name="bg" />		<property name="aui_managed">0</property>
	<property name="center" />		<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
	<property name="context_help" />		<property name="bg"></property>
			<property name="center"></property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="extra_style" />		<property name="event_handler">impl_virtual</property>
	<property name="fg" />		<property name="extra_style"></property>
	<property name="font" />		<property name="fg"></property>
			<property name="font"></property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_ANY</property>		<property name="id">wxID_ANY</property>
	<property name="maximum_size" />		<property name="maximum_size"></property>
	<property name="minimum_size">400,120</property>		<property name="minimum_size">400,120</property>
	<property name="name">DIALOG_DISPLAY_HTML_TEXT_BASE</property>		<property name="name">DIALOG_DISPLAY_HTML_TEXT_BASE</property>
	<property name="pos" />		<property name="pos"></property>
	<property name="size">431,120</property>		<property name="size">431,120</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
	<property name="subclass" />		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
	<property name="title" />		<property name="title"></property>
	<property name="tooltip" />		<property name="tooltip"></property>
	<property name="window_extra_style" />		<property name="window_extra_style"></property>
	<property name="window_name" />		<property name="window_name"></property>
	<property name="window_style" />		<property name="window_style"></property>
	<event name="OnActivate" />		<event name="OnActivate"></event>
	<event name="OnActivateApp" />		<event name="OnActivateApp"></event>
	<event name="OnChar" />		<event name="OnAuiFindManager"></event>
	<event name="OnClose" />		<event name="OnAuiPaneButton"></event>
	<event name="OnEnterWindow" />		<event name="OnAuiPaneClose"></event>
	<event name="OnEraseBackground" />		<event name="OnAuiPaneMaximize"></event>
	<event name="OnHibernate" />		<event name="OnAuiPaneRestore"></event>
	<event name="OnIconize" />		<event name="OnAuiRender"></event>
	<event name="OnIdle" />		<event name="OnChar"></event>
	<event name="OnInitDialog" />		<event name="OnClose"></event>
	<event name="OnKeyDown" />		<event name="OnEnterWindow"></event>
	<event name="OnKeyUp" />		<event name="OnEraseBackground"></event>
	<event name="OnKillFocus" />		<event name="OnHibernate"></event>
	<event name="OnLeaveWindow" />		<event name="OnIconize"></event>
	<event name="OnLeftDClick" />		<event name="OnIdle"></event>
	<event name="OnLeftDown" />		<event name="OnInitDialog"></event>
	<event name="OnLeftUp" />		<event name="OnKeyDown"></event>
	<event name="OnMiddleDClick" />		<event name="OnKeyUp"></event>
	<event name="OnMiddleDown" />		<event name="OnKillFocus"></event>
	<event name="OnMiddleUp" />		<event name="OnLeaveWindow"></event>
	<event name="OnMotion" />		<event name="OnLeftDClick"></event>
	<event name="OnMouseEvents" />		<event name="OnLeftDown"></event>
	<event name="OnMouseWheel" />		<event name="OnLeftUp"></event>
	<event name="OnPaint" />		<event name="OnMiddleDClick"></event>
	<event name="OnRightDClick" />		<event name="OnMiddleDown"></event>
	<event name="OnRightDown" />		<event name="OnMiddleUp"></event>
	<event name="OnRightUp" />		<event name="OnMotion"></event>
	<event name="OnSetFocus" />		<event name="OnMouseEvents"></event>
	<event name="OnSize" />		<event name="OnMouseWheel"></event>
	<event name="OnUpdateUI" />		<event name="OnPaint"></event>
			<event name="OnRightDClick"></event>
			<event name="OnRightDown"></event>
			<event name="OnRightUp"></event>
			<event name="OnSetFocus"></event>
			<event name="OnSize"></event>
			<event name="OnUpdateUI"></event>
	<object class="wxBoxSizer" expanded="1">		<object class="wxBoxSizer" expanded="1">
	<property name="minimum_size">-1,-1</property>		<property name="minimum_size">-1,-1</property>
	<property name="name">bMainSizer</property>		<property name="name">bMainSizer</property>
	@@ -80,51 +96,83 @@
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">1</property>		<property name="proportion">1</property>
	<object class="wxHtmlWindow" expanded="1">		<object class="wxHtmlWindow" expanded="1">
	<property name="bg" />		<property name="BottomDockable">1</property>
	<property name="context_help" />		<property name="LeftDockable">1</property>
			<property name="RightDockable">1</property>
			<property name="TopDockable">1</property>
			<property name="aui_layer"></property>
			<property name="aui_name"></property>
			<property name="aui_position"></property>
			<property name="aui_row"></property>
			<property name="best_size"></property>
			<property name="bg"></property>
			<property name="caption"></property>
			<property name="caption_visible">1</property>
			<property name="center_pane">0</property>
			<property name="close_button">1</property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
			<property name="default_pane">0</property>
			<property name="dock">Dock</property>
			<property name="dock_fixed">0</property>
			<property name="docking">Left</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="fg" />		<property name="fg"></property>
	<property name="font" />		<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_ANY</property>		<property name="id">wxID_ANY</property>
	<property name="maximum_size" />		<property name="max_size"></property>
			<property name="maximize_button">0</property>
			<property name="maximum_size"></property>
			<property name="min_size"></property>
			<property name="minimize_button">0</property>
	<property name="minimum_size">-1,-1</property>		<property name="minimum_size">-1,-1</property>
			<property name="moveable">1</property>
	<property name="name">m_htmlWindow</property>		<property name="name">m_htmlWindow</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
	<property name="permission">public</property>		<property name="permission">public</property>
	<property name="pos" />		<property name="pin_button">1</property>
	<property name="size" />		<property name="pos"></property>
			<property name="resize">Resizable</property>
			<property name="show">1</property>
			<property name="size"></property>
	<property name="style">wxHW_SCROLLBAR_AUTO</property>		<property name="style">wxHW_SCROLLBAR_AUTO</property>
	<property name="subclass" />		<property name="subclass"></property>
	<property name="tooltip" />		<property name="toolbar_pane">0</property>
	<property name="window_extra_style" />		<property name="tooltip"></property>
	<property name="window_name" />		<property name="window_extra_style"></property>
			<property name="window_name"></property>
	<property name="window_style">wxSUNKEN_BORDER</property>		<property name="window_style">wxSUNKEN_BORDER</property>
	<event name="OnChar" />		<event name="OnChar"></event>
	<event name="OnEnterWindow" />		<event name="OnEnterWindow"></event>
	<event name="OnEraseBackground" />		<event name="OnEraseBackground"></event>
	<event name="OnHtmlCellClicked" />		<event name="OnHtmlCellClicked"></event>
	<event name="OnHtmlCellHover" />		<event name="OnHtmlCellHover"></event>
	<event name="OnHtmlLinkClicked">OnHTMLLinkClicked</event>		<event name="OnHtmlLinkClicked">OnHTMLLinkClicked</event>
	<event name="OnKeyDown" />		<event name="OnKeyDown"></event>
	<event name="OnKeyUp" />		<event name="OnKeyUp"></event>
	<event name="OnKillFocus" />		<event name="OnKillFocus"></event>
	<event name="OnLeaveWindow" />		<event name="OnLeaveWindow"></event>
	<event name="OnLeftDClick" />		<event name="OnLeftDClick"></event>
	<event name="OnLeftDown" />		<event name="OnLeftDown"></event>
	<event name="OnLeftUp" />		<event name="OnLeftUp"></event>
	<event name="OnMiddleDClick" />		<event name="OnMiddleDClick"></event>
	<event name="OnMiddleDown" />		<event name="OnMiddleDown"></event>
	<event name="OnMiddleUp" />		<event name="OnMiddleUp"></event>
	<event name="OnMotion" />		<event name="OnMotion"></event>
	<event name="OnMouseEvents" />		<event name="OnMouseEvents"></event>
	<event name="OnMouseWheel" />		<event name="OnMouseWheel"></event>
	<event name="OnPaint" />		<event name="OnPaint"></event>
	<event name="OnRightDClick" />		<event name="OnRightDClick"></event>
	<event name="OnRightDown" />		<event name="OnRightDown"></event>
	<event name="OnRightUp" />		<event name="OnRightUp"></event>
	<event name="OnSetFocus" />		<event name="OnSetFocus"></event>
	<event name="OnSize" />		<event name="OnSize"></event>
	<event name="OnUpdateUI" />		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	@@ -132,51 +180,87 @@
	<property name="flag">wxALIGN_RIGHT\|wxRIGHT\|wxLEFT</property>		<property name="flag">wxALIGN_RIGHT\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxButton" expanded="1">		<object class="wxButton" expanded="1">
	<property name="bg" />		<property name="BottomDockable">1</property>
	<property name="context_help" />		<property name="LeftDockable">1</property>
			<property name="RightDockable">1</property>
			<property name="TopDockable">1</property>
			<property name="aui_layer"></property>
			<property name="aui_name"></property>
			<property name="aui_position"></property>
			<property name="aui_row"></property>
			<property name="best_size"></property>
			<property name="bg"></property>
			<property name="caption"></property>
			<property name="caption_visible">1</property>
			<property name="center_pane">0</property>
			<property name="close_button">1</property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
	<property name="default">1</property>		<property name="default">1</property>
			<property name="default_pane">0</property>
			<property name="dock">Dock</property>
			<property name="dock_fixed">0</property>
			<property name="docking">Left</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="fg" />		<property name="fg"></property>
	<property name="font" />		<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_CANCEL</property>		<property name="id">wxID_CANCEL</property>
	<property name="label">Close</property>		<property name="label">Close</property>
	<property name="maximum_size" />		<property name="max_size"></property>
	<property name="minimum_size" />		<property name="maximize_button">0</property>
			<property name="maximum_size"></property>
			<property name="min_size"></property>
			<property name="minimize_button">0</property>
			<property name="minimum_size"></property>
			<property name="moveable">1</property>
	<property name="name">m_buttonClose</property>		<property name="name">m_buttonClose</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
	<property name="permission">protected</property>		<property name="permission">protected</property>
	<property name="pos" />		<property name="pin_button">1</property>
	<property name="size" />		<property name="pos"></property>
			<property name="resize">Resizable</property>
			<property name="show">1</property>
			<property name="size"></property>
	<property name="style">wxBU_EXACTFIT</property>		<property name="style">wxBU_EXACTFIT</property>
	<property name="subclass" />		<property name="subclass"></property>
	<property name="tooltip" />		<property name="toolbar_pane">0</property>
	<property name="window_extra_style" />		<property name="tooltip"></property>
	<property name="window_name" />		<property name="validator_data_type"></property>
	<property name="window_style" />		<property name="validator_style">wxFILTER_NONE</property>
			<property name="validator_type">wxDefaultValidator</property>
			<property name="validator_variable"></property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
	<event name="OnButtonClick">OnCloseButtonClick</event>		<event name="OnButtonClick">OnCloseButtonClick</event>
	<event name="OnChar" />		<event name="OnChar"></event>
	<event name="OnEnterWindow" />		<event name="OnEnterWindow"></event>
	<event name="OnEraseBackground" />		<event name="OnEraseBackground"></event>
	<event name="OnKeyDown" />		<event name="OnKeyDown"></event>
	<event name="OnKeyUp" />		<event name="OnKeyUp"></event>
	<event name="OnKillFocus" />		<event name="OnKillFocus"></event>
	<event name="OnLeaveWindow" />		<event name="OnLeaveWindow"></event>
	<event name="OnLeftDClick" />		<event name="OnLeftDClick"></event>
	<event name="OnLeftDown" />		<event name="OnLeftDown"></event>
	<event name="OnLeftUp" />		<event name="OnLeftUp"></event>
	<event name="OnMiddleDClick" />		<event name="OnMiddleDClick"></event>
	<event name="OnMiddleDown" />		<event name="OnMiddleDown"></event>
	<event name="OnMiddleUp" />		<event name="OnMiddleUp"></event>
	<event name="OnMotion" />		<event name="OnMotion"></event>
	<event name="OnMouseEvents" />		<event name="OnMouseEvents"></event>
	<event name="OnMouseWheel" />		<event name="OnMouseWheel"></event>
	<event name="OnPaint" />		<event name="OnPaint"></event>
	<event name="OnRightDClick" />		<event name="OnRightDClick"></event>
	<event name="OnRightDown" />		<event name="OnRightDown"></event>
	<event name="OnRightUp" />		<event name="OnRightUp"></event>
	<event name="OnSetFocus" />		<event name="OnSetFocus"></event>
	<event name="OnSize" />		<event name="OnSize"></event>
	<event name="OnUpdateUI" />		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
	</object>		</object>

common/dialogs/dialog_display_info_HTML_base.h

+13 −8

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 16 2008)		// C++ code generated with wxFormBuilder (version Oct 8 2012)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////

	#ifndef __dialog_display_info_HTML_base__		#ifndef __DIALOG_DISPLAY_INFO_HTML_BASE_H__
	#define __dialog_display_info_HTML_base__		#define __DIALOG_DISPLAY_INFO_HTML_BASE_H__

			#include <wx/artprov.h>
			#include <wx/xrc/xmlres.h>
	#include <wx/intl.h>		#include <wx/intl.h>
			class DIALOG_SHIM;

			#include "dialog_shim.h"
	#include <wx/html/htmlwin.h>		#include <wx/html/htmlwin.h>
	#include <wx/gdicmn.h>		#include <wx/gdicmn.h>
	#include <wx/font.h>		#include <wx/font.h>
	@@ -26,7 +30,7 @@
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	/// Class DIALOG_DISPLAY_HTML_TEXT_BASE		/// Class DIALOG_DISPLAY_HTML_TEXT_BASE
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	class DIALOG_DISPLAY_HTML_TEXT_BASE : public wxDialog		class DIALOG_DISPLAY_HTML_TEXT_BASE : public DIALOG_SHIM
	{		{
	private:		private:

	@@ -40,9 +44,10 @@ class DIALOG_DISPLAY_HTML_TEXT_BASE : public wxDialog

	public:		public:
	wxHtmlWindow* m_htmlWindow;		wxHtmlWindow* m_htmlWindow;

	DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 431,120 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );		DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 431,120 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
	~DIALOG_DISPLAY_HTML_TEXT_BASE();		~DIALOG_DISPLAY_HTML_TEXT_BASE();

	};		};

	#endif //__dialog_display_info_HTML_base__		#endif //__DIALOG_DISPLAY_INFO_HTML_BASE_H__

common/html_messagebox.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,8 +6,8 @@ HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString & aTitle,
	wxPoint aPos, wxSize aSize)		wxPoint aPos, wxSize aSize)
	: DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, aTitle, aPos, aSize )		: DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, aTitle, aPos, aSize )
	{		{
	SetFocus();
	ListClear();		ListClear();
			Center();
	}		}

	void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event )		void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event )

Admin message