moved changes to dialogs into fbp files (95213372) · Commits · Elphel / kicad-source-mirror

cvpcb/dialogs/dialog_display_options_base.cpp

+111 −109

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 Oct 8 2012)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -56,7 +56,9 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(
	sbSizerViewOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan:") ), wxVERTICAL );		sbSizerViewOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan:") ), wxVERTICAL );

	m_IsZoomNoCenter = new wxCheckBox( this, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 );		m_IsZoomNoCenter = new wxCheckBox( this, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerViewOpt->Add( m_IsZoomNoCenter, 0, wxALL\|wxEXPAND, 5 );		m_IsZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") );

			sbSizerViewOpt->Add( m_IsZoomNoCenter, 0, wxALL, 5 );

	m_IsMiddleButtonPan = new wxCheckBox( this, wxID_ANY, _("Middle Button PAN Enabled"), wxDefaultPosition, wxDefaultSize, 0 );		m_IsMiddleButtonPan = new wxCheckBox( this, wxID_ANY, _("Middle Button PAN Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerViewOpt->Add( m_IsMiddleButtonPan, 0, wxALL\|wxEXPAND, 5 );		sbSizerViewOpt->Add( m_IsMiddleButtonPan, 0, wxALL\|wxEXPAND, 5 );

cvpcb/dialogs/dialog_display_options_base.fbp

+885 −797

Original line number	Original line	Diff line number	Diff line
	@@ -502,6 +502,94 @@
	<property name="orient">wxVERTICAL</property>		<property name="orient">wxVERTICAL</property>
	<property name="permission">none</property>		<property name="permission">none</property>
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxALL</property>
			<property name="proportion">0</property>
			<object class="wxCheckBox" expanded="1">
			<property name="BottomDockable">1</property>
			<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="checked">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="fg"></property>
			<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
			<property name="hidden">0</property>
			<property name="id">wxID_ANY</property>
			<property name="label">Zoom off center</property>
			<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"></property>
			<property name="moveable">1</property>
			<property name="name">m_IsZoomNoCenter</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
			<property name="permission">protected</property>
			<property name="pin_button">1</property>
			<property name="pos"></property>
			<property name="resize">Resizable</property>
			<property name="show">1</property>
			<property name="size"></property>
			<property name="style"></property>
			<property name="subclass"></property>
			<property name="toolbar_pane">0</property>
			<property name="tooltip">Keep the cursor at its current location when zooming</property>
			<property name="validator_data_type"></property>
			<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="OnChar"></event>
			<event name="OnCheckBox"></event>
			<event name="OnEnterWindow"></event>
			<event name="OnEraseBackground"></event>
			<event name="OnKeyDown"></event>
			<event name="OnKeyUp"></event>
			<event name="OnKillFocus"></event>
			<event name="OnLeaveWindow"></event>
			<event name="OnLeftDClick"></event>
			<event name="OnLeftDown"></event>
			<event name="OnLeftUp"></event>
			<event name="OnMiddleDClick"></event>
			<event name="OnMiddleDown"></event>
			<event name="OnMiddleUp"></event>
			<event name="OnMotion"></event>
			<event name="OnMouseEvents"></event>
			<event name="OnMouseWheel"></event>
			<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>
			</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALL\|wxEXPAND</property>		<property name="flag">wxALL\|wxEXPAND</property>

cvpcb/dialogs/dialog_display_options_base.h

+71 −69

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 Oct 8 2012)
	// 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/radiobox.h>		#include <wx/radiobox.h>

eeschema/dialogs/dialog_eeschema_options_base.cpp

+321 −313

eeschema/dialogs/dialog_eeschema_options_base.fbp

+4792 −4704

Original line number	Original line	Diff line number	Diff line
	@@ -2425,11 +2425,11 @@
	</object>		</object>
	</object>		</object>
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="1">
	<property name="border">0</property>		<property name="border">0</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxBoxSizer" expanded="0">		<object class="wxBoxSizer" expanded="1">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">bSizer2</property>		<property name="name">bSizer2</property>
	<property name="orient">wxVERTICAL</property>		<property name="orient">wxVERTICAL</property>
	@@ -2610,6 +2610,94 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxALL</property>
			<property name="proportion">0</property>
			<object class="wxCheckBox" expanded="1">
			<property name="BottomDockable">1</property>
			<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="checked">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="fg"></property>
			<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
			<property name="hidden">0</property>
			<property name="id">wxID_ANY</property>
			<property name="label">Zoom off center</property>
			<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"></property>
			<property name="moveable">1</property>
			<property name="name">m_checkEnableZoomNoCenter</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
			<property name="permission">protected</property>
			<property name="pin_button">1</property>
			<property name="pos"></property>
			<property name="resize">Resizable</property>
			<property name="show">1</property>
			<property name="size"></property>
			<property name="style"></property>
			<property name="subclass"></property>
			<property name="toolbar_pane">0</property>
			<property name="tooltip">Keep the cursor at its current location when zooming</property>
			<property name="validator_data_type"></property>
			<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="OnChar"></event>
			<event name="OnCheckBox"></event>
			<event name="OnEnterWindow"></event>
			<event name="OnEraseBackground"></event>
			<event name="OnKeyDown"></event>
			<event name="OnKeyUp"></event>
			<event name="OnKillFocus"></event>
			<event name="OnLeaveWindow"></event>
			<event name="OnLeftDClick"></event>
			<event name="OnLeftDown"></event>
			<event name="OnLeftUp"></event>
			<event name="OnMiddleDClick"></event>
			<event name="OnMiddleDown"></event>
			<event name="OnMiddleUp"></event>
			<event name="OnMotion"></event>
			<event name="OnMouseEvents"></event>
			<event name="OnMouseWheel"></event>
			<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>
			</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">3</property>		<property name="border">3</property>
	<property name="flag">wxALL</property>		<property name="flag">wxALL</property>

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 Oct 8 2012)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -155,10 +155,10 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
	m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );		m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
	bSizer2->Add( m_checkShowHiddenPins, 0, wxALL\|wxEXPAND, 3 );		bSizer2->Add( m_checkShowHiddenPins, 0, wxALL\|wxEXPAND, 3 );

	m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, xwID_ANY, _("Enable zooming off center"), wxDefaultPosition, wxDefaultSize, 0 );		m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 );
	m_checkEnableZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") );		m_checkEnableZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") );

	bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxALL, 3 );		bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxALL, 5 );

	m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );		m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );
	m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") );		m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") );
	@@ -223,6 +223,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
	fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );		fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );

	m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			m_fieldName1->SetMaxLength( 0 );
	fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );

	m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );
	@@ -230,6 +231,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
	fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );		fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );

	m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			m_fieldName2->SetMaxLength( 0 );
	fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );

	m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );
	@@ -237,6 +239,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
	fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );		fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL\|wxALIGN_RIGHT\|wxALL, 3 );

	m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
			m_fieldName3->SetMaxLength( 0 );
	fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );

	m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );

Admin message