From 3a74e5253ba1e583ae4edaf7cc0b89f077ce85ff Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Fri, 22 Dec 2017 17:34:03 -0500 Subject: [PATCH] Environment variable dialog fixes. Remove redundant sizers from environment variable dialog. Improve sizers and layout spacing of environment variable and environ- ment variable edit dialogs. Remove path from dialog box titles since environment variables are not limited to file paths. Improved help messages for both environment variable and environment variable edit dialogs. Restore highlighting of externally defined environment variables. --- common/dialogs/dialog_env_var_config.cpp | 50 +- common/dialogs/dialog_env_var_config_base.cpp | 56 +- common/dialogs/dialog_env_var_config_base.fbp | 818 +++++++++--------- common/dialogs/dialog_env_var_config_base.h | 11 +- 4 files changed, 453 insertions(+), 482 deletions(-) diff --git a/common/dialogs/dialog_env_var_config.cpp b/common/dialogs/dialog_env_var_config.cpp index 5b4eb39b62..32659d1e41 100644 --- a/common/dialogs/dialog_env_var_config.cpp +++ b/common/dialogs/dialog_env_var_config.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 2015-2017 Wayne Stambaugh + * Copyright (C) 2015 Wayne Stambaugh * Copyright (C) 2015-2017 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -129,8 +129,8 @@ void DIALOG_ENV_VAR_CONFIG::PopulatePathList() m_pathList->ClearAll(); - m_pathList->AppendColumn( _( "Name" ) ); - m_pathList->AppendColumn( _( "Path" ) ); + m_pathList->AppendColumn( _( "Name:" ) ); + m_pathList->AppendColumn( _( "Path:" ) ); int row = 0; @@ -140,7 +140,12 @@ void DIALOG_ENV_VAR_CONFIG::PopulatePathList() m_pathList->SetItem( index, 1, it->second.GetValue() ); - //TODO - Indicate via background colour if the path is defined external to KiCad + if( it->second.GetDefinedExternally() ) + { + wxColour color = wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ); + + m_pathList->SetItemBackgroundColour( index, color ); + } row++; } @@ -154,7 +159,8 @@ void DIALOG_ENV_VAR_CONFIG::PopulatePathList() } -bool DIALOG_ENV_VAR_CONFIG::GetPathAtIndex( unsigned int aIndex, wxString& aEnvVar, wxString& aEnvPath ) +bool DIALOG_ENV_VAR_CONFIG::GetPathAtIndex( unsigned int aIndex, wxString& aEnvVar, + wxString& aEnvPath ) { if( aIndex > m_envVarMap.size() ) { @@ -180,7 +186,6 @@ bool DIALOG_ENV_VAR_CONFIG::GetPathAtIndex( unsigned int aIndex, wxString& aEnvV } - void DIALOG_ENV_VAR_CONFIG::OnAddButton( wxCommandEvent& event ) { DIALOG_ENV_VAR_SINGLE dlg( this, wxEmptyString, wxEmptyString ); @@ -194,7 +199,7 @@ void DIALOG_ENV_VAR_CONFIG::OnAddButton( wxCommandEvent& event ) if( m_envVarMap.count( newName ) > 0 ) { //TODO - Improve this message, use DisplayErrorMessage instead - DisplayError( this, _( "Path already exists" ) ); + DisplayError( this, _( "Path already exists." ) ); } else { @@ -248,8 +253,9 @@ void DIALOG_ENV_VAR_CONFIG::EditSelectedEntry() if( IsEnvVarImmutable( envName ) ) { DisplayErrorMessage( this, - wxString::Format( _( "Environment variable \"%s\" cannot be renamed" ), - envName.ToStdString() ), + wxString::Format( _( "Environment variable \"%s\" cannot " + "be renamed." ), + envName.ToStdString() ), _( "The selected environment variable name " "is required for KiCad functionality and " "can not be renamed." ) ); @@ -276,7 +282,7 @@ void DIALOG_ENV_VAR_CONFIG::EditSelectedEntry() void DIALOG_ENV_VAR_CONFIG::OnHelpButton( wxCommandEvent& event ) { - wxString msg = _( "Enter the name and path for each environment variable. Grey entries " + wxString msg = _( "Enter the name and value for each environment variable. Grey entries " "are names that have been defined externally at the system or user " "level. Environment variables defined at the system or user level " "take precedence over the ones defined in this table. This means the " @@ -288,7 +294,7 @@ void DIALOG_ENV_VAR_CONFIG::OnHelpButton( wxCommandEvent& event ) msg << _( "KICAD_SYMBOL_DIR is the base path of the locally installed symbol libraries." ); msg << wxT( "

