From 296ec66796a22f903f2c3e4fe820436c8422ddb7 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 1 Jun 2019 14:46:30 +0100 Subject: [PATCH] Cosmetic cleanup in preference panels. --- common/gal/gal_display_options.cpp | 2 +- common/widgets/gal_options_panel.cpp | 2 +- .../panel_pcbnew_display_options_base.cpp | 76 +++---- .../panel_pcbnew_display_options_base.fbp | 194 +++++++++++++++++- .../panel_pcbnew_display_options_base.h | 20 +- 5 files changed, 236 insertions(+), 58 deletions(-) diff --git a/common/gal/gal_display_options.cpp b/common/gal/gal_display_options.cpp index 23cc0782b9..3acb173ca5 100644 --- a/common/gal/gal_display_options.cpp +++ b/common/gal/gal_display_options.cpp @@ -52,7 +52,7 @@ static const UTIL::CFG_MAP gridStyleConfigVals = /** - * Flag to enable GAL_DISPLAY_OPTIONS loggin + * Flag to enable GAL_DISPLAY_OPTIONS logging * * Use "KICAD_GAL_DISPLAY_OPTIONS" to enable. * diff --git a/common/widgets/gal_options_panel.cpp b/common/widgets/gal_options_panel.cpp index 485882f607..703e0e42a0 100644 --- a/common/widgets/gal_options_panel.cpp +++ b/common/widgets/gal_options_panel.cpp @@ -145,7 +145,7 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, KIGFX::GAL_DISPLAY_OPTI int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString ); m_cursorShape = new wxRadioBox( this, wxID_ANY, - _( "Cursor Shape:" ), wxDefaultPosition, wxDefaultSize, + _( "Cursor Shape" ), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS ); diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp b/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp index 61014a2025..0e9004b94a 100644 --- a/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp +++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,77 +9,77 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_PCBNEW_DISPLAY_OPTIONS_BASE::PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +PANEL_PCBNEW_DISPLAY_OPTIONS_BASE::PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bupperSizer; bupperSizer = new wxBoxSizer( wxHORIZONTAL ); - + m_galOptionsSizer = new wxBoxSizer( wxVERTICAL ); - - + + bupperSizer->Add( m_galOptionsSizer, 1, wxEXPAND, 5 ); - + wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbAnnotations; sbAnnotations = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Annotations") ), wxVERTICAL ); - + wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("Show on pads"), _("Show on tracks"), _("Show on pads and tracks") }; int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString ); m_ShowNetNamesOption = new wxRadioBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Net Names"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS ); m_ShowNetNamesOption->SetSelection( 0 ); m_ShowNetNamesOption->SetToolTip( _("Show or hide net names on pads and/or tracks.") ); - - sbAnnotations->Add( m_ShowNetNamesOption, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + + sbAnnotations->Add( m_ShowNetNamesOption, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_OptDisplayPadNumber = new wxCheckBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Show pad numbers"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptDisplayPadNumber->SetValue(true); - sbAnnotations->Add( m_OptDisplayPadNumber, 0, wxALL, 10 ); - + m_OptDisplayPadNumber->SetValue(true); + sbAnnotations->Add( m_OptDisplayPadNumber, 0, wxALL, 6 ); + m_OptDisplayPadNoConn = new wxCheckBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Show pad indicator"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptDisplayPadNoConn->SetValue(true); - sbAnnotations->Add( m_OptDisplayPadNoConn, 0, wxBOTTOM|wxLEFT|wxRIGHT, 10 ); - - + m_OptDisplayPadNoConn->SetValue(true); + sbAnnotations->Add( m_OptDisplayPadNoConn, 0, wxBOTTOM|wxLEFT|wxRIGHT, 6 ); + + bRightSizer->Add( sbAnnotations, 0, wxEXPAND|wxBOTTOM, 5 ); - + wxStaticBoxSizer* sbClearance; sbClearance = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Clearance Outlines") ), wxVERTICAL ); - + wxString m_OptDisplayTracksClearanceChoices[] = { _("Do not show"), _("Show when creating tracks"), _("Show with via clearance at end"), _("Show when creating and editing tracks"), _("Show always") }; int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString ); m_OptDisplayTracksClearance = new wxRadioBox( sbClearance->GetStaticBox(), ID_SHOW_CLEARANCE, _("Track Clearance"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayTracksClearance->SetSelection( 2 ); m_OptDisplayTracksClearance->SetToolTip( _("Show or hide the track and via clearance area. If \"New track\" is selected, track clearance area is shown only when creating the track.") ); - - sbClearance->Add( m_OptDisplayTracksClearance, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + + sbClearance->Add( m_OptDisplayTracksClearance, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_OptDisplayPadClearence = new wxCheckBox( sbClearance->GetStaticBox(), wxID_ANY, _("Show pad clearance"), wxDefaultPosition, wxDefaultSize, 0 ); - sbClearance->Add( m_OptDisplayPadClearence, 0, wxALL, 10 ); - - + sbClearance->Add( m_OptDisplayPadClearence, 0, wxALL, 6 ); + + bRightSizer->Add( sbClearance, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); - + wxStaticBoxSizer* sbGeneral; sbGeneral = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General") ), wxVERTICAL ); - + m_OptDisplayCurvedRatsnestLines = new wxCheckBox( sbGeneral->GetStaticBox(), wxID_ANY, _("Show ratsnest with curved lines"), wxDefaultPosition, wxDefaultSize, 0 ); - sbGeneral->Add( m_OptDisplayCurvedRatsnestLines, 0, wxALL, 10 ); - - + sbGeneral->Add( m_OptDisplayCurvedRatsnestLines, 0, wxBOTTOM|wxRIGHT|wxLEFT, 6 ); + + bRightSizer->Add( sbGeneral, 0, wxEXPAND|wxTOP, 5 ); - - + + bupperSizer->Add( bRightSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + bMainSizer->Add( bupperSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp index 7778a64871..a16a5c7eb6 100644 --- a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp +++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ panel_pcbnew_display_options_base 1000 none - 1 PanelPcbnewDisplayOptions @@ -49,6 +48,36 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer @@ -95,9 +124,10 @@ wxVERTICAL 1 none + 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -159,10 +189,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + - 10 + 6 wxALL 0 @@ -223,10 +277,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + - 10 + 6 wxBOTTOM|wxLEFT|wxRIGHT 0 @@ -287,6 +365,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,9 +405,10 @@ wxVERTICAL 1 none + 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -367,10 +470,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + - 10 + 6 wxALL 0 @@ -431,6 +558,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -447,9 +598,10 @@ wxVERTICAL 1 none + - 10 - wxALL + 6 + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -509,6 +661,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.h b/pcbnew/dialogs/panel_pcbnew_display_options_base.h index ac68a7f593..baeec049bf 100644 --- a/pcbnew/dialogs/panel_pcbnew_display_options_base.h +++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.h @@ -1,11 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#pragma once +#ifndef __PANEL_PCBNEW_DISPLAY_OPTIONS_BASE_H__ +#define __PANEL_PCBNEW_DISPLAY_OPTIONS_BASE_H__ #include #include @@ -26,16 +27,16 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_PCBNEW_DISPLAY_OPTIONS_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_PCBNEW_DISPLAY_OPTIONS_BASE : public wxPanel +class PANEL_PCBNEW_DISPLAY_OPTIONS_BASE : public wxPanel { private: - + protected: enum { ID_SHOW_CLEARANCE = 1000 }; - + wxBoxSizer* m_galOptionsSizer; wxRadioBox* m_ShowNetNamesOption; wxCheckBox* m_OptDisplayPadNumber; @@ -43,11 +44,12 @@ class PANEL_PCBNEW_DISPLAY_OPTIONS_BASE : public wxPanel wxRadioBox* m_OptDisplayTracksClearance; wxCheckBox* m_OptDisplayPadClearence; wxCheckBox* m_OptDisplayCurvedRatsnestLines; - + public: - - PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + + PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); ~PANEL_PCBNEW_DISPLAY_OPTIONS_BASE(); - + }; +#endif //__PANEL_PCBNEW_DISPLAY_OPTIONS_BASE_H__