Removed non-standard dialog UI control text colors missed in last commit. (1e6a4652) · Commits · Elphel / kicad-source-mirror

eeschema/pinedit-dialog.cpp

+1 −5

eeschema/pinedit-dialog.pjd

+4 −4

pcbnew/dialog_copper_zones_base.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -148,20 +148,15 @@ dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID i
	m_RightBoxSizer = new wxBoxSizer( wxVERTICAL );		m_RightBoxSizer = new wxBoxSizer( wxVERTICAL );

	m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Setup to other zones"), wxDefaultPosition, wxDefaultSize, 0 );		m_ExportSetupButton = new wxButton( this, wxID_BUTTON_EXPORT, _("Export Setup to other zones"), wxDefaultPosition, wxDefaultSize, 0 );
	m_ExportSetupButton->SetForegroundColour( wxColour( 51, 111, 40 ) );
	m_ExportSetupButton->SetToolTip( _("Export this zone setup to all other copper zones") );		m_ExportSetupButton->SetToolTip( _("Export this zone setup to all other copper zones") );

	m_RightBoxSizer->Add( m_ExportSetupButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		m_RightBoxSizer->Add( m_ExportSetupButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

	m_OkButton = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );		m_OkButton = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
	m_OkButton->SetDefault();		m_OkButton->SetDefault();
	m_OkButton->SetForegroundColour( wxColour( 140, 49, 47 ) );

	m_RightBoxSizer->Add( m_OkButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		m_RightBoxSizer->Add( m_OkButton, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

	m_ButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );		m_ButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
	m_ButtonCancel->SetForegroundColour( wxColour( 45, 38, 155 ) );

	m_RightBoxSizer->Add( m_ButtonCancel, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );		m_RightBoxSizer->Add( m_ButtonCancel, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL\|wxEXPAND, 5 );

pcbnew/dialog_copper_zones_base.fbp

+3 −3

pcbnew/dialog_pcb_text_properties.cpp

+51 −52

Original line number	Original line	Diff line number	Diff line
	@@ -55,12 +55,11 @@ EVT_BUTTON( wxID_CANCEL, WinEDA_TextPCBPropertiesFrame::OnCancelClick )
	END_EVENT_TABLE()		END_EVENT_TABLE()


	/******************************************************************************/
	void WinEDA_PcbFrame::InstallTextPCBOptionsFrame( TEXTE_PCB* TextPCB, wxDC* DC )		void WinEDA_PcbFrame::InstallTextPCBOptionsFrame( TEXTE_PCB* TextPCB, wxDC* DC )
	/*******************************************************************************/
	{		{
	DrawPanel->m_IgnoreMouseEvents = TRUE;		DrawPanel->m_IgnoreMouseEvents = TRUE;
	WinEDA_TextPCBPropertiesFrame* frame = new WinEDA_TextPCBPropertiesFrame( this, TextPCB, DC );		WinEDA_TextPCBPropertiesFrame* frame =
			new WinEDA_TextPCBPropertiesFrame( this, TextPCB, DC );
	frame->ShowModal();		frame->ShowModal();
	frame->Destroy();		frame->Destroy();
	DrawPanel->MouseToCursorSchema();		DrawPanel->MouseToCursorSchema();
	@@ -68,11 +67,11 @@ void WinEDA_PcbFrame::InstallTextPCBOptionsFrame( TEXTE_PCB* TextPCB, wxDC* DC )
	}		}


	/************************************************************************************/
	WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* parent,		WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* parent,
	TEXTE_PCB* TextPCB, wxDC* DC ) :		TEXTE_PCB* TextPCB,
	wxDialog( parent, -1, _( "TextPCB properties" ), wxDefaultPosition, wxSize( 390, 340 ) )		wxDC* DC ) :
	/************************************************************************************/		wxDialog( parent, -1, _( "TextPCB properties" ), wxDefaultPosition,
			wxSize( 390, 340 ) )
	{		{
	wxButton* Button;		wxButton* Button;
	BOARD* board = parent->GetBoard();		BOARD* board = parent->GetBoard();
	@@ -96,12 +95,10 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p

	/* Creation des boutons de commande */		/* Creation des boutons de commande */
	Button = new wxButton( this, wxID_OK, _( "OK" ) );		Button = new wxButton( this, wxID_OK, _( "OK" ) );
	Button->SetForegroundColour( *wxRED );
	RightBoxSizer->Add( Button, 0, wxGROW \| wxALL, 5 );		RightBoxSizer->Add( Button, 0, wxGROW \| wxALL, 5 );
	Button->SetDefault();		Button->SetDefault();

	Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );		Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
	Button->SetForegroundColour( *wxBLUE );
	RightBoxSizer->Add( Button, 0, wxGROW \| wxALL, 5 );		RightBoxSizer->Add( Button, 0, wxGROW \| wxALL, 5 );

	m_Name = new WinEDA_EnterText( this, _( "Text:" ),		m_Name = new WinEDA_EnterText( this, _( "Text:" ),
	@@ -112,15 +109,18 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p

	m_TxtSizeCtrl = new WinEDA_SizeCtrl( this, _( "Size" ),		m_TxtSizeCtrl = new WinEDA_SizeCtrl( this, _( "Size" ),
	TextPCB->m_Size,		TextPCB->m_Size,
	g_UnitMetric, LeftBoxSizer, m_Parent->m_InternalUnits );		g_UnitMetric, LeftBoxSizer,
			m_Parent->m_InternalUnits );

	m_TxtWidthCtlr = new WinEDA_ValueCtrl( this, _( "Width" ),		m_TxtWidthCtlr = new WinEDA_ValueCtrl( this, _( "Width" ),
	TextPCB->m_Width,		TextPCB->m_Width,
	g_UnitMetric, LeftBoxSizer, m_Parent->m_InternalUnits );		g_UnitMetric, LeftBoxSizer,
			m_Parent->m_InternalUnits );

	m_TxtPosCtrl = new WinEDA_PositionCtrl( this, _( "Position" ),		m_TxtPosCtrl = new WinEDA_PositionCtrl( this, _( "Position" ),
	TextPCB->m_Pos,		TextPCB->m_Pos,
	g_UnitMetric, LeftBoxSizer, m_Parent->m_InternalUnits );		g_UnitMetric, LeftBoxSizer,
			m_Parent->m_InternalUnits );

	m_SelLayerBox = new WinEDAChoiceBox( this, ID_TEXTPCB_SELECT_LAYER,		m_SelLayerBox = new WinEDAChoiceBox( this, ID_TEXTPCB_SELECT_LAYER,
	wxDefaultPosition, wxDefaultSize );		wxDefaultPosition, wxDefaultSize );
	@@ -134,11 +134,13 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p
	m_SelLayerBox->SetSelection( TextPCB->GetLayer() );		m_SelLayerBox->SetSelection( TextPCB->GetLayer() );


	static const wxString orient_msg[4] = {		static const wxString orient_msg[4] =
	wxT( "0" ), wxT( "90" ), wxT( "180" ), wxT( "-90" ) };		{
			wxT( "0" ), wxT( "90" ), wxT( "180" ), wxT( "-90" )
			};

	m_Orient = new wxRadioBox( this, -1, _( "Orientation" ),		m_Orient = new wxRadioBox( this, -1, _( "Orientation" ), wxDefaultPosition,
	wxDefaultPosition, wxSize( -1, -1 ), 4, orient_msg,		wxSize( -1, -1 ), 4, orient_msg,
	1, wxRA_SPECIFY_COLS );		1, wxRA_SPECIFY_COLS );
	MiddleBoxSizer->Add( m_Orient, 0, wxGROW \| wxALL, 5 );		MiddleBoxSizer->Add( m_Orient, 0, wxGROW \| wxALL, 5 );

	@@ -162,8 +164,8 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p
	}		}

	wxString display_msg[2] = { _( "Normal" ), _( "Mirror" ) };		wxString display_msg[2] = { _( "Normal" ), _( "Mirror" ) };
	m_Mirror = new wxRadioBox( this, -1, _( "Display" ),		m_Mirror = new wxRadioBox( this, -1, _( "Display" ), wxDefaultPosition,
	wxDefaultPosition, wxSize( -1, -1 ), 2, display_msg,		wxSize( -1, -1 ), 2, display_msg,
	1, wxRA_SPECIFY_COLS );		1, wxRA_SPECIFY_COLS );
	if( TextPCB->m_Mirror )		if( TextPCB->m_Mirror )
	m_Mirror->SetSelection( 1 );		m_Mirror->SetSelection( 1 );
	@@ -173,8 +175,8 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p
	if( CurrentTextPCB->m_Italic )		if( CurrentTextPCB->m_Italic )
	style = 1;		style = 1;
	wxString style_msg[] = { _( "Normal" ), _( "Italic" ) };		wxString style_msg[] = { _( "Normal" ), _( "Italic" ) };
	m_Style = new wxRadioBox( this, -1, _( "Style" ),		m_Style = new wxRadioBox( this, -1, _( "Style" ), wxDefaultPosition,
	wxDefaultPosition, wxSize( -1, -1 ), 2, style_msg,		wxSize( -1, -1 ), 2, style_msg,
	1, wxRA_SPECIFY_COLS );		1, wxRA_SPECIFY_COLS );
	m_Style->SetSelection( style );		m_Style->SetSelection( style );
	MiddleBoxSizer->Add( m_Style, 0, wxGROW \| wxALL, 5 );		MiddleBoxSizer->Add( m_Style, 0, wxGROW \| wxALL, 5 );
	@@ -184,20 +186,17 @@ WinEDA_TextPCBPropertiesFrame::WinEDA_TextPCBPropertiesFrame( WinEDA_PcbFrame* p
	}		}


	/**********************************************************************/
	void WinEDA_TextPCBPropertiesFrame::OnCancelClick( wxCommandEvent& WXUNUSED( event ) )		void WinEDA_TextPCBPropertiesFrame::OnCancelClick( wxCommandEvent& WXUNUSED( event ) )
	/**********************************************************************/
	{		{
	EndModal( -1 );		EndModal( wxID_CANCEL );
	}		}


	/**************************************************************************************/
	void WinEDA_TextPCBPropertiesFrame::OnOkClick( wxCommandEvent& event )		void WinEDA_TextPCBPropertiesFrame::OnOkClick( wxCommandEvent& event )
	/**************************************************************************************/
	{		{
	// test for acceptable values for parameters:		// test for acceptable values for parameters:
	wxSize newsize = m_TxtSizeCtrl->GetValue();		wxSize newsize = m_TxtSizeCtrl->GetValue();

	if( newsize.x < TEXTS_MIN_SIZE )		if( newsize.x < TEXTS_MIN_SIZE )
	newsize.x = TEXTS_MIN_SIZE;		newsize.x = TEXTS_MIN_SIZE;
	if( newsize.y < TEXTS_MIN_SIZE )		if( newsize.y < TEXTS_MIN_SIZE )
	@@ -220,6 +219,7 @@ void WinEDA_TextPCBPropertiesFrame::OnOkClick( wxCommandEvent& event )
	CurrentTextPCB->m_Size = newsize;		CurrentTextPCB->m_Size = newsize;

	CurrentTextPCB->m_Width = m_TxtWidthCtlr->GetValue();		CurrentTextPCB->m_Width = m_TxtWidthCtlr->GetValue();

	// test for acceptable values for parameters:		// test for acceptable values for parameters:
	int max_tickness = min( CurrentTextPCB->m_Size.x, CurrentTextPCB->m_Size.y );		int max_tickness = min( CurrentTextPCB->m_Size.x, CurrentTextPCB->m_Size.y );
	max_tickness /= 4;		max_tickness /= 4;
	@@ -238,4 +238,3 @@ void WinEDA_TextPCBPropertiesFrame::OnOkClick( wxCommandEvent& event )
	m_Parent->GetScreen()->SetModify();		m_Parent->GetScreen()->SetModify();
	EndModal( 1 );		EndModal( 1 );
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -135,7 +135,7 @@ bool WinEDA_PinPropertiesFrame::Create( wxWindow* parent, wxWindowID id, const w
	void WinEDA_PinPropertiesFrame::CreateControls()		void WinEDA_PinPropertiesFrame::CreateControls()
	{		{
	////@begin WinEDA_PinPropertiesFrame content construction		////@begin WinEDA_PinPropertiesFrame content construction
	// Generated by DialogBlocks, 24/04/2009 14:24:14 (unregistered)		// Generated by DialogBlocks, 01/05/2009 16:19:57 (unregistered)

	WinEDA_PinPropertiesFrame* itemDialog1 = this;		WinEDA_PinPropertiesFrame* itemDialog1 = this;

	@@ -161,7 +161,6 @@ void WinEDA_PinPropertiesFrame::CreateControls()

	wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _(" Pin Options :"));		wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _(" Pin Options :"));
	wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxVERTICAL);		wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxVERTICAL);
	itemStaticBoxSizer9Static->SetForegroundColour(wxColour(64, 0, 128));
	itemBoxSizer3->Add(itemStaticBoxSizer9, 0, wxGROW\|wxALL, 5);		itemBoxSizer3->Add(itemStaticBoxSizer9, 0, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL);		wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL);
	@@ -214,7 +213,6 @@ void WinEDA_PinPropertiesFrame::CreateControls()
	m_PinOrientStrings.Add(_("Down"));		m_PinOrientStrings.Add(_("Down"));
	m_PinOrient = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Pin Orient:"), wxDefaultPosition, wxDefaultSize, m_PinOrientStrings, 1, wxRA_SPECIFY_COLS );		m_PinOrient = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Pin Orient:"), wxDefaultPosition, wxDefaultSize, m_PinOrientStrings, 1, wxRA_SPECIFY_COLS );
	m_PinOrient->SetSelection(0);		m_PinOrient->SetSelection(0);
	m_PinOrient->SetForegroundColour(wxColour(41, 84, 84));
	itemBoxSizer17->Add(m_PinOrient, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		itemBoxSizer17->Add(m_PinOrient, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);

	wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxVERTICAL);		wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxVERTICAL);
	@@ -243,7 +241,6 @@ void WinEDA_PinPropertiesFrame::CreateControls()
	m_PinShapeStrings.Add(_("low out"));		m_PinShapeStrings.Add(_("low out"));
	m_PinShape = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Pin Shape:"), wxDefaultPosition, wxDefaultSize, m_PinShapeStrings, 1, wxRA_SPECIFY_COLS );		m_PinShape = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Pin Shape:"), wxDefaultPosition, wxDefaultSize, m_PinShapeStrings, 1, wxRA_SPECIFY_COLS );
	m_PinShape->SetSelection(0);		m_PinShape->SetSelection(0);
	m_PinShape->SetForegroundColour(wxColour(0, 64, 0));
	itemBoxSizer28->Add(m_PinShape, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);		itemBoxSizer28->Add(m_PinShape, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	wxArrayString m_PinElectricalTypeStrings;		wxArrayString m_PinElectricalTypeStrings;
	@@ -259,7 +256,6 @@ void WinEDA_PinPropertiesFrame::CreateControls()
	m_PinElectricalTypeStrings.Add(_("Open emit"));		m_PinElectricalTypeStrings.Add(_("Open emit"));
	m_PinElectricalType = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Electrical Type:"), wxDefaultPosition, wxDefaultSize, m_PinElectricalTypeStrings, 1, wxRA_SPECIFY_COLS );		m_PinElectricalType = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Electrical Type:"), wxDefaultPosition, wxDefaultSize, m_PinElectricalTypeStrings, 1, wxRA_SPECIFY_COLS );
	m_PinElectricalType->SetSelection(0);		m_PinElectricalType->SetSelection(0);
	m_PinElectricalType->SetForegroundColour(wxColour(68, 68, 34));
	itemBoxSizer28->Add(m_PinElectricalType, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);		itemBoxSizer28->Add(m_PinElectricalType, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	////@end WinEDA_PinPropertiesFrame content construction		////@end WinEDA_PinPropertiesFrame content construction

Original line number	Original line	Diff line number	Diff line
	@@ -673,7 +673,7 @@
	<string name="proxy-Label">" Pin Options :"</string>		<string name="proxy-Label">" Pin Options :"</string>
	<string name="proxy-Member variable name">""</string>		<string name="proxy-Member variable name">""</string>
	<string name="proxy-Sizer member variable name">""</string>		<string name="proxy-Sizer member variable name">""</string>
	<string name="proxy-Foreground colour">"400080"</string>		<string name="proxy-Foreground colour">""</string>
	<string name="proxy-Font">""</string>		<string name="proxy-Font">""</string>
	<bool name="proxy-Hidden">0</bool>		<bool name="proxy-Hidden">0</bool>
	<bool name="proxy-Enabled">1</bool>		<bool name="proxy-Enabled">1</bool>
	@@ -1519,7 +1519,7 @@
	<string name="proxy-Help text">""</string>		<string name="proxy-Help text">""</string>
	<string name="proxy-Tooltip text">""</string>		<string name="proxy-Tooltip text">""</string>
	<string name="proxy-Background colour">""</string>		<string name="proxy-Background colour">""</string>
	<string name="proxy-Foreground colour">"295454"</string>		<string name="proxy-Foreground colour">""</string>
	<string name="proxy-Font">""</string>		<string name="proxy-Font">""</string>
	<bool name="proxy-Hidden">0</bool>		<bool name="proxy-Hidden">0</bool>
	<bool name="proxy-Enabled">1</bool>		<bool name="proxy-Enabled">1</bool>
	@@ -1794,7 +1794,7 @@
	<string name="proxy-Help text">""</string>		<string name="proxy-Help text">""</string>
	<string name="proxy-Tooltip text">""</string>		<string name="proxy-Tooltip text">""</string>
	<string name="proxy-Background colour">""</string>		<string name="proxy-Background colour">""</string>
	<string name="proxy-Foreground colour">"004000"</string>		<string name="proxy-Foreground colour">""</string>
	<string name="proxy-Font">""</string>		<string name="proxy-Font">""</string>
	<bool name="proxy-Hidden">0</bool>		<bool name="proxy-Hidden">0</bool>
	<bool name="proxy-Enabled">1</bool>		<bool name="proxy-Enabled">1</bool>
	@@ -1858,7 +1858,7 @@
	<string name="proxy-Help text">""</string>		<string name="proxy-Help text">""</string>
	<string name="proxy-Tooltip text">""</string>		<string name="proxy-Tooltip text">""</string>
	<string name="proxy-Background colour">""</string>		<string name="proxy-Background colour">""</string>
	<string name="proxy-Foreground colour">"444422"</string>		<string name="proxy-Foreground colour">""</string>
	<string name="proxy-Font">""</string>		<string name="proxy-Font">""</string>
	<bool name="proxy-Hidden">0</bool>		<bool name="proxy-Hidden">0</bool>
	<bool name="proxy-Enabled">1</bool>		<bool name="proxy-Enabled">1</bool>

Original line number	Original line	Diff line number	Diff line
	@@ -919,7 +919,7 @@
	<property name="context_help"></property>		<property name="context_help"></property>
	<property name="default">0</property>		<property name="default">0</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="fg">51,111,40</property>		<property name="fg"></property>
	<property name="font"></property>		<property name="font"></property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_BUTTON_EXPORT</property>		<property name="id">wxID_BUTTON_EXPORT</property>
	@@ -971,7 +971,7 @@
	<property name="context_help"></property>		<property name="context_help"></property>
	<property name="default">1</property>		<property name="default">1</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="fg">140,49,47</property>		<property name="fg"></property>
	<property name="font"></property>		<property name="font"></property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_OK</property>		<property name="id">wxID_OK</property>
	@@ -1023,7 +1023,7 @@
	<property name="context_help"></property>		<property name="context_help"></property>
	<property name="default">0</property>		<property name="default">0</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
	<property name="fg">45,38,155</property>		<property name="fg"></property>
	<property name="font"></property>		<property name="font"></property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_CANCEL</property>		<property name="id">wxID_CANCEL</property>

Admin message