From 270f81f03d36c44c1e15d6e9f0ddb2402d5d340f Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 1 Sep 2018 00:18:47 +0100 Subject: [PATCH] Make fill colour terminology more consistent. Fixes: lp:1789855 * https://bugs.launchpad.net/kicad/+bug/1789855 --- .../dialogs/dialog_lib_edit_draw_item.fbp | 333 +++++++++++------- .../dialog_lib_edit_draw_item_base.cpp | 26 +- .../dialogs/dialog_lib_edit_draw_item_base.h | 6 +- .../widgets/widget_eeschema_color_config.cpp | 2 +- 4 files changed, 220 insertions(+), 147 deletions(-) diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.fbp b/eeschema/dialogs/dialog_lib_edit_draw_item.fbp index b0ad349309..5da4628db9 100644 --- a/eeschema/dialogs/dialog_lib_edit_draw_item.fbp +++ b/eeschema/dialogs/dialog_lib_edit_draw_item.fbp @@ -91,11 +91,11 @@ mainSizer - wxHORIZONTAL + wxVERTICAL none 10 - wxALL|wxEXPAND + wxEXPAND|wxALL 1 @@ -103,8 +103,8 @@ wxVERTICAL none - 10 - wxEXPAND|wxBOTTOM + 5 + wxEXPAND 0 @@ -143,7 +143,7 @@ 0 0 wxID_ANY - Line Width: + Line width: 0 @@ -370,6 +370,96 @@ + + 10 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Do not fill" "Fill with body outline color" "Fill with body background color" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Fill Style + 1 + + 0 + + + 0 + + 1 + m_fillCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 wxALIGN_CENTER_VERTICAL|wxALL @@ -546,132 +636,113 @@ - - 5 - wxEXPAND|wxTOP - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Do not fill" "Fill foreground" "Fill background" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Fill Style - 1 - - 0 - - - 0 - - 1 - m_fillCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - - - - - - - - - + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; forward_declare + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + + + + + + diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp b/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp index ff4dcc8c09..5b6de43d7d 100644 --- a/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp @@ -14,7 +14,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent this->SetSizeHints( wxDefaultSize, wxDefaultSize ); wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxHORIZONTAL ); + mainSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* dlgBorderSizer; dlgBorderSizer = new wxBoxSizer( wxVERTICAL ); @@ -22,7 +22,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); - m_widthLabel = new wxStaticText( this, wxID_ANY, _("Line Width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_widthLabel = new wxStaticText( this, wxID_ANY, _("Line width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_widthLabel->Wrap( -1 ); bSizer3->Add( m_widthLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); @@ -34,7 +34,13 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent bSizer3->Add( m_widthUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 3 ); - dlgBorderSizer->Add( bSizer3, 0, wxEXPAND|wxBOTTOM, 10 ); + dlgBorderSizer->Add( bSizer3, 0, wxEXPAND, 5 ); + + wxString m_fillCtrlChoices[] = { _("Do not fill"), _("Fill with body outline color"), _("Fill with body background color") }; + int m_fillCtrlNChoices = sizeof( m_fillCtrlChoices ) / sizeof( wxString ); + m_fillCtrl = new wxRadioBox( this, wxID_ANY, _("Fill Style"), wxDefaultPosition, wxDefaultSize, m_fillCtrlNChoices, m_fillCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_fillCtrl->SetSelection( 0 ); + dlgBorderSizer->Add( m_fillCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 ); m_checkApplyToAllUnits = new wxCheckBox( this, wxID_ANY, _("Common to all &units in component"), wxDefaultPosition, wxDefaultSize, 0 ); dlgBorderSizer->Add( m_checkApplyToAllUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); @@ -43,13 +49,10 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent dlgBorderSizer->Add( m_checkApplyToAllConversions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - dlgBorderSizer->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + mainSizer->Add( dlgBorderSizer, 1, wxEXPAND|wxALL, 10 ); - wxString m_fillCtrlChoices[] = { _("Do not fill"), _("Fill foreground"), _("Fill background") }; - int m_fillCtrlNChoices = sizeof( m_fillCtrlChoices ) / sizeof( wxString ); - m_fillCtrl = new wxRadioBox( this, wxID_ANY, _("Fill Style"), wxDefaultPosition, wxDefaultSize, m_fillCtrlNChoices, m_fillCtrlChoices, 1, wxRA_SPECIFY_COLS ); - m_fillCtrl->SetSelection( 0 ); - dlgBorderSizer->Add( m_fillCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + mainSizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -58,10 +61,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - dlgBorderSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 0 ); - - - mainSizer->Add( dlgBorderSizer, 1, wxALL|wxEXPAND, 10 ); + mainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 0 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item_base.h b/eeschema/dialogs/dialog_lib_edit_draw_item_base.h index 9b5bb7e85e..5fce46ea7a 100644 --- a/eeschema/dialogs/dialog_lib_edit_draw_item_base.h +++ b/eeschema/dialogs/dialog_lib_edit_draw_item_base.h @@ -20,8 +20,9 @@ #include #include #include -#include #include +#include +#include #include #include @@ -38,9 +39,10 @@ class DIALOG_LIB_EDIT_DRAW_ITEM_BASE : public DIALOG_SHIM wxStaticText* m_widthLabel; wxTextCtrl* m_widthCtrl; wxStaticText* m_widthUnits; + wxRadioBox* m_fillCtrl; wxCheckBox* m_checkApplyToAllUnits; wxCheckBox* m_checkApplyToAllConversions; - wxRadioBox* m_fillCtrl; + wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; diff --git a/eeschema/widgets/widget_eeschema_color_config.cpp b/eeschema/widgets/widget_eeschema_color_config.cpp index a0446019a1..7c0b049b27 100644 --- a/eeschema/widgets/widget_eeschema_color_config.cpp +++ b/eeschema/widgets/widget_eeschema_color_config.cpp @@ -67,7 +67,7 @@ static COLORBUTTON generalColorButtons[] = { }; static COLORBUTTON componentColorButtons[] = { - { _( "Body" ), LAYER_DEVICE }, + { _( "Body outline" ), LAYER_DEVICE }, { _( "Body background" ), LAYER_DEVICE_BACKGROUND }, { _( "Pin" ), LAYER_PIN }, { _( "Pin number" ), LAYER_PINNUM },