Very minor changes in dialog zones. (372ce659) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_copper_zones.cpp

+2 −3

pcbnew/dialogs/dialog_keepout_area_properties.cpp

+3 −5

pcbnew/dialogs/dialog_keepout_area_properties_base.cpp

+6 −8

pcbnew/dialogs/dialog_keepout_area_properties_base.fbp

+256 −187

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">DIALOG_KEEPOUT_AREA_PROPERTIES_BASE</property>		<property name="name">DIALOG_KEEPOUT_AREA_PROPERTIES_BASE</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size">308,355</property>		<property name="size">308,338</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
	<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
	<property name="title">Keepout Area Properties</property>		<property name="title">Keepout Area Properties</property>
	@@ -310,16 +310,87 @@
	<property name="permission">none</property>		<property name="permission">none</property>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND\|wxALL</property>		<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxStaticBoxSizer" expanded="1">		<object class="wxStaticText" 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="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="id">wxID_ANY</property>
	<property name="label">Outlines Options:</property>		<property name="label">Properties:</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="minimum_size"></property>
	<property name="name">m_OutilinesBoxOpt</property>		<property name="moveable">1</property>
	<property name="orient">wxVERTICAL</property>		<property name="name">m_staticTextprops</property>
	<property name="permission">none</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"></property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
			<property name="wrap">-1</property>
			<event name="OnChar"></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>		<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\|wxALIGN_CENTER_VERTICAL\|wxEXPAND</property>		<property name="flag">wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND</property>
	@@ -500,8 +571,6 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
	</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">wxEXPAND\|wxALL</property>		<property name="flag">wxEXPAND\|wxALL</property>

pcbnew/dialogs/dialog_keepout_area_properties_base.h

+7 −3

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,9 @@
	#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;
			class wxListView;

	#include "dialog_shim.h"		#include "dialog_shim.h"
	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/stattext.h>		#include <wx/stattext.h>
	@@ -21,8 +24,8 @@
	#include <wx/listctrl.h>		#include <wx/listctrl.h>
	#include <wx/sizer.h>		#include <wx/sizer.h>
	#include <wx/radiobox.h>		#include <wx/radiobox.h>
	#include <wx/statbox.h>
	#include <wx/checkbox.h>		#include <wx/checkbox.h>
			#include <wx/statbox.h>
	#include <wx/statline.h>		#include <wx/statline.h>
	#include <wx/button.h>		#include <wx/button.h>
	#include <wx/dialog.h>		#include <wx/dialog.h>
	@@ -45,6 +48,7 @@ class DIALOG_KEEPOUT_AREA_PROPERTIES_BASE : public DIALOG_SHIM
	protected:		protected:
	wxStaticText* m_staticTextLayerSelection;		wxStaticText* m_staticTextLayerSelection;
	wxListView* m_LayerSelectionCtrl;		wxListView* m_LayerSelectionCtrl;
			wxStaticText* m_staticTextprops;
	wxRadioBox* m_OrientEdgesOpt;		wxRadioBox* m_OrientEdgesOpt;
	wxRadioBox* m_OutlineAppearanceCtrl;		wxRadioBox* m_OutlineAppearanceCtrl;
	wxCheckBox* m_cbTracksCtrl;		wxCheckBox* m_cbTracksCtrl;
	@@ -62,7 +66,7 @@ class DIALOG_KEEPOUT_AREA_PROPERTIES_BASE : public DIALOG_SHIM

	public:		public:

	DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Keepout Area Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 308,355 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxFULL_REPAINT_ON_RESIZE\|wxSUNKEN_BORDER );		DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Keepout Area Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 308,338 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxFULL_REPAINT_ON_RESIZE\|wxSUNKEN_BORDER );
	~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE();		~DIALOG_KEEPOUT_AREA_PROPERTIES_BASE();

	};		};

