From f5c7455901bd6101ed249e65b718206108c3cd2c Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 7 Aug 2023 13:37:40 +0100 Subject: [PATCH] Better spacing for page settings. --- common/dialogs/dialog_page_settings_base.cpp | 30 ++++++--- common/dialogs/dialog_page_settings_base.fbp | 66 ++++++++++++++++---- 2 files changed, 74 insertions(+), 22 deletions(-) diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp index e794de0f1c..afe640cae5 100644 --- a/common/dialogs/dialog_page_settings_base.cpp +++ b/common/dialogs/dialog_page_settings_base.cpp @@ -26,10 +26,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_staticTextPaper = new wxStaticText( this, wxID_ANY, _("Paper"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPaper->Wrap( -1 ); - bleftSizer->Add( m_staticTextPaper, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); + bleftSizer->Add( m_staticTextPaper, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bleftSizer->Add( m_staticline2, 0, wxEXPAND, 5 ); + bleftSizer->Add( m_staticline2, 0, wxEXPAND|wxTOP, 1 ); + + + bleftSizer->Add( 0, 10, 0, wxEXPAND, 5 ); m_staticTextSize = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSize->Wrap( -1 ); @@ -119,10 +122,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_staticTextPreview = new wxStaticText( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPreview->Wrap( -1 ); - bleftSizer->Add( m_staticTextPreview, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); + bleftSizer->Add( m_staticTextPreview, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline31 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bleftSizer->Add( m_staticline31, 0, wxEXPAND|wxBOTTOM, 10 ); + bleftSizer->Add( m_staticline31, 0, wxEXPAND|wxTOP, 1 ); + + + bleftSizer->Add( 0, 12, 0, wxEXPAND, 5 ); m_PageLayoutExampleBitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxFULL_REPAINT_ON_RESIZE|wxBORDER_SIMPLE ); m_PageLayoutExampleBitmap->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -134,17 +140,20 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind bUpperSizerH->Add( bleftSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bUpperSizerH->Add( 10, 0, 0, wxEXPAND, 5 ); + bUpperSizerH->Add( 15, 0, 0, wxEXPAND, 5 ); wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); m_staticTextDrawingSheet = new wxStaticText( this, wxID_ANY, _("Drawing Sheet"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDrawingSheet->Wrap( -1 ); - bSizerRight->Add( m_staticTextDrawingSheet, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerRight->Add( m_staticTextDrawingSheet, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerRight->Add( m_staticline4, 0, wxEXPAND, 5 ); + bSizerRight->Add( m_staticline4, 0, wxEXPAND|wxTOP, 1 ); + + + bSizerRight->Add( 0, 10, 0, wxEXPAND, 5 ); wxBoxSizer* bSizerFilename; bSizerFilename = new wxBoxSizer( wxVERTICAL ); @@ -173,10 +182,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_staticTextTitleBlock = new wxStaticText( this, wxID_ANY, _("Title Block Parameters"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTitleBlock->Wrap( -1 ); - bSizerRight->Add( m_staticTextTitleBlock, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerRight->Add( m_staticTextTitleBlock, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerRight->Add( m_staticline3, 0, wxEXPAND, 5 ); + bSizerRight->Add( m_staticline3, 0, wxEXPAND|wxTOP, 1 ); + + + bSizerRight->Add( 0, 10, 0, wxEXPAND, 5 ); wxBoxSizer* SheetInfoSizer; SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index 2c9c282c13..29d09e9c37 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -81,7 +81,7 @@ none 5 - wxALIGN_CENTER_HORIZONTAL|wxALL + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -141,8 +141,8 @@ - 5 - wxEXPAND + 1 + wxEXPAND|wxTOP 0 1 @@ -198,6 +198,16 @@ + + 5 + wxEXPAND + 0 + + 10 + protected + 0 + + 5 wxTOP|wxRIGHT|wxLEFT @@ -999,7 +1009,7 @@ 5 - wxALIGN_CENTER_HORIZONTAL|wxALL + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1059,8 +1069,8 @@ - 10 - wxEXPAND|wxBOTTOM + 1 + wxEXPAND|wxTOP 0 1 @@ -1116,6 +1126,16 @@ + + 5 + wxEXPAND + 0 + + 12 + protected + 0 + + 5 wxALL|wxEXPAND @@ -1183,7 +1203,7 @@ 0 protected - 10 + 15 @@ -1197,7 +1217,7 @@ none 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1257,8 +1277,8 @@ - 5 - wxEXPAND + 1 + wxEXPAND|wxTOP 0 1 @@ -1314,6 +1334,16 @@ + + 5 + wxEXPAND + 0 + + 10 + protected + 0 + + 5 wxEXPAND|wxALL @@ -1547,7 +1577,7 @@ 5 - wxALL|wxALIGN_CENTER_HORIZONTAL + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -1607,8 +1637,8 @@ - 5 - wxEXPAND + 1 + wxEXPAND|wxTOP 0 1 @@ -1664,6 +1694,16 @@ + + 5 + wxEXPAND + 0 + + 10 + protected + 0 + + 5 wxLEFT