kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #31098
[PATCH] UX for ENV_VAR editor
Attached is a patch which improves UX for the ENV_VAR editor dialog
* Adds ability to select path with file chooser
* General cleanup
* Removal of that sinking feeling you get when interacting with a clunky UI
Oliver
From 51c9cb8aa6b8530efa07d5aa4aa413d1fdc588dc Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@xxxxxxxxx>
Date: Sat, 7 Oct 2017 00:57:23 +1100
Subject: [PATCH] Updated ENV_VAR config dialog
- Better UX for main dialog
- Each entry is edited in separate dialog
- Ability to select file path
---
common/CMakeLists.txt | 2 +
common/dialogs/dialog_env_var_config.cpp | 374 +++++++------
common/dialogs/dialog_env_var_config_base.cpp | 83 ++-
common/dialogs/dialog_env_var_config_base.fbp | 735 ++++++++++++++------------
common/dialogs/dialog_env_var_config_base.h | 32 +-
common/dialogs/dialog_env_var_single.cpp | 122 +++++
common/dialogs/dialog_env_var_single.h | 47 ++
common/dialogs/dialog_env_var_single_base.cpp | 82 +++
common/dialogs/dialog_env_var_single_base.fbp | 685 ++++++++++++++++++++++++
common/dialogs/dialog_env_var_single_base.h | 65 +++
include/dialog_env_var_config.h | 46 +-
11 files changed, 1733 insertions(+), 540 deletions(-)
create mode 100644 common/dialogs/dialog_env_var_single.cpp
create mode 100644 common/dialogs/dialog_env_var_single.h
create mode 100644 common/dialogs/dialog_env_var_single_base.cpp
create mode 100644 common/dialogs/dialog_env_var_single_base.fbp
create mode 100644 common/dialogs/dialog_env_var_single_base.h
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 93d4692..d4c58cc 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -162,6 +162,8 @@ set( COMMON_DLG_SRCS
dialogs/dialog_page_settings_base.cpp
dialogs/dialog_env_var_config_base.cpp
dialogs/dialog_env_var_config.cpp
+ dialogs/dialog_env_var_single_base.cpp
+ dialogs/dialog_env_var_single.cpp
dialogs/wx_html_report_panel_base.cpp
dialogs/wx_html_report_panel.cpp
)
diff --git a/common/dialogs/dialog_env_var_config.cpp b/common/dialogs/dialog_env_var_config.cpp
index 0f0a2c6..64c7389 100644
--- a/common/dialogs/dialog_env_var_config.cpp
+++ b/common/dialogs/dialog_env_var_config.cpp
@@ -27,6 +27,9 @@
*/
#include <dialog_env_var_config.h>
+#include <dialog_env_var_single.h>
+
+#include <confirm.h>
#include <validators.h>
#include <html_messagebox.h>
@@ -37,23 +40,8 @@
DIALOG_ENV_VAR_CONFIG::DIALOG_ENV_VAR_CONFIG( wxWindow* aParent, const ENV_VAR_MAP& aEnvVarMap ) :
DIALOG_ENV_VAR_CONFIG_BASE( aParent )
{
- m_extDefsChanged = false;
+ // Copy environment variables across
m_envVarMap = aEnvVarMap;
-
- m_grid->AppendRows( (int) m_envVarMap.size() );
-
- for( size_t row = 0; row < m_envVarMap.size(); row++ )
- {
- wxGridCellTextEditor* editor = new wxGridCellTextEditor;
- ENVIRONMENT_VARIABLE_CHAR_VALIDATOR envVarValidator;
- editor->SetValidator( envVarValidator );
- m_grid->SetCellEditor( (int) row, 0, editor );
-
- editor = new wxGridCellTextEditor;
- FILE_NAME_WITH_PATH_CHAR_VALIDATOR pathValidator;
- editor->SetValidator( pathValidator );
- m_grid->SetCellEditor( (int) row, 1, editor );
- }
}
@@ -64,26 +52,24 @@ bool DIALOG_ENV_VAR_CONFIG::TransferDataToWindow()
if( !wxDialog::TransferDataToWindow() )
return false;
- long row = 0L;
+ //TODO
+ /*
+ // Grab the project path var (not editable)
+ wxString prjPath;
- for( ENV_VAR_MAP_ITER it = m_envVarMap.begin(); it != m_envVarMap.end(); ++it )
- {
- m_grid->SetCellValue( row, 0, it->first );
- m_grid->SetCellValue( row, 1, it->second.GetValue() );
+ wxGetEnv( PROJECT_VAR_NAME, &prjPath );
- // Highlight environment variables that are externally defined.
- if( it->second.GetDefinedExternally() )
- {
- wxGridCellAttr* attr = m_grid->GetOrCreateCellAttr( row, 0 );
- attr->SetBackgroundColour( *wxLIGHT_GREY );
- m_grid->SetRowAttr( row, attr );
- }
+ m_kiprjmod->SetLabel( prjPath );
+ */
- row++;
- }
+ //TODO - Call SetAlternateRowColour first to prevent assertion error
+ //m_pathList->EnableAlternateRowColours( true );
+
+ PopulatePathList();
+
+ // Select the first item in the list
+ SelectListIndex( 0 );
- m_grid->AutoSizeColumns();
- m_grid->AutoSizeRows();
GetSizer()->Layout();
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
@@ -95,162 +81,169 @@ bool DIALOG_ENV_VAR_CONFIG::TransferDataToWindow()
bool DIALOG_ENV_VAR_CONFIG::TransferDataFromWindow()
{
if( !wxDialog::TransferDataFromWindow() )
+ {
return false;
+ }
- int row;
- wxArrayString envVarNames;
+ Pgm().SetLocalEnvVariables( m_envVarMap );
- for( row = 0; row < m_grid->GetNumberRows(); row++ )
- {
- wxString caption = _( "Invalid Input" );
- wxString name = m_grid->GetCellValue( row, 0 );
- wxString value = m_grid->GetCellValue( row, 1 );
+ return true;
+}
- // Ignore completely empty rows.
- if( name.IsEmpty() && value.IsEmpty() )
- continue;
- wxLogDebug( wxT( "Row %d, name: %s, value %s." ), row,
- GetChars( name ), GetChars( value ) );
+void DIALOG_ENV_VAR_CONFIG::PopulatePathList()
+{
+ m_pathList->Freeze();
- // Name cannot be empty.
- if( name.IsEmpty() )
- {
- wxMessageBox( _( "Environment variable name cannot be empty." ),
- caption, wxOK | wxICON_ERROR, this );
- m_grid->GoToCell( row, 0 );
- m_grid->SetGridCursor( row, 0 );
- return false;
- }
+ m_pathList->ClearAll();
- // Value cannot be empty.
- if( value.IsEmpty() )
- {
- wxMessageBox( _( "Environment variable value cannot be empty." ), caption,
- wxOK | wxICON_ERROR, this );
- m_grid->GoToCell( row, 1 );
- m_grid->SetGridCursor( row, 1 );
- m_grid->SetFocus();
- return false;
- }
+ m_pathList->AppendColumn( _( "Name" ) );
+ m_pathList->AppendColumn( _( "Path" ) );
- // First character of the environment variable name cannot be a digit (0-9).
- if( name.Left( 1 ).IsNumber() )
- {
- wxMessageBox( _( "The first character of an environment variable name cannot be "
- "a digit (0-9)." ), caption, wxOK | wxICON_ERROR, this );
- m_grid->GoToCell( row, 0 );
- m_grid->SetGridCursor( row, 0 );
- m_grid->SelectBlock( row, 0, row, 0 );
- m_grid->SetFocus();
- return false;
- }
+ int row = 0;
- // Check for duplicate environment variable names.
- if( envVarNames.Index( name ) != wxNOT_FOUND )
- {
- wxMessageBox( _( "Cannot have duplicate environment variable names." ), caption,
- wxOK | wxICON_ERROR, this );
- m_grid->GoToCell( row, 0 );
- m_grid->SetGridCursor( row, 0 );
- m_grid->SelectRow( row );
- m_grid->SetFocus();
- return false;
- }
+ for( auto it = m_envVarMap.begin(); it != m_envVarMap.end(); ++it )
+ {
+ long index = m_pathList->InsertItem( row, it->first );
+
+ m_pathList->SetItem( index, 1, it->second.GetValue() );
+
+ //TODO - Indicate via background colour if the path is defined external to KiCad
- envVarNames.Add( name );
+ row++;
}
- // Add new entries and update any modified entries.
- for( row = 0; row < m_grid->GetNumberRows(); row++ )
+ m_pathList->SetColumnWidth( 0, wxLIST_AUTOSIZE );
+ m_pathList->SetColumnWidth( 1, wxLIST_AUTOSIZE );
+
+ m_pathList->Update();
+
+ m_pathList->Thaw();
+}
+
+
+bool DIALOG_ENV_VAR_CONFIG::GetPathAtIndex( unsigned int aIndex, wxString& aEnvVar, wxString& aEnvPath )
+{
+ if( aIndex < 0 || aIndex > m_envVarMap.size() )
{
- wxString name = m_grid->GetCellValue( row, 0 );
- wxString value = m_grid->GetCellValue( row, 1 );
- ENV_VAR_MAP_ITER it = m_envVarMap.find( name );
+ return false;
+ }
- if( it == m_envVarMap.end() )
- {
- ENV_VAR_ITEM item( value, wxGetEnv( name, NULL ) );
+ unsigned int idx = 0;
- // Add new environment variable.
- m_envVarMap[ name ] = item;
- }
- else if( it->second.GetValue() != value )
+ for( auto it = m_envVarMap.begin(); it != m_envVarMap.end(); ++it )
+ {
+ if( idx == aIndex )
{
- // Environment variable already defined but it's value changed.
- it->second.SetValue( value );
+ aEnvVar = it->first;
+ aEnvPath = it->second.GetValue();
- // Externally defined variable has been changed.
- if( it->second.GetDefinedExternally() )
- m_extDefsChanged = true;
+ return true;
}
+
+ idx++;
}
- std::vector< wxString > removeFromMap;
+ return false;
+}
+
- // Remove deleted entries from the map.
- for( ENV_VAR_MAP_ITER it = m_envVarMap.begin(); it != m_envVarMap.end(); ++it )
+
+void DIALOG_ENV_VAR_CONFIG::OnAddButton( wxCommandEvent& event )
+{
+ auto dlg = new DIALOG_ENV_VAR_SINGLE( nullptr, wxEmptyString, wxEmptyString );
+
+ if( dlg->ShowModal() == wxID_OK )
{
- bool found = false;
+ wxString newName = dlg->GetEnvVarName();
+ wxString newPath = dlg->GetEnvVarPath();
- for( row = 0; row < m_grid->GetNumberRows(); row++ )
+ // Check that the name does not already exist
+ if( m_envVarMap.count( newName ) > 0 )
{
- if( m_grid->GetCellValue( row, 0 ) == it->first )
- {
- found = true;
- break;
- }
+ //TODO - Improve this message, use DisplayErrorMessage instead
+ DisplayError( this, _( "Path already exists" ) );
}
+ else
+ {
+ m_envVarMap[newName] = ENV_VAR_ITEM( newPath );
- if( !found )
- removeFromMap.push_back( it->first );
+ // Update path list
+ PopulatePathList();
+ }
}
- for( size_t i = 0; i < removeFromMap.size(); i++ )
- m_envVarMap.erase( removeFromMap[i] );
-
- return true;
+ dlg->Destroy();
}
-void DIALOG_ENV_VAR_CONFIG::OnAddRow( wxCommandEvent& aEvent )
+void DIALOG_ENV_VAR_CONFIG::OnEditButton( wxCommandEvent& event )
{
- m_grid->AppendRows();
-
- int row = m_grid->GetNumberRows() - 1;
- wxGridCellTextEditor* editor = new wxGridCellTextEditor;
- ENVIRONMENT_VARIABLE_CHAR_VALIDATOR envVarNameValidator;
- editor->SetValidator( envVarNameValidator );
- m_grid->SetCellEditor( row, 0, editor );
-
- editor = new wxGridCellTextEditor;
- FILE_NAME_WITH_PATH_CHAR_VALIDATOR pathValidator;
- editor->SetValidator( pathValidator );
- m_grid->SetCellEditor( row, 1, editor );
- m_grid->GoToCell( row, 0 );
- m_grid->SetGridCursor( row, 0 );
- m_grid->SetFocus();
+ EditSelectedEntry();
}
-void DIALOG_ENV_VAR_CONFIG::OnDeleteSelectedRows( wxCommandEvent& aEvent )
+void DIALOG_ENV_VAR_CONFIG::EditSelectedEntry()
{
- if( !m_grid->IsSelection() )
- return;
-
- wxGridUpdateLocker locker( m_grid );
+ wxString envName;
+ wxString envPath;
- for( int n = 0; n < m_grid->GetNumberRows(); )
+ if( GetPathAtIndex( m_pathIndex, envName, envPath ) )
{
- if( m_grid->IsInSelection( n , 0 ) )
- m_grid->DeleteRows( n, 1 );
- else
- n++;
+ auto dlg = new DIALOG_ENV_VAR_SINGLE( nullptr, envName, envPath );
+
+ if( IsEnvVarImmutable( envName ) )
+ {
+ dlg->SetEnvVarProtected();
+ }
+
+ if( dlg->ShowModal() == wxID_OK )
+ {
+ wxString newName = dlg->GetEnvVarName();
+ wxString newPath = dlg->GetEnvVarPath();
+
+ // If the path name has not been changed
+ if( envName.Cmp( newName ) == 0 )
+ {
+ m_envVarMap[envName].SetValue( newPath );
+
+ if( m_envVarMap[envName].GetDefinedExternally() )
+ {
+ m_extDefsChanged = true;
+ }
+ }
+ // Path-name needs to be updated
+ else
+ {
+ if( IsEnvVarImmutable( envName ) )
+ {
+ DisplayErrorMessage( this,
+ 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." ) );
+
+ return;
+ }
+
+ auto envVar = m_envVarMap[envName];
+
+ m_envVarMap.erase( envName );
+
+ envVar.SetValue( newPath );
+ envVar.SetDefinedExternally( false );
+ m_envVarMap[newName] = envVar;
+ }
+
+ // Update the path list
+ PopulatePathList();
+ }
+
+ dlg->Destroy();
}
}
-
-void DIALOG_ENV_VAR_CONFIG::OnHelpRequest( wxCommandEvent& aEvent )
+void DIALOG_ENV_VAR_CONFIG::OnHelpButton( wxCommandEvent& event )
{
wxString msg = _( "Enter the name and path for each environment variable. Grey entries "
"are names that have been defined externally at the system or user "
@@ -261,6 +254,8 @@ void DIALOG_ENV_VAR_CONFIG::OnHelpRequest( wxCommandEvent& aEvent )
msg << _( "To ensure environment variable names are valid on all platforms, the name field "
"will only accept upper case letters, digits, and the underscore characters." );
msg << wxT( "</b><br><br>" );
+ msg << _( "<b>KICAD_SYMBOL_DIR</b> is the base path of the locally installed symbol libraries." );
+ msg << wxT( "<br><br>" );
msg << _( "<b>KIGITHUB</b> is used by KiCad to define the URL of the repository "
"of the official KiCad libraries." );
msg << wxT( "<br><br>" );
@@ -279,7 +274,86 @@ void DIALOG_ENV_VAR_CONFIG::OnHelpRequest( wxCommandEvent& aEvent )
msg << _( "<b>KICAD_PTEMPLATES</b> is optional and can be defined if you want to "
"create your own project templates folder." );
- HTML_MESSAGE_BOX dlg( GetParent(), _( "Environment Variable Help" ) );
- dlg.AddHTML_Text( msg );
- dlg.ShowModal();
+ DisplayHtmlInfoMessage( GetParent(), _( "Environment Variable Help" ), msg );
+}
+
+
+bool DIALOG_ENV_VAR_CONFIG::IsEnvVarImmutable( const wxString aEnvVar )
+{
+ /*
+ * TODO - Instead of defining these values here,
+ * extract them from elsewhere in the program
+ * (where they are originally defined)
+ */
+
+ static const wxString immutable[] = {
+ "KIGITHUB",
+ "KISYS3DMOD",
+ "KISYSMOD",
+ "KIPRJMOD",
+ "KICAD_PTEMPLATES",
+ "KICAD_SYMBOL_DIR"
+ };
+
+ for( unsigned int ii=0; ii<6; ii++ )
+ {
+ if( aEnvVar.Cmp( immutable[ii] ) == 0 )
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
+void DIALOG_ENV_VAR_CONFIG::OnRemoveButton( wxCommandEvent& event )
+{
+ wxString envName;
+ wxString envPath;
+
+ if( GetPathAtIndex( m_pathIndex, envName, envPath ) )
+ {
+ if( IsEnvVarImmutable( envName ) )
+ {
+ return;
+ }
+
+ m_envVarMap.erase( envName );
+
+ PopulatePathList();
+ }
+}
+
+
+void DIALOG_ENV_VAR_CONFIG::SelectListIndex( unsigned int aIndex )
+{
+ if( aIndex >= m_envVarMap.size() )
+ {
+ aIndex = 0;
+ }
+
+ m_pathIndex = aIndex;
+
+ wxString envName;
+ wxString envPath;
+
+ if( GetPathAtIndex( m_pathIndex, envName, envPath ) )
+ {
+ // Disable the 'delete' button if the path cannot be deleted
+ m_deletePathButton->Enable( !IsEnvVarImmutable( envName ) );
+ }
+}
+
+void DIALOG_ENV_VAR_CONFIG::OnPathSelected( wxListEvent& event )
+{
+ SelectListIndex( event.GetIndex() );
+}
+
+
+void DIALOG_ENV_VAR_CONFIG::OnPathActivated( wxListEvent& event )
+{
+ SelectListIndex( event.GetIndex() );
+
+ EditSelectedEntry();
}
diff --git a/common/dialogs/dialog_env_var_config_base.cpp b/common/dialogs/dialog_env_var_config_base.cpp
index 8f8590a..20fdce2 100644
--- a/common/dialogs/dialog_env_var_config_base.cpp
+++ b/common/dialogs/dialog_env_var_config_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -16,61 +16,50 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind
wxBoxSizer* mainSizer;
mainSizer = new wxBoxSizer( wxVERTICAL );
- wxBoxSizer* bupperSizer;
- bupperSizer = new wxBoxSizer( wxHORIZONTAL );
+ wxBoxSizer* bSizer5;
+ bSizer5 = new wxBoxSizer( wxVERTICAL );
- wxBoxSizer* bleftSizer;
- bleftSizer = new wxBoxSizer( wxVERTICAL );
+ wxStaticBoxSizer* sbSizer2;
+ sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("KiCad Environment Paths") ), wxVERTICAL );
- m_grid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+ wxBoxSizer* bSizer7;
+ bSizer7 = new wxBoxSizer( wxHORIZONTAL );
- // Grid
- m_grid->CreateGrid( 0, 2 );
- m_grid->EnableEditing( true );
- m_grid->EnableGridLines( true );
- m_grid->EnableDragGridSize( true );
- m_grid->SetMargins( 0, 0 );
+ m_pathList = new wxListCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );
+ bSizer7->Add( m_pathList, 1, wxALL|wxEXPAND, 5 );
- // Columns
- m_grid->EnableDragColMove( false );
- m_grid->EnableDragColSize( true );
- m_grid->SetColLabelSize( 30 );
- m_grid->SetColLabelValue( 0, _("Name") );
- m_grid->SetColLabelValue( 1, _("Path") );
- m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+ wxBoxSizer* bSizer6;
+ bSizer6 = new wxBoxSizer( wxVERTICAL );
- // Rows
- m_grid->EnableDragRowSize( true );
- m_grid->SetRowLabelSize( 40 );
- m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+ m_addPathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_ADD_PATH, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_addPathButton->SetToolTip( _("Add path prefix") );
- // Label Appearance
+ bSizer6->Add( m_addPathButton, 0, wxALL, 5 );
- // Cell Defaults
- m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
- bleftSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
+ m_editPathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_EDIT_PATH, _("Edit"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_editPathButton->SetToolTip( _("Edit selected path prefix") );
+ bSizer6->Add( m_editPathButton, 0, wxALL, 5 );
- bupperSizer->Add( bleftSizer, 1, wxEXPAND, 5 );
+ m_deletePathButton = new wxButton( sbSizer2->GetStaticBox(), ID_BUTTON_DELETE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_deletePathButton->SetToolTip( _("Remove selected path prefix") );
- wxBoxSizer* brightSizer;
- brightSizer = new wxBoxSizer( wxVERTICAL );
+ bSizer6->Add( m_deletePathButton, 0, wxALL, 5 );
- m_buttonAdd = new wxButton( this, wxID_ANY, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
- m_buttonAdd->SetToolTip( _("Add a new entry to the table.") );
- brightSizer->Add( m_buttonAdd, 0, wxALL|wxEXPAND, 5 );
+ bSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
- m_buttonDelete = new wxButton( this, wxID_ANY, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
- m_buttonDelete->SetToolTip( _("Remove the selected entry from the table.") );
- brightSizer->Add( m_buttonDelete, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 );
+ bSizer7->Add( bSizer6, 0, wxEXPAND, 5 );
- bupperSizer->Add( brightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+ sbSizer2->Add( bSizer7, 1, wxEXPAND, 5 );
- mainSizer->Add( bupperSizer, 1, wxEXPAND, 5 );
+ bSizer5->Add( sbSizer2, 1, wxEXPAND, 5 );
+
+
+ mainSizer->Add( bSizer5, 1, wxEXPAND, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
mainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
@@ -93,16 +82,22 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind
this->Centre( wxBOTH );
// Connect Events
- m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this );
- m_buttonDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this );
- m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpRequest ), NULL, this );
+ m_pathList->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnPathActivated ), NULL, this );
+ m_pathList->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnPathSelected ), NULL, this );
+ m_addPathButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddButton ), NULL, this );
+ m_editPathButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnEditButton ), NULL, this );
+ m_deletePathButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnRemoveButton ), NULL, this );
+ m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpButton ), NULL, this );
}
DIALOG_ENV_VAR_CONFIG_BASE::~DIALOG_ENV_VAR_CONFIG_BASE()
{
// Disconnect Events
- m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this );
- m_buttonDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this );
- m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpRequest ), NULL, this );
+ m_pathList->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnPathActivated ), NULL, this );
+ m_pathList->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnPathSelected ), NULL, this );
+ m_addPathButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddButton ), NULL, this );
+ m_editPathButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnEditButton ), NULL, this );
+ m_deletePathButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnRemoveButton ), NULL, this );
+ m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpButton ), NULL, this );
}
diff --git a/common/dialogs/dialog_env_var_config_base.fbp b/common/dialogs/dialog_env_var_config_base.fbp
index 8c86db4..6e62c58 100644
--- a/common/dialogs/dialog_env_var_config_base.fbp
+++ b/common/dialogs/dialog_env_var_config_base.fbp
@@ -44,7 +44,7 @@
<property name="minimum_size"></property>
<property name="name">DIALOG_ENV_VAR_CONFIG_BASE</property>
<property name="pos"></property>
- <property name="size">363,177</property>
+ <property name="size">595,494</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Path Configuration</property>
@@ -99,346 +99,421 @@
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="name">bupperSizer</property>
- <property name="orient">wxHORIZONTAL</property>
+ <property name="name">bSizer5</property>
+ <property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="1">
+ <object class="wxStaticBoxSizer" expanded="1">
+ <property name="id">wxID_ANY</property>
+ <property name="label">KiCad Environment Paths</property>
<property name="minimum_size"></property>
- <property name="name">bleftSizer</property>
+ <property name="name">sbSizer2</property>
<property name="orient">wxVERTICAL</property>
+ <property name="parent">1</property>
<property name="permission">none</property>
+ <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
+ <property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxGrid" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="autosize_cols">0</property>
- <property name="autosize_rows">0</property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="cell_bg"></property>
- <property name="cell_font"></property>
- <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
- <property name="cell_text"></property>
- <property name="cell_vert_alignment">wxALIGN_TOP</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
- <property name="col_label_size">30</property>
- <property name="col_label_values">"Name" "Path"</property>
- <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
- <property name="cols">2</property>
- <property name="column_sizes"></property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="drag_col_move">0</property>
- <property name="drag_col_size">1</property>
- <property name="drag_grid_size">1</property>
- <property name="drag_row_size">1</property>
- <property name="editing">1</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="grid_line_color"></property>
- <property name="grid_lines">1</property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label_bg"></property>
- <property name="label_font"></property>
- <property name="label_text"></property>
- <property name="margin_height">0</property>
- <property name="margin_width">0</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_grid</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
- <property name="row_label_size">40</property>
- <property name="row_label_values"></property>
- <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
- <property name="row_sizes"></property>
- <property name="rows">0</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnGridCellChange"></event>
- <event name="OnGridCellLeftClick"></event>
- <event name="OnGridCellLeftDClick"></event>
- <event name="OnGridCellRightClick"></event>
- <event name="OnGridCellRightDClick"></event>
- <event name="OnGridCmdCellChange"></event>
- <event name="OnGridCmdCellLeftClick"></event>
- <event name="OnGridCmdCellLeftDClick"></event>
- <event name="OnGridCmdCellRightClick"></event>
- <event name="OnGridCmdCellRightDClick"></event>
- <event name="OnGridCmdColSize"></event>
- <event name="OnGridCmdEditorCreated"></event>
- <event name="OnGridCmdEditorHidden"></event>
- <event name="OnGridCmdEditorShown"></event>
- <event name="OnGridCmdLabelLeftClick"></event>
- <event name="OnGridCmdLabelLeftDClick"></event>
- <event name="OnGridCmdLabelRightClick"></event>
- <event name="OnGridCmdLabelRightDClick"></event>
- <event name="OnGridCmdRangeSelect"></event>
- <event name="OnGridCmdRowSize"></event>
- <event name="OnGridCmdSelectCell"></event>
- <event name="OnGridColSize"></event>
- <event name="OnGridEditorCreated"></event>
- <event name="OnGridEditorHidden"></event>
- <event name="OnGridEditorShown"></event>
- <event name="OnGridLabelLeftClick"></event>
- <event name="OnGridLabelLeftDClick"></event>
- <event name="OnGridLabelRightClick"></event>
- <event name="OnGridLabelRightDClick"></event>
- <event name="OnGridRangeSelect"></event>
- <event name="OnGridRowSize"></event>
- <event name="OnGridSelectCell"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">0</property>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">brightSizer</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Add</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_buttonAdd</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Add a new entry to the table.</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">OnAddRow</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Delete</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_buttonDelete</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Remove the selected entry from the table.</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">OnDeleteSelectedRows</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="name">bSizer7</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="wxListCtrl" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_pathList</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_VRULES</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnListBeginDrag"></event>
+ <event name="OnListBeginLabelEdit"></event>
+ <event name="OnListBeginRDrag"></event>
+ <event name="OnListCacheHint"></event>
+ <event name="OnListColBeginDrag"></event>
+ <event name="OnListColClick"></event>
+ <event name="OnListColDragging"></event>
+ <event name="OnListColEndDrag"></event>
+ <event name="OnListColRightClick"></event>
+ <event name="OnListDeleteAllItems"></event>
+ <event name="OnListDeleteItem"></event>
+ <event name="OnListEndLabelEdit"></event>
+ <event name="OnListInsertItem"></event>
+ <event name="OnListItemActivated">OnPathActivated</event>
+ <event name="OnListItemDeselected"></event>
+ <event name="OnListItemFocused"></event>
+ <event name="OnListItemMiddleClick"></event>
+ <event name="OnListItemRightClick"></event>
+ <event name="OnListItemSelected">OnPathSelected</event>
+ <event name="OnListKeyDown"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">0</property>
+ <object class="wxBoxSizer" expanded="0">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer6</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">ID_BUTTON_ADD_PATH</property>
+ <property name="label">Add</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_addPathButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Add path prefix</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">OnAddButton</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">ID_BUTTON_EDIT_PATH</property>
+ <property name="label">Edit</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_editPathButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Edit selected path prefix</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">OnEditButton</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxButton" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">ID_BUTTON_DELETE_PATH</property>
+ <property name="label">Remove</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_deletePathButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Remove selected path prefix</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">OnRemoveButton</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="0">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
+ </object>
+ </object>
</object>
</object>
</object>
@@ -545,7 +620,7 @@
<event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event>
- <event name="OnHelpButtonClick">OnHelpRequest</event>
+ <event name="OnHelpButtonClick">OnHelpButton</event>
<event name="OnNoButtonClick"></event>
<event name="OnOKButtonClick"></event>
<event name="OnSaveButtonClick"></event>
diff --git a/common/dialogs/dialog_env_var_config_base.h b/common/dialogs/dialog_env_var_config_base.h
index 69b74f2..2d75bb8 100644
--- a/common/dialogs/dialog_env_var_config_base.h
+++ b/common/dialogs/dialog_env_var_config_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,19 +14,23 @@
class DIALOG_SHIM;
#include "dialog_shim.h"
+#include <wx/listctrl.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
-#include <wx/gdicmn.h>
-#include <wx/sizer.h>
#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
#include <wx/statline.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
+#define ID_BUTTON_ADD_PATH 1000
+#define ID_BUTTON_EDIT_PATH 1001
+#define ID_BUTTON_DELETE_PATH 1002
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_ENV_VAR_CONFIG_BASE
@@ -36,9 +40,10 @@ class DIALOG_ENV_VAR_CONFIG_BASE : public DIALOG_SHIM
private:
protected:
- wxGrid* m_grid;
- wxButton* m_buttonAdd;
- wxButton* m_buttonDelete;
+ wxListCtrl* m_pathList;
+ wxButton* m_addPathButton;
+ wxButton* m_editPathButton;
+ wxButton* m_deletePathButton;
wxStaticLine* m_staticline1;
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
@@ -46,14 +51,17 @@ class DIALOG_ENV_VAR_CONFIG_BASE : public DIALOG_SHIM
wxButton* m_sdbSizerHelp;
// Virtual event handlers, overide them in your derived class
- virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnDeleteSelectedRows( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnHelpRequest( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnPathActivated( wxListEvent& event ) { event.Skip(); }
+ virtual void OnPathSelected( wxListEvent& event ) { event.Skip(); }
+ virtual void OnAddButton( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnEditButton( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnRemoveButton( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnHelpButton( wxCommandEvent& event ) { event.Skip(); }
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( 363,177 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Path Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 595,494 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_ENV_VAR_CONFIG_BASE();
};
diff --git a/common/dialogs/dialog_env_var_single.cpp b/common/dialogs/dialog_env_var_single.cpp
new file mode 100644
index 0000000..d3d7299
--- /dev/null
+++ b/common/dialogs/dialog_env_var_single.cpp
@@ -0,0 +1,122 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2017 Oliver Walters
+ * Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <bitmaps.h>
+#include <project.h>
+#include <wx/dirdlg.h>
+#include <confirm.h>
+#include "dialog_env_var_single.h"
+#include "validators.h"
+
+DIALOG_ENV_VAR_SINGLE::DIALOG_ENV_VAR_SINGLE( wxWindow* parent, const wxString aEnvVarName, const wxString aEnvVarPath ) :
+ DIALOG_ENV_VAR_SINGLE_BASE( parent )
+{
+ m_selectPathButton->SetBitmap( KiBitmap( directory_xpm ) );
+
+ m_envVarName->SetValue( aEnvVarName );
+
+ m_envVarPath->SetValue( aEnvVarPath );
+
+ m_envVarName->SetValidator( ENVIRONMENT_VARIABLE_CHAR_VALIDATOR() );
+}
+
+
+wxString DIALOG_ENV_VAR_SINGLE::GetEnvVarName() const
+{
+ return m_envVarName->GetValue();
+}
+
+
+wxString DIALOG_ENV_VAR_SINGLE::GetEnvVarPath() const
+{
+ return m_envVarPath->GetValue();
+}
+
+
+void DIALOG_ENV_VAR_SINGLE::SetEnvVarProtected()
+{
+ m_envVarName->Enable( false );
+}
+
+
+void DIALOG_ENV_VAR_SINGLE::OnSelectPath( wxCommandEvent& event )
+{
+ wxString title = _( "Set path for ENV_VAR" );
+
+ wxString path = wxEmptyString;
+
+ if( 1 )
+ {
+ //path = Prj().GetProjectPath();
+ }
+
+ wxDirDialog dlg( this,
+ title,
+ path,
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
+
+ if( dlg.ShowModal() == wxID_OK )
+ {
+ path = dlg.GetPath();
+
+ m_envVarPath->SetValue( path );
+ }
+}
+
+
+void DIALOG_ENV_VAR_SINGLE::OnOkButton( wxCommandEvent& aEvent )
+{
+ // If user pressed the OK button, test data validity
+ if( aEvent.GetId() == wxID_OK )
+ {
+ wxString name = GetEnvVarName();
+ wxString path = GetEnvVarPath();
+
+ // Neither name nor path can be empt
+ if( name.IsEmpty() )
+ {
+ DisplayError( this, _( "Environment variable name cannot be empty." ) );
+ //aEvent.Veto();
+ return;
+ }
+
+ if( path.IsEmpty() )
+ {
+ DisplayError( this, _( "Environment variable value cannot be empty." ) );
+ //aEvent.Veto();
+ return;
+ }
+
+ // Name cannot start with a number
+ if( name.Left( 1 ).IsNumber() )
+ {
+ DisplayError( this, _( "Environment variable name cannot start with a digit (0-9)." ) );
+ //aEvent.Veto();
+ return;
+ }
+ }
+
+ // No errors detected
+ EndModal( wxID_OK );
+}
diff --git a/common/dialogs/dialog_env_var_single.h b/common/dialogs/dialog_env_var_single.h
new file mode 100644
index 0000000..0717dab
--- /dev/null
+++ b/common/dialogs/dialog_env_var_single.h
@@ -0,0 +1,47 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2017 Oliver Walters
+ * Copyright (C) 2017 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#ifndef DIALOG_ENV_VAR_SINGLE_H_
+#define DIALOG_ENV_VAR_SINGLE_H_
+
+#include "dialog_env_var_single_base.h"
+
+class DIALOG_ENV_VAR_SINGLE : public DIALOG_ENV_VAR_SINGLE_BASE
+{
+public:
+ DIALOG_ENV_VAR_SINGLE( wxWindow* parent, const wxString aEnvVarName, const wxString aEnvVarPath );
+
+ wxString GetEnvVarName() const;
+ wxString GetEnvVarPath() const;
+
+ void SetEnvVarProtected();
+
+protected:
+ virtual void OnSelectPath( wxCommandEvent& event ) override;
+ virtual void OnOkButton( wxCommandEvent& aEvent ) override;
+};
+
+
+#endif /* DIALOG_ENV_VAR_SINGLE_H_ */
diff --git a/common/dialogs/dialog_env_var_single_base.cpp b/common/dialogs/dialog_env_var_single_base.cpp
new file mode 100644
index 0000000..eca54a0
--- /dev/null
+++ b/common/dialogs/dialog_env_var_single_base.cpp
@@ -0,0 +1,82 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_env_var_single_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_ENV_VAR_SINGLE_BASE::DIALOG_ENV_VAR_SINGLE_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( wxDefaultSize, wxDefaultSize );
+
+ wxBoxSizer* bSizer2;
+ bSizer2 = new wxBoxSizer( wxVERTICAL );
+
+ wxFlexGridSizer* fgSizer1;
+ fgSizer1 = new wxFlexGridSizer( 2, 3, 0, 0 );
+ fgSizer1->AddGrowableCol( 1 );
+ fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
+ fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ m_envVarNameLabel = new wxStaticText( this, wxID_ANY, wxT("Name"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+ m_envVarNameLabel->Wrap( -1 );
+ fgSizer1->Add( m_envVarNameLabel, 0, wxALIGN_CENTER|wxALL, 5 );
+
+ m_envVarName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizer1->Add( m_envVarName, 1, wxALL|wxEXPAND, 5 );
+
+
+ fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ m_envVarPathLabel = new wxStaticText( this, wxID_ANY, wxT("Value"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+ m_envVarPathLabel->Wrap( -1 );
+ fgSizer1->Add( m_envVarPathLabel, 0, wxALIGN_CENTER|wxALL, 5 );
+
+ m_envVarPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizer1->Add( m_envVarPath, 1, wxALL|wxEXPAND, 5 );
+
+ m_selectPathButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ m_selectPathButton->SetToolTip( wxT("Select path ") );
+
+ fgSizer1->Add( m_selectPathButton, 0, wxALL, 5 );
+
+
+ bSizer2->Add( fgSizer1, 0, wxEXPAND, 5 );
+
+
+ bSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bSizer2->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
+
+ m_sdbSizer1 = new wxStdDialogButtonSizer();
+ m_sdbSizer1OK = new wxButton( this, wxID_OK );
+ m_sdbSizer1->AddButton( m_sdbSizer1OK );
+ m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
+ m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
+ m_sdbSizer1->Realize();
+
+ bSizer2->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
+
+
+ this->SetSizer( bSizer2 );
+ this->Layout();
+
+ this->Centre( wxBOTH );
+
+ // Connect Events
+ m_selectPathButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_SINGLE_BASE::OnSelectPath ), NULL, this );
+ m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_SINGLE_BASE::OnOkButton ), NULL, this );
+}
+
+DIALOG_ENV_VAR_SINGLE_BASE::~DIALOG_ENV_VAR_SINGLE_BASE()
+{
+ // Disconnect Events
+ m_selectPathButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_SINGLE_BASE::OnSelectPath ), NULL, this );
+ m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_SINGLE_BASE::OnOkButton ), NULL, this );
+
+}
diff --git a/common/dialogs/dialog_env_var_single_base.fbp b/common/dialogs/dialog_env_var_single_base.fbp
new file mode 100644
index 0000000..a1d37eb
--- /dev/null
+++ b/common/dialogs/dialog_env_var_single_base.fbp
@@ -0,0 +1,685 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+ <FileVersion major="1" minor="13" />
+ <object class="Project" expanded="1">
+ <property name="class_decoration"></property>
+ <property name="code_generation">C++</property>
+ <property name="disconnect_events">1</property>
+ <property name="disconnect_mode">source_name</property>
+ <property name="disconnect_php_events">0</property>
+ <property name="disconnect_python_events">0</property>
+ <property name="embedded_files_path">res</property>
+ <property name="encoding">UTF-8</property>
+ <property name="event_generation">connect</property>
+ <property name="file">dialog_env_var_single_base</property>
+ <property name="first_id">1000</property>
+ <property name="help_provider">none</property>
+ <property name="internationalize">0</property>
+ <property name="name">DIALOG_ENV_VAR_SINGLE_BASE</property>
+ <property name="namespace"></property>
+ <property name="path">.</property>
+ <property name="precompiled_header"></property>
+ <property name="relative_path">1</property>
+ <property name="skip_lua_events">1</property>
+ <property name="skip_php_events">1</property>
+ <property name="skip_python_events">1</property>
+ <property name="ui_table">UI</property>
+ <property name="use_enum">0</property>
+ <property name="use_microsoft_bom">0</property>
+ <object class="Dialog" expanded="1">
+ <property name="aui_managed">0</property>
+ <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+ <property name="bg"></property>
+ <property name="center">wxBOTH</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="enabled">1</property>
+ <property name="event_handler">impl_virtual</property>
+ <property name="extra_style"></property>
+ <property name="fg"></property>
+ <property name="font"></property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="maximum_size"></property>
+ <property name="minimum_size"></property>
+ <property name="name">DIALOG_ENV_VAR_SINGLE_BASE</property>
+ <property name="pos"></property>
+ <property name="size">431,176</property>
+ <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+ <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
+ <property name="title">Edit Environment Path Variable</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnActivate"></event>
+ <event name="OnActivateApp"></event>
+ <event name="OnAuiFindManager"></event>
+ <event name="OnAuiPaneButton"></event>
+ <event name="OnAuiPaneClose"></event>
+ <event name="OnAuiPaneMaximize"></event>
+ <event name="OnAuiPaneRestore"></event>
+ <event name="OnAuiRender"></event>
+ <event name="OnChar"></event>
+ <event name="OnClose"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnHibernate"></event>
+ <event name="OnIconize"></event>
+ <event name="OnIdle"></event>
+ <event name="OnInitDialog"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ <object class="wxBoxSizer" expanded="1">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer2</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">0</property>
+ <object class="wxFlexGridSizer" expanded="1">
+ <property name="cols">3</property>
+ <property name="flexible_direction">wxHORIZONTAL</property>
+ <property name="growablecols">1</property>
+ <property name="growablerows"></property>
+ <property name="hgap">0</property>
+ <property name="minimum_size"></property>
+ <property name="name">fgSizer1</property>
+ <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+ <property name="permission">none</property>
+ <property name="rows">2</property>
+ <property name="vgap">0</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER|wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticText" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">Name</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_envVarNameLabel</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxALIGN_RIGHT</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="wxTextCtrl" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="maxlength"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_envVarName</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="value"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnText"></event>
+ <event name="OnTextEnter"></event>
+ <event name="OnTextMaxLen"></event>
+ <event name="OnTextURL"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER|wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticText" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">Value</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_envVarPathLabel</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxALIGN_RIGHT</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="wxTextCtrl" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="maxlength"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_envVarPath</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="value"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnText"></event>
+ <event name="OnTextEnter"></event>
+ <event name="OnTextMaxLen"></event>
+ <event name="OnTextURL"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label"></property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_selectPathButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Select path </property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">OnSelectPath</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND | wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticLine" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_staticline1</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxLI_HORIZONTAL</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">0</property>
+ <object class="wxStdDialogButtonSizer" expanded="1">
+ <property name="Apply">0</property>
+ <property name="Cancel">1</property>
+ <property name="ContextHelp">0</property>
+ <property name="Help">0</property>
+ <property name="No">0</property>
+ <property name="OK">1</property>
+ <property name="Save">0</property>
+ <property name="Yes">0</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_sdbSizer1</property>
+ <property name="permission">protected</property>
+ <event name="OnApplyButtonClick"></event>
+ <event name="OnCancelButtonClick"></event>
+ <event name="OnContextHelpButtonClick"></event>
+ <event name="OnHelpButtonClick"></event>
+ <event name="OnNoButtonClick"></event>
+ <event name="OnOKButtonClick">OnOkButton</event>
+ <event name="OnSaveButtonClick"></event>
+ <event name="OnYesButtonClick"></event>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+</wxFormBuilder_Project>
diff --git a/common/dialogs/dialog_env_var_single_base.h b/common/dialogs/dialog_env_var_single_base.h
new file mode 100644
index 0000000..9dfc828
--- /dev/null
+++ b/common/dialogs/dialog_env_var_single_base.h
@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_ENV_VAR_SINGLE_BASE_H__
+#define __DIALOG_ENV_VAR_SINGLE_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+class DIALOG_SHIM;
+
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/textctrl.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/bmpbuttn.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/statline.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_ENV_VAR_SINGLE_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_ENV_VAR_SINGLE_BASE : public DIALOG_SHIM
+{
+ private:
+
+ protected:
+ wxStaticText* m_envVarNameLabel;
+ wxTextCtrl* m_envVarName;
+ wxStaticText* m_envVarPathLabel;
+ wxTextCtrl* m_envVarPath;
+ wxBitmapButton* m_selectPathButton;
+ wxStaticLine* m_staticline1;
+ wxStdDialogButtonSizer* m_sdbSizer1;
+ wxButton* m_sdbSizer1OK;
+ wxButton* m_sdbSizer1Cancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnSelectPath( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnOkButton( wxCommandEvent& event ) { event.Skip(); }
+
+
+ public:
+
+ DIALOG_ENV_VAR_SINGLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Environment Path Variable"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 431,176 ), long style = wxDEFAULT_DIALOG_STYLE );
+ ~DIALOG_ENV_VAR_SINGLE_BASE();
+
+};
+
+#endif //__DIALOG_ENV_VAR_SINGLE_BASE_H__
diff --git a/include/dialog_env_var_config.h b/include/dialog_env_var_config.h
index 4e3f6a4..783da0a 100644
--- a/include/dialog_env_var_config.h
+++ b/include/dialog_env_var_config.h
@@ -40,15 +40,53 @@ class DIALOG_ENV_VAR_CONFIG: public DIALOG_ENV_VAR_CONFIG_BASE
{
private:
ENV_VAR_MAP m_envVarMap;
- bool m_extDefsChanged;
+ bool m_extDefsChanged = false;
protected:
- virtual void OnAddRow( wxCommandEvent& aEvent ) override;
- virtual void OnDeleteSelectedRows( wxCommandEvent& aEvent ) override;
- virtual void OnHelpRequest( wxCommandEvent& aEvent ) override;
+
+ /**
+ * Update the displayed list of ENV_VAR paths
+ */
+ void PopulatePathList();
+
+ /**
+ * Edit the currently selected ENV_VAR entry
+ */
+ void EditSelectedEntry();
+
+ // Various button callbacks
+ virtual void OnAddButton( wxCommandEvent& event ) override;
+ virtual void OnEditButton( wxCommandEvent& event ) override;
+ virtual void OnRemoveButton( wxCommandEvent& event ) override;
+ virtual void OnHelpButton( wxCommandEvent& event ) override;
+
+ virtual void OnPathSelected( wxListEvent& event ) override;
+ virtual void OnPathActivated( wxListEvent& event ) override;
+
+ // Variable for keeping track of currently selected list index
+ unsigned int m_pathIndex = 0;
+
+ /**
+ * Extract the NAME and PATH data from the ENV_VAR at the provided index
+ * @param aIndex is the index to extract data from
+ * @return true if data was extracted else false
+ */
+ bool GetPathAtIndex( unsigned int aIndex, wxString& aEnvVar, wxString& aEnvPath );
+
+ /**
+ * Determine if a particular ENV_VAR is protected
+ * @param aEnvVar is the name of the ENV_VAR
+ */
+ bool IsEnvVarImmutable( const wxString aEnvVar );
+
+ /**
+ * Select the ENV_VAR at the provided index
+ */
+ void SelectListIndex( unsigned int aIndex );
public:
DIALOG_ENV_VAR_CONFIG( wxWindow* parent, const ENV_VAR_MAP& aEnvVarMap );
+ virtual ~DIALOG_ENV_VAR_CONFIG() {}
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
--
2.7.4
Follow ups