" ); msg << _( "KIGITHUB is used by KiCad to define the URL of the repository " - "of the official KiCad libraries." ); + "of the official KiCad footprint libraries." ); msg << wxT( "

" ); msg << _( "KISYS3DMOD is the base path of system footprint 3D " "shapes (.3Dshapes folders)." ); @@ -407,7 +413,7 @@ DIALOG_ENV_VAR_SINGLE::DIALOG_ENV_VAR_SINGLE( wxWindow* parent, void DIALOG_ENV_VAR_SINGLE::OnSelectPath( wxCommandEvent& event ) { - wxString title = _( "Set path for environment variable" ); + wxString title = _( "Select Path for Environment Variable" ); wxString path; // Currently the first opened path is not initialized wxDirDialog dlg( nullptr, title, path, wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST ); @@ -441,7 +447,7 @@ bool DIALOG_ENV_VAR_SINGLE::TransferDataFromWindow() // Name cannot start with a number if( name.Left( 1 ).IsNumber() ) { - DisplayError( this, _( "Environment variable name cannot start with a digit (0-9)." ) ); + DisplayError( this, _( "Environment variable names cannot start with a digit (0-9)." ) ); // Veto: return false; } @@ -453,16 +459,18 @@ bool DIALOG_ENV_VAR_SINGLE::TransferDataFromWindow() void DIALOG_ENV_VAR_SINGLE::onHelpClick( wxCommandEvent& event ) { - wxString msg = _( "An environment variable is as an equivalence of a string.
" - "It is used mainly in paths to make them portable between installs

" - "For instance, if an environment variable is defined as
" - "MYLIBPATH with a value like e:/kicad_libs, " - "if a library name is
${MYLIBPATH}/mylib.lib, the actual path is" - "
e:/kicad_libs/mylib.lib" + wxString msg = _( "An environment variable is used for string substitutions.
" + "Environment variables are primarily used for paths to make KiCad portable " + "between platforms.

" + "If an environment variable is defined as MYLIBPATH with a " + "value e:/kicad_libs, then a library name " + "${MYLIBPATH}/mylib.lib gets expanded to " + "e:/kicad_libs/mylib.lib" "

