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	Diff line number	Diff line
		@@ -7,9 +7,9 @@

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

common/dialogs/dialog_display_info_HTML_base.cpp

+4 −2

Original line number	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/
		//
		// 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 );

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


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

		@@ -36,4 +37,5 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::~DIALOG_DISPLAY_HTML_TEXT_BASE()
		// Disconnect Events
		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 );

		}

common/dialogs/dialog_display_info_HTML_base.fbp

+203 −119

File changed.

Preview size limit exceeded, changes collapsed.

common/dialogs/dialog_display_info_HTML_base.h

+13 −8

Original line number	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/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		///////////////////////////////////////////////////////////////////////////

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

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

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

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

		public:
		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();

		};

		#endif //__dialog_display_info_HTML_base__
		#endif //__DIALOG_DISPLAY_INFO_HTML_BASE_H__

common/html_messagebox.cpp

+1 −1

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

		void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event )

Admin message