AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 13:31:42 +00:00
Files Issues Releases Activity

Eeschema: Default value for line style combo box in Graphic properties dialog window is Combo!

Browse Source
This commit is contained in:
Damjan 2025-01-28 15:21:27 +00:00 committed by Jeff Young
parent 19708d2a75
commit 0ba7f0e766
4 changed files with 7 additions and 6 deletions

2
eeschema/dialogs/dialog_line_properties.cpp
View File

@ -117,7 +117,7 @@ void DIALOG_LINE_PROPERTIES::resetDefaults( wxCommandEvent& event )
m_width.SetValue( 0 );
m_colorSwatch->SetSwatchColor( COLOR4D::UNSPECIFIED, false );
m_typeCombo->SetStringSelection( DEFAULT_STYLE );
m_typeCombo->SetStringSelection( DEFAULT_LINE_STYLE_LABEL );
Refresh();
}

2
eeschema/dialogs/dialog_shape_properties.cpp
View File

@ -138,7 +138,7 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( m_shape->GetStroke().GetLineStyle() );
if( style == -1 )
m_borderStyleCombo->SetStringSelection( DEFAULT_STYLE );
m_borderStyleCombo->SetStringSelection( DEFAULT_LINE_STYLE_LABEL );
else if( style < (int) lineTypeNames.size() )
m_borderStyleCombo->SetSelection( style );
else

6
eeschema/dialogs/dialog_wire_bus_properties.cpp
View File

@ -55,7 +55,7 @@ DIALOG_WIRE_BUS_PROPERTIES::DIALOG_WIRE_BUS_PROPERTIES( SCH_EDIT_FRAME* aParent,
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_typeCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_typeCombo->Append( DEFAULT_STYLE );
m_typeCombo->Append( DEFAULT_WIRE_STYLE_LABEL );
SetupStandardButtons( { { wxID_APPLY, _( "Default" ) } } );
@ -125,7 +125,7 @@ bool DIALOG_WIRE_BUS_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( stroke.GetLineStyle() );
if( style == -1 )
m_typeCombo->SetStringSelection( DEFAULT_STYLE );
m_typeCombo->SetStringSelection( DEFAULT_WIRE_STYLE_LABEL );
else if( style < (int) lineTypeNames.size() )
m_typeCombo->SetSelection( style );
else
@ -168,7 +168,7 @@ void DIALOG_WIRE_BUS_PROPERTIES::resetDefaults( wxCommandEvent& event )
{
m_wireWidth.SetValue( 0 );
m_colorSwatch->SetSwatchColor( COLOR4D::UNSPECIFIED, false );
m_typeCombo->SetStringSelection( DEFAULT_STYLE );
m_typeCombo->SetStringSelection( DEFAULT_WIRE_STYLE_LABEL );
m_junctionSize.SetValue( 0 );
Refresh();

3
include/stroke_params.h
View File

@ -82,7 +82,8 @@ enum class WIRE_STYLE
extern const std::map<LINE_STYLE, struct LINE_STYLE_DESC> lineTypeNames;
#define DEFAULT_STYLE _( "Default" )
#define DEFAULT_LINE_STYLE_LABEL _( "Solid" )
#define DEFAULT_WIRE_STYLE_LABEL _( "Default" )
#define INDETERMINATE_STYLE _( "Leave unchanged" )