" "Note:
" - "Only chars ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_ are allowed in environment variable names
" - "and the environment variable name cannot start with a digit (0-9)" + "Only characters ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_ are " + "allowed in environment variable names and the environment variable name " + "cannot start with a digit (0-9)." ); DisplayHtmlInfoMessage( GetParent(), _( "Environment Variable Help" ), msg ); diff --git a/common/dialogs/dialog_env_var_config_base.cpp b/common/dialogs/dialog_env_var_config_base.cpp index 9b64453aaa..549f30379f 100644 --- a/common/dialogs/dialog_env_var_config_base.cpp +++ b/common/dialogs/dialog_env_var_config_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_env_var_config_base.h" @@ -16,35 +16,29 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind wxBoxSizer* mainSizer; mainSizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("KiCad Environment Paths") ), wxVERTICAL ); - wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxHORIZONTAL ); - m_pathList = new wxListCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); + m_pathList = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); bSizer7->Add( m_pathList, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); - m_addPathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_ADD_PATH, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); + m_addPathButton = new wxButton( this, ID_BUTTON_ADD_PATH, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); m_addPathButton->SetToolTip( _("Add path prefix") ); bSizer6->Add( m_addPathButton, 0, wxALL, 5 ); - m_editPathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_EDIT_PATH, _("Edit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_editPathButton = new wxButton( this, ID_BUTTON_EDIT_PATH, _("Edit"), wxDefaultPosition, wxDefaultSize, 0 ); m_editPathButton->SetToolTip( _("Edit selected path prefix") ); - bSizer6->Add( m_editPathButton, 0, wxALL, 5 ); + bSizer6->Add( m_editPathButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_deletePathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_DELETE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); + m_deletePathButton = new wxButton( this, ID_BUTTON_DELETE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); m_deletePathButton->SetToolTip( _("Remove selected path prefix") ); - bSizer6->Add( m_deletePathButton, 0, wxALL, 5 ); + bSizer6->Add( m_deletePathButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -53,13 +47,7 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind bSizer7->Add( bSizer6, 0, wxEXPAND, 5 ); - sbSizer2->Add( bSizer7, 1, wxEXPAND, 5 ); - - - bSizer5->Add( sbSizer2, 1, wxEXPAND, 5 ); - - - mainSizer->Add( bSizer5, 1, wxEXPAND, 5 ); + mainSizer->Add( bSizer7, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); mainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -73,11 +61,12 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind m_sdbSizer->AddButton( m_sdbSizerHelp ); m_sdbSizer->Realize(); - mainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); + mainSizer->Add( m_sdbSizer, 0, wxBOTTOM|wxEXPAND, 5 ); this->SetSizer( mainSizer ); this->Layout(); + mainSizer->Fit( this ); this->Centre( wxBOTH ); @@ -115,34 +104,36 @@ DIALOG_ENV_VAR_SINGLE_BASE::DIALOG_ENV_VAR_SINGLE_BASE( wxWindow* parent, wxWind fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_envVarNameLabel = new wxStaticText( this, wxID_ANY, _("Name"), wxDefaultPosition, wxDefaultSize, 0 ); + m_envVarNameLabel = new wxStaticText( this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_envVarNameLabel->Wrap( -1 ); - fgSizer1->Add( m_envVarNameLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_envVarNameLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_envVarName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_envVarName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_envVarName, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); m_buttonHelp = new wxButton( this, wxID_ANY, _("Help"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_buttonHelp, 0, wxALL, 5 ); - m_envVarPathLabel = new wxStaticText( this, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_envVarPathLabel = new wxStaticText( this, wxID_ANY, _("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_envVarPathLabel->Wrap( -1 ); - fgSizer1->Add( m_envVarPathLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_envVarPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_envVarPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_envVarPath, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + m_envVarPath->SetMinSize( wxSize( 250,-1 ) ); + + fgSizer1->Add( m_envVarPath, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_selectPathButton = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_selectPathButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_selectPathButton, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - bSizerMain->Add( fgSizer1, 0, wxEXPAND, 5 ); + bSizerMain->Add( fgSizer1, 0, wxALL|wxEXPAND, 5 ); bSizerMain->Add( 0, 0, 1, wxEXPAND, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); + bSizerMain->Add( m_staticline2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_sdbSizer2 = new wxStdDialogButtonSizer(); m_sdbSizer2OK = new wxButton( this, wxID_OK ); @@ -151,11 +142,12 @@ DIALOG_ENV_VAR_SINGLE_BASE::DIALOG_ENV_VAR_SINGLE_BASE( wxWindow* parent, wxWind m_sdbSizer2->AddButton( m_sdbSizer2Cancel ); m_sdbSizer2->Realize(); - bSizerMain->Add( m_sdbSizer2, 0, wxALIGN_RIGHT, 5 ); + bSizerMain->Add( m_sdbSizer2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/common/dialogs/dialog_env_var_config_base.fbp b/common/dialogs/dialog_env_var_config_base.fbp index acc139b067..0f7933c0b7 100644 --- a/common/dialogs/dialog_env_var_config_base.fbp +++ b/common/dialogs/dialog_env_var_config_base.fbp @@ -44,10 +44,10 @@ DIALOG_ENV_VAR_CONFIG_BASE - 582,283 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Path Configuration + Environment Variable Configuration @@ -99,421 +99,395 @@ 1 - bSizer5 - wxVERTICAL + bSizer7 + wxHORIZONTAL none - + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_pathList + 1 + + + protected + 1 + + Resizable + 1 + + wxLC_HRULES|wxLC_REPORT|wxLC_VRULES + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPathActivated + + + + + OnPathSelected + + + + + + + + + + + + + + + + + 5 wxEXPAND - 1 - - wxID_ANY - KiCad Environment Paths + 0 + - sbSizer2 + bSizer6 wxVERTICAL - 1 none - - + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_BUTTON_ADD_PATH + Add + + 0 + + + 0 + + 1 + m_addPathButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Add path prefix + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddButton + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_BUTTON_EDIT_PATH + Edit + + 0 + + + 0 + + 1 + m_editPathButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Edit selected path prefix + + wxFILTER_NONE + wxDefaultValidator + + + + + OnEditButton + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_BUTTON_DELETE_PATH + Remove + + 0 + + + 0 + + 1 + m_deletePathButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Remove selected path prefix + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveButton + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND 1 - - - bSizer7 - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_pathList - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPathActivated - - - - - OnPathSelected - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer6 - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_BUTTON_ADD_PATH - Add - - 0 - - - 0 - - 1 - m_addPathButton - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Add path prefix - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddButton - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_BUTTON_EDIT_PATH - Edit - - 0 - - - 0 - - 1 - m_editPathButton - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Edit selected path prefix - - wxFILTER_NONE - wxDefaultValidator - - - - - OnEditButton - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_BUTTON_DELETE_PATH - Remove - - 0 - - - 0 - - 1 - m_deletePathButton - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Remove selected path prefix - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveButton - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - + + 0 + protected + 0 @@ -603,7 +577,7 @@ 5 - wxALL|wxALIGN_RIGHT + wxBOTTOM|wxEXPAND 0 0 @@ -647,10 +621,10 @@ DIALOG_ENV_VAR_SINGLE_BASE - 439,141 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Edit Environment Value Variable + Edit Environment Variable @@ -698,7 +672,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 0 3 @@ -714,7 +688,7 @@ 0 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -744,7 +718,7 @@ 0 0 wxID_ANY - Name + Name: 0 @@ -797,7 +771,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -976,7 +950,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -1006,7 +980,7 @@ 0 0 wxID_ANY - Value + Value: 0 @@ -1059,7 +1033,7 @@ 5 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1095,7 +1069,7 @@ 0 - + 250,-1 1 m_envVarPath 1 @@ -1150,7 +1124,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -1250,7 +1224,7 @@ 5 - wxEXPAND | wxALL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1331,7 +1305,7 @@ 5 - wxALIGN_RIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 0 diff --git a/common/dialogs/dialog_env_var_config_base.h b/common/dialogs/dialog_env_var_config_base.h index 6f8700b565..c8e67a74a9 100644 --- a/common/dialogs/dialog_env_var_config_base.h +++ b/common/dialogs/dialog_env_var_config_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_ENV_VAR_CONFIG_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -22,7 +20,6 @@ class DIALOG_SHIM; #include #include #include -#include #include #include #include @@ -63,7 +60,7 @@ class DIALOG_ENV_VAR_CONFIG_BASE : public DIALOG_SHIM public: - DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Path Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 582,283 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Environment Variable Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ENV_VAR_CONFIG_BASE(); }; @@ -94,7 +91,7 @@ class DIALOG_ENV_VAR_SINGLE_BASE : public DIALOG_SHIM public: - DIALOG_ENV_VAR_SINGLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Environment Value Variable"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 439,141 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_ENV_VAR_SINGLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Environment Variable"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ENV_VAR_SINGLE_BASE(); };