From b165ae6519a20c0bb2f7940aa8178ecd4021b573 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 26 Jan 2021 11:23:23 +0000 Subject: [PATCH] Fix note formatting issues. Also removes the "tip" icon which doesn't work on OSX and isn't as important as the graphics which actually convey information. Replaced with the more generic "Note: " string. Fixes https://gitlab.com/kicad/code/kicad/issues/7281 --- .../panel_setup_feature_constraints.cpp | 12 +- .../panel_setup_feature_constraints_base.cpp | 24 +-- .../panel_setup_feature_constraints_base.fbp | 203 ++++++------------ .../panel_setup_feature_constraints_base.h | 1 - 4 files changed, 76 insertions(+), 164 deletions(-) diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.cpp b/pcbnew/dialogs/panel_setup_feature_constraints.cpp index 141385ab3a..8b8bd4c45e 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints.cpp @@ -51,15 +51,19 @@ PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* { m_Frame = aFrame; m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings(); + + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_stCircleToPolyWarning->SetFont( infoFont ); } bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataToWindow() { - wxString fmt = m_stCircleToPolyWarning->GetLabel(); - m_stCircleToPolyWarning->SetLabel( wxString::Format( fmt, - StringFromValue( m_Frame->GetUserUnits(), - ARC_HIGH_DEF, true ) ) ); + wxString msg; + msg.Printf( m_stCircleToPolyWarning->GetLabel(), + StringFromValue( m_Frame->GetUserUnits(), ARC_HIGH_DEF, true ) ); + m_stCircleToPolyWarning->SetLabel( msg ); m_OptAllowBlindBuriedVias->SetValue( m_BrdSettings->m_BlindBuriedViaAllowed ); m_OptAllowMicroVias->SetValue( m_BrdSettings->m_MicroViasAllowed ); diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp index 543747c7e6..a3dcc57224 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp @@ -41,14 +41,11 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi sbFeatureRules->Add( fgSizerViaOpt, 0, wxEXPAND|wxTOP, 5 ); - - sbFeatureRules->Add( 0, 5, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - wxBoxSizer* bSizerArcToPoly; bSizerArcToPoly = new wxBoxSizer( wxVERTICAL ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerArcToPoly->Add( m_staticline2, 0, wxEXPAND | wxALL, 2 ); + bSizerArcToPoly->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 15 ); m_stCircleToPolyOpt = new wxStaticText( this, wxID_ANY, _("Arc/circle approximated by segments"), wxDefaultPosition, wxDefaultSize, 0 ); m_stCircleToPolyOpt->Wrap( -1 ); @@ -65,7 +62,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgSizer2->Add( 15, 0, 0, 0, 5 ); - m_maxErrorTitle = new wxStaticText( this, wxID_ANY, _("Maximum deviation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_maxErrorTitle = new wxStaticText( this, wxID_ANY, _("Max allowed deviation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_maxErrorTitle->Wrap( -1 ); m_maxErrorTitle->SetToolTip( _("This is the maximum distance between a circle and the polygonal shape that approximate it.\nThe error max defines the number of segments of this polygon.") ); @@ -81,20 +78,11 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi bSizerArcToPoly->Add( fgSizer2, 0, wxEXPAND|wxBOTTOM, 5 ); - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxHORIZONTAL ); - - m_bitmapInfo = new wxStaticBitmap( this, wxID_ANY, wxArtProvider::GetBitmap( wxART_INFORMATION, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer8->Add( m_bitmapInfo, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - m_stCircleToPolyWarning = new wxStaticText( this, wxID_ANY, _("Value < %s can be time consuming when \nfilling zones."), wxDefaultPosition, wxDefaultSize, 0 ); + m_stCircleToPolyWarning = new wxStaticText( this, wxID_ANY, _("Note: zone filling can be slow when < %s."), wxDefaultPosition, wxDefaultSize, 0 ); m_stCircleToPolyWarning->Wrap( -1 ); m_stCircleToPolyWarning->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizer8->Add( m_stCircleToPolyWarning, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - bSizerArcToPoly->Add( bSizer8, 1, wxEXPAND, 5 ); + bSizerArcToPoly->Add( m_stCircleToPolyWarning, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); sbFeatureRules->Add( bSizerArcToPoly, 0, wxEXPAND|wxTOP, 5 ); @@ -102,7 +90,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi m_bSizerPolygonFillOption = new wxBoxSizer( wxVERTICAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_bSizerPolygonFillOption->Add( m_staticline1, 0, wxEXPAND | wxALL, 2 ); + m_bSizerPolygonFillOption->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 15 ); m_stZoneFilledPolysOpt = new wxStaticText( this, wxID_ANY, _("Zone fill strategy"), wxDefaultPosition, wxDefaultSize, 0 ); m_stZoneFilledPolysOpt->Wrap( -1 ); @@ -128,7 +116,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi m_rbOutlinePolygonFastest->SetValue( true ); m_rbOutlinePolygonFastest->SetToolTip( _("Better performance, exact export fidelity, and more complete filling near higher-priority zones.") ); - bSizerOutlinesOpts->Add( m_rbOutlinePolygonFastest, 0, wxALL, 4 ); + bSizerOutlinesOpts->Add( m_rbOutlinePolygonFastest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 4 ); bSizer5->Add( bSizerOutlinesOpts, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp index 5ec009062c..069bf42d55 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp @@ -386,16 +386,6 @@ - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 5 - protected - 0 - - 5 wxEXPAND|wxTOP @@ -406,8 +396,8 @@ wxVERTICAL none - 2 - wxEXPAND | wxALL + 15 + wxEXPAND|wxTOP|wxBOTTOM 0 1 @@ -582,7 +572,7 @@ 0 0 wxID_ANY - Maximum deviation: + Max allowed deviation: 0 0 @@ -740,132 +730,63 @@ 5 - wxEXPAND - 1 - + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,-1,70,0 + 0 + 0 + wxID_ANY + Note: zone filling can be slow when < %s. + 0 + + 0 + + + 0 - bSizer8 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Art Provider; wxART_INFORMATION; wxART_OTHER - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_bitmapInfo - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,-1,70,0 - 0 - 0 - wxID_ANY - Value < %s can be time consuming when filling zones. - 0 - - 0 - - - 0 - - 1 - m_stCircleToPolyWarning - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - + 1 + m_stCircleToPolyWarning + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 @@ -880,8 +801,8 @@ wxVERTICAL protected - 2 - wxEXPAND | wxALL + 15 + wxEXPAND|wxTOP|wxBOTTOM 0 1 @@ -1141,7 +1062,7 @@ 4 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.h b/pcbnew/dialogs/panel_setup_feature_constraints_base.h index 82a0bd03f9..1e0a49a5c2 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.h +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.h @@ -48,7 +48,6 @@ class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE : public wxPanel wxStaticText* m_maxErrorTitle; wxTextCtrl* m_maxErrorCtrl; wxStaticText* m_maxErrorUnits; - wxStaticBitmap* m_bitmapInfo; wxStaticText* m_stCircleToPolyWarning; wxBoxSizer* m_bSizerPolygonFillOption; wxStaticLine* m_staticline1;