Original line number	Original line	Diff line number	Diff line
	@@ -251,12 +251,11 @@ void DIALOG_COPPER_ZONE::initDialog()
	m_LayerSelectionCtrl->InsertColumn( 0, col0 );		m_LayerSelectionCtrl->InsertColumn( 0, col0 );
	// Build copper layer list and append to layer widget		// Build copper layer list and append to layer widget
	int layerCount = board->GetCopperLayerCount();		int layerCount = board->GetCopperLayerCount();
	int layerNumber, itemIndex;
	wxImageList* imageList = new wxImageList( LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );		wxImageList* imageList = new wxImageList( LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
	m_LayerSelectionCtrl->AssignImageList( imageList, wxIMAGE_LIST_SMALL );		m_LayerSelectionCtrl->AssignImageList( imageList, wxIMAGE_LIST_SMALL );
	for( int ii = 0; ii < layerCount; ii++ )		for( int ii = 0; ii < layerCount; ii++ )
	{		{
	layerNumber = LAYER_N_BACK;		int layerNumber = LAYER_N_BACK;

	if( layerCount <= 1 \|\| ii < layerCount - 1 )		if( layerCount <= 1 \|\| ii < layerCount - 1 )
	layerNumber = ii;		layerNumber = ii;
	@@ -268,7 +267,7 @@ void DIALOG_COPPER_ZONE::initDialog()
	msg = board->GetLayerName( layerNumber ).Trim();		msg = board->GetLayerName( layerNumber ).Trim();
	EDA_COLOR_T layerColor = board->GetLayerColor( layerNumber );		EDA_COLOR_T layerColor = board->GetLayerColor( layerNumber );
	imageList->Add( makeLayerBitmap( layerColor ) );		imageList->Add( makeLayerBitmap( layerColor ) );
	itemIndex = m_LayerSelectionCtrl->InsertItem( 0, msg, ii );		int itemIndex = m_LayerSelectionCtrl->InsertItem( 0, msg, ii );

	if( m_settings.m_CurrentZone_Layer == layerNumber )		if( m_settings.m_CurrentZone_Layer == layerNumber )
	m_LayerSelectionCtrl->Select( itemIndex );		m_LayerSelectionCtrl->Select( itemIndex );

Original line number	Original line	Diff line number	Diff line
	@@ -149,13 +149,11 @@ void DIALOG_KEEPOUT_AREA_PROPERTIES::initDialog()
	m_LayerSelectionCtrl->InsertColumn( 0, col0 );		m_LayerSelectionCtrl->InsertColumn( 0, col0 );
	// Build copper layer list and append to layer widget		// Build copper layer list and append to layer widget
	int layerCount = board->GetCopperLayerCount();		int layerCount = board->GetCopperLayerCount();
	int layerNumber, itemIndex;
	EDA_COLOR_T layerColor;
	wxImageList* imageList = new wxImageList( LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );		wxImageList* imageList = new wxImageList( LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
	m_LayerSelectionCtrl->AssignImageList( imageList, wxIMAGE_LIST_SMALL );		m_LayerSelectionCtrl->AssignImageList( imageList, wxIMAGE_LIST_SMALL );
	for( int ii = 0; ii < layerCount; ii++ )		for( int ii = 0; ii < layerCount; ii++ )
	{		{
	layerNumber = LAYER_N_BACK;		int layerNumber = LAYER_N_BACK;

	if( layerCount <= 1 \|\| ii < layerCount - 1 )		if( layerCount <= 1 \|\| ii < layerCount - 1 )
	layerNumber = ii;		layerNumber = ii;
	@@ -165,9 +163,9 @@ void DIALOG_KEEPOUT_AREA_PROPERTIES::initDialog()
	m_LayerId.insert( m_LayerId.begin(), layerNumber );		m_LayerId.insert( m_LayerId.begin(), layerNumber );

	msg = board->GetLayerName( layerNumber );		msg = board->GetLayerName( layerNumber );
	layerColor = board->GetLayerColor( layerNumber );		EDA_COLOR_T layerColor = board->GetLayerColor( layerNumber );
	imageList->Add( makeLayerBitmap( layerColor ) );		imageList->Add( makeLayerBitmap( layerColor ) );
	itemIndex = m_LayerSelectionCtrl->InsertItem( 0, msg, ii );		int itemIndex = m_LayerSelectionCtrl->InsertItem( 0, msg, ii );

	if( m_zonesettings.m_CurrentZone_Layer == layerNumber )		if( m_zonesettings.m_CurrentZone_Layer == layerNumber )
	m_LayerSelectionCtrl->Select( itemIndex );		m_LayerSelectionCtrl->Select( itemIndex );

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!
	@@ -40,23 +40,21 @@ DIALOG_KEEPOUT_AREA_PROPERTIES_BASE::DIALOG_KEEPOUT_AREA_PROPERTIES_BASE( wxWind
	wxBoxSizer* bSizerRight;		wxBoxSizer* bSizerRight;
	bSizerRight = new wxBoxSizer( wxVERTICAL );		bSizerRight = new wxBoxSizer( wxVERTICAL );

	wxStaticBoxSizer* m_OutilinesBoxOpt;		m_staticTextprops = new wxStaticText( this, wxID_ANY, _("Properties:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_OutilinesBoxOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outlines Options:") ), wxVERTICAL );		m_staticTextprops->Wrap( -1 );
			bSizerRight->Add( m_staticTextprops, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	wxString m_OrientEdgesOptChoices[] = { _("Any"), _("H, V and 45 deg") };		wxString m_OrientEdgesOptChoices[] = { _("Any"), _("H, V and 45 deg") };
	int m_OrientEdgesOptNChoices = sizeof( m_OrientEdgesOptChoices ) / sizeof( wxString );		int m_OrientEdgesOptNChoices = sizeof( m_OrientEdgesOptChoices ) / sizeof( wxString );
	m_OrientEdgesOpt = new wxRadioBox( this, wxID_ANY, _("Zone Edges Orient"), wxDefaultPosition, wxDefaultSize, m_OrientEdgesOptNChoices, m_OrientEdgesOptChoices, 1, wxRA_SPECIFY_COLS );		m_OrientEdgesOpt = new wxRadioBox( this, wxID_ANY, _("Zone Edges Orient"), wxDefaultPosition, wxDefaultSize, m_OrientEdgesOptNChoices, m_OrientEdgesOptChoices, 1, wxRA_SPECIFY_COLS );
	m_OrientEdgesOpt->SetSelection( 0 );		m_OrientEdgesOpt->SetSelection( 0 );
	m_OutilinesBoxOpt->Add( m_OrientEdgesOpt, 0, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );		bSizerRight->Add( m_OrientEdgesOpt, 0, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );

	wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched Outline"), _("Full Hatched") };		wxString m_OutlineAppearanceCtrlChoices[] = { _("Line"), _("Hatched Outline"), _("Full Hatched") };
	int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );		int m_OutlineAppearanceCtrlNChoices = sizeof( m_OutlineAppearanceCtrlChoices ) / sizeof( wxString );
	m_OutlineAppearanceCtrl = new wxRadioBox( this, wxID_ANY, _("Outlines Appearence"), wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 1, wxRA_SPECIFY_COLS );		m_OutlineAppearanceCtrl = new wxRadioBox( this, wxID_ANY, _("Outlines Appearence"), wxDefaultPosition, wxDefaultSize, m_OutlineAppearanceCtrlNChoices, m_OutlineAppearanceCtrlChoices, 1, wxRA_SPECIFY_COLS );
	m_OutlineAppearanceCtrl->SetSelection( 1 );		m_OutlineAppearanceCtrl->SetSelection( 1 );
	m_OutilinesBoxOpt->Add( m_OutlineAppearanceCtrl, 0, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );		bSizerRight->Add( m_OutlineAppearanceCtrl, 0, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );


	bSizerRight->Add( m_OutilinesBoxOpt, 0, wxEXPAND\|wxALL, 5 );

	wxStaticBoxSizer* sbSizerCutoutOpts;		wxStaticBoxSizer* sbSizerCutoutOpts;
	sbSizerCutoutOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Keepout Options:") ), wxVERTICAL );		sbSizerCutoutOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Keepout Options:") ), wxVERTICAL );

Admin message