From 8d0b2dcfd31de2fc9ad602362abf6b97afa44526 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sat, 2 May 2020 16:48:39 -0400 Subject: [PATCH] Fix path configuration dialog control padding. --- .../dialogs/dialog_configure_paths_base.cpp | 138 +++++++++--------- .../dialogs/dialog_configure_paths_base.fbp | 16 +- common/dialogs/dialog_configure_paths_base.h | 22 ++- 3 files changed, 87 insertions(+), 89 deletions(-) diff --git a/common/dialogs/dialog_configure_paths_base.cpp b/common/dialogs/dialog_configure_paths_base.cpp index 9db7c631b9..d30e66eb00 100644 --- a/common/dialogs/dialog_configure_paths_base.cpp +++ b/common/dialogs/dialog_configure_paths_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,22 +14,22 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); - + wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbEnvVars; sbEnvVars = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Environment Variables") ), wxVERTICAL ); - + m_EnvVars = new WX_GRID( sbEnvVars->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_EnvVars->CreateGrid( 1, 2 ); m_EnvVars->EnableEditing( true ); m_EnvVars->EnableGridLines( true ); m_EnvVars->EnableDragGridSize( false ); m_EnvVars->SetMargins( 0, 0 ); - + // Columns m_EnvVars->SetColSize( 0, 150 ); m_EnvVars->SetColSize( 1, 454 ); @@ -38,54 +38,54 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi m_EnvVars->SetColLabelSize( 22 ); m_EnvVars->SetColLabelValue( 0, _("Name") ); m_EnvVars->SetColLabelValue( 1, _("Path") ); - m_EnvVars->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_EnvVars->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_EnvVars->EnableDragRowSize( true ); m_EnvVars->SetRowLabelSize( 0 ); - m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_EnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_EnvVars->SetMinSize( wxSize( 604,170 ) ); - - sbEnvVars->Add( m_EnvVars, 1, wxEXPAND|wxBOTTOM, 5 ); - + + sbEnvVars->Add( m_EnvVars, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizerEnvVarBtns; bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); - - m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) ); - - bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxRIGHT, 5 ); - - + + bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxBOTTOM|wxLEFT, 5 ); + + bSizerEnvVarBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) ); - - bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxRIGHT|wxLEFT, 5 ); - - + + bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxBOTTOM, 5 ); + + sbEnvVars->Add( bSizerEnvVarBtns, 0, wxEXPAND, 5 ); - - + + bSizerMain->Add( sbEnvVars, 1, wxEXPAND|wxALL, 5 ); - + m_sb3DSearchPaths = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("3D Search Paths") ), wxVERTICAL ); - + m_SearchPaths = new WX_GRID( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_SearchPaths->CreateGrid( 1, 3 ); m_SearchPaths->EnableEditing( true ); m_SearchPaths->EnableGridLines( true ); m_SearchPaths->EnableDragGridSize( false ); m_SearchPaths->SetMargins( 0, 0 ); - + // Columns m_SearchPaths->SetColSize( 0, 150 ); m_SearchPaths->SetColSize( 1, 300 ); @@ -96,54 +96,54 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi m_SearchPaths->SetColLabelValue( 0, _("Alias") ); m_SearchPaths->SetColLabelValue( 1, _("Path") ); m_SearchPaths->SetColLabelValue( 2, _("Description") ); - m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_SearchPaths->AutoSizeRows(); m_SearchPaths->EnableDragRowSize( false ); m_SearchPaths->SetRowLabelSize( 0 ); - m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_SearchPaths->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_SearchPaths->SetMinSize( wxSize( 604,150 ) ); - - m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxEXPAND|wxBOTTOM, 5 ); - + + m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizerSearchPathBtns; bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL ); - - m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) ); - - bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxRIGHT, 5 ); - - m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnMoveUp->SetMinSize( wxSize( 30,29 ) ); - - bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxRIGHT, 5 ); - - m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxBOTTOM|wxRIGHT, 5 ); + + m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnMoveDown->SetMinSize( wxSize( 30,29 ) ); - - bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxRIGHT, 5 ); - - + + bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxBOTTOM|wxRIGHT, 5 ); + + bSizerSearchPathBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + + m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) ); - - bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxRIGHT|wxLEFT, 5 ); - - + + bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxBOTTOM|wxRIGHT, 5 ); + + m_sb3DSearchPaths->Add( bSizerSearchPathBtns, 0, wxEXPAND, 5 ); - - + + bSizerMain->Add( m_sb3DSearchPaths, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); @@ -152,16 +152,16 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi m_sdbSizerHelp = new wxButton( this, wxID_HELP ); m_sdbSizer->AddButton( m_sdbSizerHelp ); m_sdbSizer->Realize(); - + bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); bSizerMain->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnUpdateUI ) ); m_EnvVars->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnGridCellChange ), NULL, this ); @@ -192,5 +192,5 @@ DIALOG_CONFIGURE_PATHS_BASE::~DIALOG_CONFIGURE_PATHS_BASE() m_btnMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnSearchPathMoveDown ), NULL, this ); m_btnDeleteSearchPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnDeleteSearchPath ), NULL, this ); m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnHelp ), NULL, this ); - + } diff --git a/common/dialogs/dialog_configure_paths_base.fbp b/common/dialogs/dialog_configure_paths_base.fbp index c56d63329c..5b682670b0 100644 --- a/common/dialogs/dialog_configure_paths_base.fbp +++ b/common/dialogs/dialog_configure_paths_base.fbp @@ -73,7 +73,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 1 @@ -172,7 +172,7 @@ none 5 - wxRIGHT + wxBOTTOM|wxLEFT 0 1 @@ -255,7 +255,7 @@ 5 - wxRIGHT|wxLEFT + wxBOTTOM 0 1 @@ -344,7 +344,7 @@ protected 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 1 @@ -443,7 +443,7 @@ none 5 - wxRIGHT + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -516,7 +516,7 @@ 5 - wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -589,7 +589,7 @@ 5 - wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -672,7 +672,7 @@ 5 - wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT 0 1 diff --git a/common/dialogs/dialog_configure_paths_base.h b/common/dialogs/dialog_configure_paths_base.h index 86e610e985..1dbdbef246 100644 --- a/common/dialogs/dialog_configure_paths_base.h +++ b/common/dialogs/dialog_configure_paths_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_CONFIGURE_PATHS_BASE_H__ -#define __DIALOG_CONFIGURE_PATHS_BASE_H__ +#pragma once #include #include @@ -20,10 +19,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include @@ -38,7 +37,7 @@ class WX_GRID; class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM { private: - + protected: WX_GRID* m_EnvVars; wxBitmapButton* m_btnAddEnvVar; @@ -53,7 +52,7 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; wxButton* m_sdbSizerHelp; - + // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnGridCellChange( wxGridEvent& event ) { event.Skip(); } @@ -66,13 +65,12 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM virtual void OnSearchPathMoveDown( wxCommandEvent& event ) { event.Skip(); } virtual void OnDeleteSearchPath( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_CONFIGURE_PATHS_BASE(); - + }; -#endif //__DIALOG_CONFIGURE_PATHS_BASE_H__