Pcbnew, module edit dialogs: fix some "cosmetic" issues. (c1fbc8ef) · Commits · Elphel / kicad-source-mirror

packaging/windows/nsis/install.nsi

+2 −2

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

	; General Product Description Definitions		; General Product Description Definitions
	!define PRODUCT_NAME "KiCad"		!define PRODUCT_NAME "KiCad"
	!define PRODUCT_VERSION "2013.02.27"		!define PRODUCT_VERSION "2013.03.04"
	!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"		!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
	!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"		!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
	!define COMPANY_NAME ""		!define COMPANY_NAME ""
	@@ -36,7 +36,7 @@ SetCompressor /final /solid lzma
	CRCCheck force		CRCCheck force
	XPStyle on		XPStyle on
	Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"		Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
	OutFile "${PRODUCT_NAME}_stable-${PRODUCT_VERSION}-BZR3976_Win_full_version.exe"		OutFile "${PRODUCT_NAME}_stable-${PRODUCT_VERSION}-BZR3982_Win_full_version.exe"
	InstallDir "$PROGRAMFILES\KiCad"		InstallDir "$PROGRAMFILES\KiCad"
	ShowInstDetails hide		ShowInstDetails hide
	ShowUnInstDetails hide		ShowUnInstDetails hide

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -89,10 +89,10 @@ DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR()
	void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()		void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
	{		{
	PutValueInLocalUnits( *m_ModPositionX, m_CurrentModule->GetPosition().x );		PutValueInLocalUnits( *m_ModPositionX, m_CurrentModule->GetPosition().x );
	AddUnitSymbol( *XPositionStatic, g_UserUnit );		m_XPosUnit->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );

	PutValueInLocalUnits( *m_ModPositionY, m_CurrentModule->GetPosition().y );		PutValueInLocalUnits( *m_ModPositionY, m_CurrentModule->GetPosition().y );
	AddUnitSymbol( *YPositionStatic, g_UserUnit );		m_YPosUnit->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );

	m_LayerCtrl->SetSelection(		m_LayerCtrl->SetSelection(
	(m_CurrentModule->GetLayer() == LAYER_N_BACK) ? 1 : 0 );		(m_CurrentModule->GetLayer() == LAYER_N_BACK) ? 1 : 0 );
	@@ -131,9 +131,9 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
	m_OrientValue->Enable( select );		m_OrientValue->Enable( select );

	// Initialize dialog relative to masks clearances		// Initialize dialog relative to masks clearances
	m_NetClearanceUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_NetClearanceUnits->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );
	m_SolderMaskMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_SolderMaskMarginUnits->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );
	m_SolderPasteMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );		m_SolderPasteMarginUnits->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );

	PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->GetLocalClearance() );		PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->GetLocalClearance() );
	PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->GetLocalSolderMaskMargin() );		PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->GetLocalSolderMaskMargin() );

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

+72 −65

