From 49dcd5f4fcca69ee8a98052cc4ee3af6a117da62 Mon Sep 17 00:00:00 2001 From: Alex Shvartzkop Date: Thu, 11 Apr 2024 00:48:48 +0300 Subject: [PATCH] Fix default cell alignment and FBP file for Configure Paths dialog. --- .../dialogs/dialog_configure_paths_base.cpp | 4 +- .../dialogs/dialog_configure_paths_base.fbp | 464 ++++++++---------- 2 files changed, 212 insertions(+), 256 deletions(-) diff --git a/common/dialogs/dialog_configure_paths_base.cpp b/common/dialogs/dialog_configure_paths_base.cpp index 282c6c77cc..4da4409291 100644 --- a/common/dialogs/dialog_configure_paths_base.cpp +++ b/common/dialogs/dialog_configure_paths_base.cpp @@ -49,7 +49,7 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi // Label Appearance // Cell Defaults - m_EnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); + m_EnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_EnvVars->SetMinSize( wxSize( 604,170 ) ); sbEnvVars->Add( m_EnvVars, 1, wxALL|wxEXPAND, 5 ); @@ -70,7 +70,7 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi sbEnvVars->Add( bSizerEnvVarBtns, 0, wxEXPAND, 5 ); - bSizerMain->Add( sbEnvVars, 1, wxEXPAND|wxALL, 5 ); + bSizerMain->Add( sbEnvVars, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/common/dialogs/dialog_configure_paths_base.fbp b/common/dialogs/dialog_configure_paths_base.fbp index 197ce7391a..1ab415c75d 100644 --- a/common/dialogs/dialog_configure_paths_base.fbp +++ b/common/dialogs/dialog_configure_paths_base.fbp @@ -62,109 +62,23 @@ bSizerMain wxVERTICAL none - - 10 - wxEXPAND|wxTOP - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - wxGRID_AUTOSIZE - "Environment Variables" "Path" "" - wxALIGN_CENTER - 2 - 150,454 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 1 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - 604,170 - 1 - m_EnvVars - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnGridSize - - 5 - wxEXPAND|wxTOP - 0 - + wxALL|wxEXPAND + 1 + + wxID_ANY + Environment Variables - bSizerEnvVarBtns - wxHORIZONTAL + sbEnvVars + wxVERTICAL + 1 none 5 - wxBOTTOM|wxLEFT - 0 - + wxALL|wxEXPAND + 1 + 1 1 1 @@ -173,209 +87,251 @@ - 0 + 0 + 0 - 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER 0 1 + wxALIGN_CENTER + wxGRID_AUTOSIZE + "Name" "Path" + wxALIGN_CENTER + 2 + 150,454 1 - - 0 0 - Dock 0 Left + 0 + 1 + 0 + 1 + 1 1 1 - + + 1 0 0 wxID_ANY - Add Environment Variable - - 0 + + + + 0 + 0 0 0 - -1,-1 + 604,170 1 - m_btnAddEnvVar + m_EnvVars 1 protected 1 - - Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 1 - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - OnAddEnvVar + OnGridSize 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 0 - - 0 - protected - 0 + + + bSizerEnvVarBtns + wxHORIZONTAL + none + + 5 + wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Environment Variable + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_btnAddEnvVar + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddEnvVar + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 0 + protected + 0 + + + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete Environment Variable + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_btnDeleteEnvVar + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveEnvVar + + - - 5 - wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete Environment Variable - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_btnDeleteEnvVar - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveEnvVar - - - - - - 5 - wxEXPAND|wxTOP - 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 - - - -