Original line number	Original line	Diff line number	Diff line
	@@ -20,94 +20,102 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	wxBoxSizer* m_PanelPropertiesBoxSizer;		wxBoxSizer* m_PanelPropertiesBoxSizer;
	m_PanelPropertiesBoxSizer = new wxBoxSizer( wxHORIZONTAL );		m_PanelPropertiesBoxSizer = new wxBoxSizer( wxHORIZONTAL );

	wxBoxSizer* bSizer13;		wxBoxSizer* bSizerLeft;
	bSizer13 = new wxBoxSizer( wxVERTICAL );		bSizerLeft = new wxBoxSizer( wxVERTICAL );

	wxStaticBoxSizer* sbSizerRef;		m_staticTextRef = new wxStaticText( m_PanelProperties, wxID_ANY, _("Reference"), wxDefaultPosition, wxDefaultSize, 0 );
	sbSizerRef = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Reference") ), wxHORIZONTAL );		m_staticTextRef->Wrap( -1 );
			bSizerLeft->Add( m_staticTextRef, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

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

	m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );		m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
	m_ReferenceCtrl->SetMaxLength( 0 );		m_ReferenceCtrl->SetMaxLength( 0 );
	sbSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxTOP, 5 );		bSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

	m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );		m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
	sbSizerRef->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxTOP, 5 );		bSizerRef->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );


			bSizerLeft->Add( bSizerRef, 0, wxEXPAND, 5 );

	bSizer13->Add( sbSizerRef, 0, wxALL\|wxEXPAND, 5 );		m_staticTextVal = new wxStaticText( m_PanelProperties, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextVal->Wrap( -1 );
			bSizerLeft->Add( m_staticTextVal, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	wxStaticBoxSizer* sbSizerValue;		wxBoxSizer* bSizerVal;
	sbSizerValue = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Value") ), wxHORIZONTAL );		bSizerVal = new wxBoxSizer( wxHORIZONTAL );

	m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );		m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
	m_ValueCtrl->SetMaxLength( 0 );		m_ValueCtrl->SetMaxLength( 0 );
	sbSizerValue->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxTOP, 5 );		bSizerVal->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

	m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );		m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
	sbSizerValue->Add( m_button5, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxRIGHT\|wxTOP, 5 );		bSizerVal->Add( m_button5, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );


	bSizer13->Add( sbSizerValue, 0, wxALL\|wxEXPAND, 5 );		bSizerLeft->Add( bSizerVal, 0, wxEXPAND, 5 );

	wxString m_LayerCtrlChoices[] = { _("Top"), _("Bottom") };		wxString m_LayerCtrlChoices[] = { _("Top"), _("Bottom") };
	int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString );		int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString );
	m_LayerCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, 0 );		m_LayerCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, wxRA_SPECIFY_COLS );
	m_LayerCtrl->SetSelection( 0 );		m_LayerCtrl->SetSelection( 0 );
	bSizer13->Add( m_LayerCtrl, 0, wxALL\|wxEXPAND, 5 );		bSizerLeft->Add( m_LayerCtrl, 0, wxALL\|wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerOrientation;
	sbSizerOrientation = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Orientation") ), wxVERTICAL );

	wxString m_OrientCtrlChoices[] = { _("Normal"), _("+90.0"), _("-90.0"), _("180.0"), _("User") };		wxString m_OrientCtrlChoices[] = { _("Normal"), _("+90.0"), _("-90.0"), _("180.0"), _("User") };
	int m_OrientCtrlNChoices = sizeof( m_OrientCtrlChoices ) / sizeof( wxString );		int m_OrientCtrlNChoices = sizeof( m_OrientCtrlChoices ) / sizeof( wxString );
	m_OrientCtrl = new wxRadioBox( m_PanelProperties, ID_LISTBOX_ORIENT_SELECT, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientCtrlNChoices, m_OrientCtrlChoices, 1, wxRA_SPECIFY_COLS );		m_OrientCtrl = new wxRadioBox( m_PanelProperties, ID_LISTBOX_ORIENT_SELECT, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientCtrlNChoices, m_OrientCtrlChoices, 1, wxRA_SPECIFY_COLS );
	m_OrientCtrl->SetSelection( 1 );		m_OrientCtrl->SetSelection( 0 );
	sbSizerOrientation->Add( m_OrientCtrl, 0, wxALL\|wxEXPAND, 5 );		bSizerLeft->Add( m_OrientCtrl, 0, wxEXPAND\|wxALL, 5 );

	m_staticText4 = new wxStaticText( m_PanelProperties, wxID_ANY, _("User orientation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText4 = new wxStaticText( m_PanelProperties, wxID_ANY, _("User orientation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText4->Wrap( -1 );		m_staticText4->Wrap( -1 );
	sbSizerOrientation->Add( m_staticText4, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		bSizerLeft->Add( m_staticText4, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_OrientValue->SetMaxLength( 0 );		m_OrientValue->SetMaxLength( 0 );
	sbSizerOrientation->Add( m_OrientValue, 0, wxBOTTOM\|wxEXPAND\|wxLEFT\|wxRIGHT, 5 );		bSizerLeft->Add( m_OrientValue, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


	bSizer13->Add( sbSizerOrientation, 0, wxALL\|wxEXPAND, 5 );		m_staticTextPos = new wxStaticText( m_PanelProperties, wxID_ANY, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextPos->Wrap( -1 );
			bSizerLeft->Add( m_staticTextPos, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	wxStaticBoxSizer* sbSizerPosition;		wxFlexGridSizer* fgSizerPos;
	sbSizerPosition = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Position") ), wxVERTICAL );		fgSizerPos = new wxFlexGridSizer( 2, 3, 0, 0 );
			fgSizerPos->AddGrowableCol( 1 );
			fgSizerPos->SetFlexibleDirection( wxHORIZONTAL );
			fgSizerPos->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	wxFlexGridSizer* fgSizer2;		m_XPosLabel = new wxStaticText( m_PanelProperties, wxID_ANY, _("X"), wxDefaultPosition, wxDefaultSize, 0 );
	fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 );		m_XPosLabel->Wrap( -1 );
	fgSizer2->AddGrowableCol( 1 );		fgSizerPos->Add( m_XPosLabel, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT\|wxLEFT, 5 );
	fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
	fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	XPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("X"), wxDefaultPosition, wxDefaultSize, 0 );
	XPositionStatic->Wrap( -1 );
	fgSizer2->Add( XPositionStatic, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

	m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_ModPositionX->SetMaxLength( 0 );		m_ModPositionX->SetMaxLength( 0 );
	fgSizer2->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );		fgSizerPos->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxRIGHT, 5 );

			m_XPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
			m_XPosUnit->Wrap( -1 );
			fgSizerPos->Add( m_XPosUnit, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );

	YPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("Y"), wxDefaultPosition, wxDefaultSize, 0 );		m_YPosLabel = new wxStaticText( m_PanelProperties, wxID_ANY, _("Y"), wxDefaultPosition, wxDefaultSize, 0 );
	YPositionStatic->Wrap( -1 );		m_YPosLabel->Wrap( -1 );
	fgSizer2->Add( YPositionStatic, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5 );		fgSizerPos->Add( m_YPosLabel, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT\|wxLEFT, 5 );

	m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	m_ModPositionY->SetMaxLength( 0 );		m_ModPositionY->SetMaxLength( 0 );
	fgSizer2->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );		fgSizerPos->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxRIGHT, 5 );


	sbSizerPosition->Add( fgSizer2, 1, wxEXPAND, 5 );		m_YPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
			m_YPosUnit->Wrap( -1 );
			fgSizerPos->Add( m_YPosUnit, 0, wxALIGN_CENTER_VERTICAL\|wxRIGHT, 5 );


	bSizer13->Add( sbSizerPosition, 0, wxALL\|wxEXPAND, 5 );		bSizerLeft->Add( fgSizerPos, 0, wxEXPAND\|wxBOTTOM, 5 );


	m_PanelPropertiesBoxSizer->Add( bSizer13, 1, wxEXPAND, 5 );		m_PanelPropertiesBoxSizer->Add( bSizerLeft, 1, wxEXPAND, 5 );

	m_PropRightSizer = new wxBoxSizer( wxVERTICAL );		m_PropRightSizer = new wxBoxSizer( wxVERTICAL );

	@@ -117,55 +125,55 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 );
	m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

	wxBoxSizer* bSizer12;		wxBoxSizer* bSizerAttrib;
	bSizer12 = new wxBoxSizer( wxHORIZONTAL );		bSizerAttrib = new wxBoxSizer( wxHORIZONTAL );

	wxString m_AttributsCtrlChoices[] = { _("Normal"), _("Normal+Insert"), _("Virtual") };		wxString m_AttributsCtrlChoices[] = { _("Normal"), _("Normal+Insert"), _("Virtual") };
	int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString );		int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString );
	m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS );		m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS );
	m_AttributsCtrl->SetSelection( 0 );		m_AttributsCtrl->SetSelection( 0 );
	bSizer12->Add( m_AttributsCtrl, 1, wxALL\|wxEXPAND, 5 );		bSizerAttrib->Add( m_AttributsCtrl, 1, wxALL\|wxEXPAND, 5 );

	wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };		wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };
	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );		int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );
	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );		m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );
	m_AutoPlaceCtrl->SetSelection( 0 );		m_AutoPlaceCtrl->SetSelection( 0 );
	bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL\|wxEXPAND, 5 );		bSizerAttrib->Add( m_AutoPlaceCtrl, 1, wxALL\|wxEXPAND, 5 );


	m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );		m_PropRightSizer->Add( bSizerAttrib, 0, wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerAutoplace;		wxStaticBoxSizer* sbSizerAP;
	sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL );		sbSizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL );

	wxBoxSizer* bSizerRotOpt;		wxBoxSizer* bSizerRotOpt;
	bSizerRotOpt = new wxBoxSizer( wxVERTICAL );		bSizerRotOpt = new wxBoxSizer( wxVERTICAL );

	m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText11->Wrap( -1 );		m_staticText11->Wrap( -1 );
	bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL\|wxRIGHT\|wxLEFT, 5 );		bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5 );

	m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_LABELS );		m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_LABELS );
	bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );		bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );


	sbSizerAutoplace->Add( bSizerRotOpt, 1, wxEXPAND, 5 );		sbSizerAP->Add( bSizerRotOpt, 1, wxEXPAND, 5 );

	wxBoxSizer* bSizerMoveOpt;		wxBoxSizer* bSizerMoveOpt;
	bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );		bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );

	m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText12->Wrap( -1 );		m_staticText12->Wrap( -1 );
	bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL\|wxRIGHT\|wxLEFT, 5 );		bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5 );

	m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_LABELS );		m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_LABELS );
	bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );		bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );


	sbSizerAutoplace->Add( bSizerMoveOpt, 1, wxEXPAND, 5 );		sbSizerAP->Add( bSizerMoveOpt, 1, wxEXPAND, 5 );


	m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND\|wxALL, 5 );		m_PropRightSizer->Add( sbSizerAP, 0, wxEXPAND\|wxALL, 5 );

	wxStaticBoxSizer* sbSizerLocalProperties;		wxStaticBoxSizer* sbSizerLocalProperties;
	sbSizerLocalProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Settings") ), wxVERTICAL );		sbSizerLocalProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Settings") ), wxVERTICAL );
	@@ -193,10 +201,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	m_staticTextInfo->Wrap( -1 );		m_staticTextInfo->Wrap( -1 );
	m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );		m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	bSizer11->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL\|wxEXPAND, 5 );		bSizer11->Add( m_staticTextInfo, 0, wxALL, 5 );


	sbSizerLocalProperties->Add( bSizer11, 0, 0, 5 );		sbSizerLocalProperties->Add( bSizer11, 0, wxEXPAND, 5 );

	wxFlexGridSizer* fgSizerClearances;		wxFlexGridSizer* fgSizerClearances;
	fgSizerClearances = new wxFlexGridSizer( 5, 3, 0, 0 );		fgSizerClearances = new wxFlexGridSizer( 5, 3, 0, 0 );
	@@ -214,18 +222,18 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	m_NetClearanceValueCtrl->SetMaxLength( 0 );		m_NetClearanceValueCtrl->SetMaxLength( 0 );
	fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );		fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL\|wxALIGN_CENTER_VERTICAL\|wxEXPAND, 5 );

	m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );		m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
	m_NetClearanceUnits->Wrap( -1 );		m_NetClearanceUnits->Wrap( -1 );
	fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxBOTTOM\|wxRIGHT, 5 );		fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxBOTTOM\|wxRIGHT, 5 );

	m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );		m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
	fgSizerClearances->Add( m_staticline1, 1, wxEXPAND\|wxRIGHT\|wxLEFT, 5 );		fgSizerClearances->Add( m_staticline1, 1, wxEXPAND, 5 );

	m_staticline2 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );		m_staticline2 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
	fgSizerClearances->Add( m_staticline2, 1, wxEXPAND\|wxRIGHT\|wxLEFT, 5 );		fgSizerClearances->Add( m_staticline2, 1, wxEXPAND, 5 );

	m_staticline3 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );		m_staticline3 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
	fgSizerClearances->Add( m_staticline3, 1, wxEXPAND\|wxRIGHT\|wxLEFT, 5 );		fgSizerClearances->Add( m_staticline3, 1, wxEXPAND, 5 );

	m_MaskClearanceTitle = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );		m_MaskClearanceTitle = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_MaskClearanceTitle->Wrap( -1 );		m_MaskClearanceTitle->Wrap( -1 );
	@@ -237,7 +245,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	m_SolderMaskMarginCtrl->SetMaxLength( 0 );		m_SolderMaskMarginCtrl->SetMaxLength( 0 );
	fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );		fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 5 );

	m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );		m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
	m_SolderMaskMarginUnits->Wrap( -1 );		m_SolderMaskMarginUnits->Wrap( -1 );
	fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxBOTTOM\|wxRIGHT, 5 );		fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxBOTTOM\|wxRIGHT, 5 );

	@@ -251,7 +259,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
	m_SolderPasteMarginCtrl->SetMaxLength( 0 );		m_SolderPasteMarginCtrl->SetMaxLength( 0 );
	fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP, 5 );		fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

	m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );		m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
	m_SolderPasteMarginUnits->Wrap( -1 );		m_SolderPasteMarginUnits->Wrap( -1 );
	fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxRIGHT, 5 );		fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxRIGHT, 5 );

	@@ -340,7 +348,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare

	this->SetSizer( m_GeneralBoxSizer );		this->SetSizer( m_GeneralBoxSizer );
	this->Layout();		this->Layout();
	m_GeneralBoxSizer->Fit( this );

	// Connect Events		// Connect Events
	m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );		m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp

+838 −457

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -15,17 +15,17 @@ class DIALOG_SHIM;

	#include "dialog_shim.h"		#include "dialog_shim.h"
	#include <wx/string.h>		#include <wx/string.h>
	#include <wx/textctrl.h>		#include <wx/stattext.h>
	#include <wx/gdicmn.h>		#include <wx/gdicmn.h>
	#include <wx/font.h>		#include <wx/font.h>
	#include <wx/colour.h>		#include <wx/colour.h>
	#include <wx/settings.h>		#include <wx/settings.h>
			#include <wx/textctrl.h>
	#include <wx/button.h>		#include <wx/button.h>
	#include <wx/sizer.h>		#include <wx/sizer.h>
	#include <wx/statbox.h>
	#include <wx/radiobox.h>		#include <wx/radiobox.h>
	#include <wx/stattext.h>
	#include <wx/slider.h>		#include <wx/slider.h>
			#include <wx/statbox.h>
	#include <wx/choice.h>		#include <wx/choice.h>
	#include <wx/statline.h>		#include <wx/statline.h>
	#include <wx/panel.h>		#include <wx/panel.h>
	@@ -58,18 +58,23 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
	protected:		protected:
	wxNotebook* m_NoteBook;		wxNotebook* m_NoteBook;
	wxPanel* m_PanelProperties;		wxPanel* m_PanelProperties;
			wxStaticText* m_staticTextRef;
	wxTextCtrl* m_ReferenceCtrl;		wxTextCtrl* m_ReferenceCtrl;
	wxButton* m_button4;		wxButton* m_button4;
			wxStaticText* m_staticTextVal;
	wxTextCtrl* m_ValueCtrl;		wxTextCtrl* m_ValueCtrl;
	wxButton* m_button5;		wxButton* m_button5;
	wxRadioBox* m_LayerCtrl;		wxRadioBox* m_LayerCtrl;
	wxRadioBox* m_OrientCtrl;		wxRadioBox* m_OrientCtrl;
	wxStaticText* m_staticText4;		wxStaticText* m_staticText4;
	wxTextCtrl* m_OrientValue;		wxTextCtrl* m_OrientValue;
	wxStaticText* XPositionStatic;		wxStaticText* m_staticTextPos;
			wxStaticText* m_XPosLabel;
	wxTextCtrl* m_ModPositionX;		wxTextCtrl* m_ModPositionX;
	wxStaticText* YPositionStatic;		wxStaticText* m_XPosUnit;
			wxStaticText* m_YPosLabel;
	wxTextCtrl* m_ModPositionY;		wxTextCtrl* m_ModPositionY;
			wxStaticText* m_YPosUnit;
	wxButton* m_buttonExchange;		wxButton* m_buttonExchange;
	wxButton* m_buttonModuleEditor;		wxButton* m_buttonModuleEditor;
	wxRadioBox* m_AttributsCtrl;		wxRadioBox* m_AttributsCtrl;
	@@ -123,7 +128,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
	public:		public:
	wxStaticBoxSizer* m_Sizer3DValues;		wxStaticBoxSizer* m_Sizer3DValues;

	DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );		DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,561 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
	~DIALOG_MODULE_BOARD_EDITOR_BASE();		~DIALOG_MODULE_BOARD_EDITOR_BASE();

	};		};

Admin message