All elements forms implemented

50 files changed, 6182 insertions, 2195 deletions

diff --git a/.codelite/.tern-port b/.codelite/.tern-port
index 5dc171a..3864f96 100644
--- a/.codelite/.tern-port
+++ b/.codelite/.tern-port
@@ -1 +1 @@
-59434
\ No newline at end of file
+54576
\ No newline at end of file
diff --git a/.codelite/PSP.session b/.codelite/PSP.session
index 39c303f..62e3e4f 100644
--- a/.codelite/PSP.session
+++ b/.codelite/PSP.session
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Session Name="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace">
-  <int Value="4" Name="m_selectedTab"/>
+  <int Value="2" Name="m_selectedTab"/>
   <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace" Name="m_workspaceName"/>
   <TabInfoArray Name="TabInfoArray">
     <TabInfo>
       <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.cpp" Name="FileName"/>
-      <int Value="633" Name="FirstVisibleLine"/>
-      <int Value="657" Name="CurrentLine"/>
+      <int Value="616" Name="FirstVisibleLine"/>
+      <int Value="643" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
@@ -18,6 +18,13 @@
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
     <TabInfo>
+      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.cpp" Name="FileName"/>
+      <int Value="246" Name="FirstVisibleLine"/>
+      <int Value="267" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+      <IntVector Name="CollapsedFolds"/>
+    </TabInfo>
+    <TabInfo>
       <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.cpp" Name="FileName"/>
       <int Value="351" Name="FirstVisibleLine"/>
       <int Value="372" Name="CurrentLine"/>
@@ -32,51 +39,23 @@
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.cpp" Name="FileName"/>
-      <int Value="243" Name="FirstVisibleLine"/>
-      <int Value="263" Name="CurrentLine"/>
-      <wxArrayString Name="Bookmarks"/>
-      <IntVector Name="CollapsedFolds"/>
-    </TabInfo>
-    <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Capacitor.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="5" Name="CurrentLine"/>
+      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\SyncMachineForm.cpp" Name="FileName"/>
+      <int Value="114" Name="FirstVisibleLine"/>
+      <int Value="139" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Capacitor.h" Name="FileName"/>
+      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\SyncMachineForm.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="17" Name="CurrentLine"/>
+      <int Value="13" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\ReactiveShuntElementForm.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="19" Name="CurrentLine"/>
-      <wxArrayString Name="Bookmarks"/>
-      <IntVector Name="CollapsedFolds"/>
-    </TabInfo>
-    <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\ReactiveShuntElementForm.h" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="3" Name="CurrentLine"/>
-      <wxArrayString Name="Bookmarks"/>
-      <IntVector Name="CollapsedFolds"/>
-    </TabInfo>
-    <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Inductor.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="5" Name="CurrentLine"/>
-      <wxArrayString Name="Bookmarks"/>
-      <IntVector Name="CollapsedFolds"/>
-    </TabInfo>
-    <TabInfo>
-      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Inductor.h" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="17" Name="CurrentLine"/>
+      <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\SyncMotor.h" Name="FileName"/>
+      <int Value="48" Name="FirstVisibleLine"/>
+      <int Value="53" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
       <IntVector Name="CollapsedFolds"/>
     </TabInfo>
diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags
index b3e7b3a..919d637 100644
--- a/.codelite/PSP.tags
+++ b/.codelite/PSP.tags
diff --git a/.codelite/compilation.db b/.codelite/compilation.db
index 1aa22db..6fb12b7 100644
--- a/.codelite/compilation.db
+++ b/.codelite/compilation.db
diff --git a/.codelite/compile_commands.json b/.codelite/compile_commands.json
index 66a08c4..ba59d01 100644
--- a/.codelite/compile_commands.json
+++ b/.codelite/compile_commands.json
@@ -4,34 +4,6 @@
   "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\MainFrame.cpp"
  }, {
   "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/Workspace.cpp.o -MF./Release/Workspace.cpp.o.d -MM Workspace.cpp",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/Inductor.cpp.o -MF./Release/Inductor.cpp.o.d -MM Inductor.cpp",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Inductor.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -I. -I. -MG -MP -MT./Release/Capacitor.cpp.o -MF./Release/Capacitor.cpp.o.d -MM Capacitor.cpp",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Capacitor.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Workspace.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Workspace.cpp.o -I. -I.",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
   "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrame.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/MainFrame.cpp.o -I. -I.",
   "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\MainFrame.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Inductor.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Inductor.cpp.o -I. -I.",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Inductor.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Capacitor.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Capacitor.cpp.o -I. -I.",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Capacitor.cpp"
- }, {
-  "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project",
-  "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/ReactiveShuntElementForm.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/ReactiveShuntElementForm.cpp.o -I. -I.",
-  "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\ReactiveShuntElementForm.cpp"
  }]
\ No newline at end of file
diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db
index f17f395..3fd1606 100644
--- a/.codelite/refactoring.db
+++ b/.codelite/refactoring.db
diff --git a/Project/ElementForm.cpp b/Project/ElementForm.cpp
index 1b430b6..489405f 100644
--- a/Project/ElementForm.cpp
+++ b/Project/ElementForm.cpp
@@ -382,7 +382,7 @@ BusFormBase::~BusFormBase()
     
 }
 
-GeneratorFormBase::GeneratorFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+SyncMachineFormBase::SyncMachineFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
     : wxDialog(parent, id, title, pos, size, style)
 {
     if ( !bBitmapLoaded ) {
@@ -745,7 +745,7 @@ GeneratorFormBase::GeneratorFormBase(wxWindow* parent, wxWindowID id, const wxSt
     }
     #endif
     
-    SetName(wxT("GeneratorFormBase"));
+    SetName(wxT("SyncMachineFormBase"));
     SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
@@ -763,21 +763,21 @@ GeneratorFormBase::GeneratorFormBase(wxWindow* parent, wxWindowID id, const wxSt
     }
 #endif
     // Connect events
-    m_checkBoxMaxReactive->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCheckMaxReactive), NULL, this);
-    m_checkBoxMinReactive->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCheckMinReactive), NULL, this);
-    m_buttonStab->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnOKButtonClick), NULL, this);
-    m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCancelButtonClick), NULL, this);
+    m_checkBoxMaxReactive->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCheckMaxReactive), NULL, this);
+    m_checkBoxMinReactive->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCheckMinReactive), NULL, this);
+    m_buttonStab->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnOKButtonClick), NULL, this);
+    m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-GeneratorFormBase::~GeneratorFormBase()
+SyncMachineFormBase::~SyncMachineFormBase()
 {
-    m_checkBoxMaxReactive->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCheckMaxReactive), NULL, this);
-    m_checkBoxMinReactive->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCheckMinReactive), NULL, this);
-    m_buttonStab->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnOKButtonClick), NULL, this);
-    m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(GeneratorFormBase::OnCancelButtonClick), NULL, this);
+    m_checkBoxMaxReactive->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCheckMaxReactive), NULL, this);
+    m_checkBoxMinReactive->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCheckMinReactive), NULL, this);
+    m_buttonStab->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnOKButtonClick), NULL, this);
+    m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncMachineFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
@@ -1993,7 +1993,7 @@ TransformerFormBase::~TransformerFormBase()
     
 }
 
-SwitchingFormBase::SwitchingFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
     : wxDialog(parent, id, title, pos, size, style)
 {
     if ( !bBitmapLoaded ) {
@@ -2006,81 +2006,131 @@ SwitchingFormBase::SwitchingFormBase(wxWindow* parent, wxWindowID id, const wxSt
     wxBoxSizer* boxSizerLvl1_1 = new wxBoxSizer(wxVERTICAL);
     this->SetSizer(boxSizerLvl1_1);
     
-    wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxHORIZONTAL);
+    m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT);
+    m_notebook->SetName(wxT("m_notebook"));
     
-    boxSizerLvl1_1->Add(boxSizerLvl2_1, 0, wxALL, WXC_FROM_DIP(5));
+    boxSizerLvl1_1->Add(m_notebook, 1, wxEXPAND, WXC_FROM_DIP(5));
     
-    wxBoxSizer* boxSizerLvl3_1 = new wxBoxSizer(wxVERTICAL);
+    m_panelGeneral = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    m_notebook->AddPage(m_panelGeneral, _("General"), false);
     
-    boxSizerLvl2_1->Add(boxSizerLvl3_1, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
+    wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL);
+    m_panelGeneral->SetSizer(boxSizerLvl2_1);
     
-    wxArrayString m_pgMgrSwitchingsPropArr;
-    wxUnusedVar(m_pgMgrSwitchingsPropArr);
-    wxArrayInt m_pgMgrSwitchingsPropIntArr;
-    wxUnusedVar(m_pgMgrSwitchingsPropIntArr);
-    m_pgMgrSwitchingsProp = new wxPropertyGridManager(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxPG_STATIC_LAYOUT|wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
+    m_staticTextName = new wxStaticText(m_panelGeneral, wxID_ANY, _("Name"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
     
-    boxSizerLvl3_1->Add(m_pgMgrSwitchingsProp, 1, wxALL, WXC_FROM_DIP(5));
+    boxSizerLvl2_1->Add(m_staticTextName, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
     
-    m_pgPropTitle = m_pgMgrSwitchingsProp->Append(  new wxPropertyCategory( _("Switching properties") ) );
-    m_pgPropTitle->SetHelpString(wxT(""));
+    m_textCtrlName = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    #if wxVERSION_NUMBER >= 3000
+    m_textCtrlName->SetHint(wxT(""));
+    #endif
     
-    m_pgMgrSwitchingsPropArr.Clear();
-    m_pgMgrSwitchingsPropIntArr.Clear();
-    m_pgMgrSwitchingsPropArr.Add(_("Insert"));
-    m_pgMgrSwitchingsPropArr.Add(_("Remove"));
-    m_pgPropType = m_pgMgrSwitchingsProp->Append(  new wxEnumProperty( _("Type"), wxPG_LABEL, m_pgMgrSwitchingsPropArr, m_pgMgrSwitchingsPropIntArr, 0) );
-    m_pgPropType->SetHelpString(wxT(""));
+    boxSizerLvl2_1->Add(m_textCtrlName, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    m_textCtrlName->SetMinSize(wxSize(300,-1));
     
-    m_pgPropTime = m_pgMgrSwitchingsProp->Append(  new wxFloatProperty( _("Time (s)"), wxPG_LABEL, 0) );
-    m_pgPropTime->SetHelpString(wxT(""));
-    m_pgMgrSwitchingsProp->SetMinSize(wxSize(150,-1));
+    wxGridSizer* gridSizerLvl3_1 = new wxGridSizer(0, 2, 0, 0);
     
-    wxBoxSizer* boxSizerLvl3_3 = new wxBoxSizer(wxVERTICAL);
+    boxSizerLvl2_1->Add(gridSizerLvl3_1, 0, wxEXPAND, WXC_FROM_DIP(5));
     
-    boxSizerLvl2_1->Add(boxSizerLvl3_3, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    wxBoxSizer* boxSizerLvl4_1 = new wxBoxSizer(wxVERTICAL);
     
-    m_buttonInsert = new wxButton(this, wxID_ANY, _("Add"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    gridSizerLvl3_1->Add(boxSizerLvl4_1, 0, wxEXPAND, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_3->Add(m_buttonInsert, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    m_staticTextActivePower = new wxStaticText(m_panelGeneral, wxID_ANY, _("Active power"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
     
-    m_buttonRemove = new wxButton(this, wxID_ANY, _("Remove"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    boxSizerLvl4_1->Add(m_staticTextActivePower, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_3->Add(m_buttonRemove, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    wxBoxSizer* boxSizerLvl5_1 = new wxBoxSizer(wxHORIZONTAL);
     
-    m_buttonUp = new wxButton(this, wxID_ANY, _("Up"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    boxSizerLvl4_1->Add(boxSizerLvl5_1, 0, wxEXPAND, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_3->Add(m_buttonUp, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    m_textCtrlActivePower = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    #if wxVERSION_NUMBER >= 3000
+    m_textCtrlActivePower->SetHint(wxT(""));
+    #endif
     
-    m_buttonDown = new wxButton(this, wxID_ANY, _("Down"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    boxSizerLvl5_1->Add(m_textCtrlActivePower, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_3->Add(m_buttonDown, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    wxArrayString m_choiceActivePowerArr;
+    m_choiceActivePowerArr.Add(wxT("p.u."));
+    m_choiceActivePowerArr.Add(wxT("W"));
+    m_choiceActivePowerArr.Add(wxT("kW"));
+    m_choiceActivePowerArr.Add(wxT("MW"));
+    m_choiceActivePower = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceActivePowerArr, 0);
+    m_choiceActivePower->SetSelection(3);
     
-    wxBoxSizer* boxSizerLvl3_2 = new wxBoxSizer(wxVERTICAL);
+    boxSizerLvl5_1->Add(m_choiceActivePower, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
     
-    boxSizerLvl2_1->Add(boxSizerLvl3_2, 0, wxALL, WXC_FROM_DIP(5));
+    wxBoxSizer* boxSizerLvl4_2 = new wxBoxSizer(wxVERTICAL);
     
-    m_staticTextSwList = new wxStaticText(this, wxID_ANY, _("Switching list"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    gridSizerLvl3_1->Add(boxSizerLvl4_2, 0, wxEXPAND, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_2->Add(m_staticTextSwList, 0, wxLEFT|wxRIGHT|wxTOP, WXC_FROM_DIP(5));
+    m_staticTextReactivePower = new wxStaticText(m_panelGeneral, wxID_ANY, _("Reactive power"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
     
-    m_listCtrlSwitchings = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxLC_REPORT);
+    boxSizerLvl4_2->Add(m_staticTextReactivePower, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
     
-    boxSizerLvl3_2->Add(m_listCtrlSwitchings, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
+    wxBoxSizer* boxSizerLvl5_2 = new wxBoxSizer(wxHORIZONTAL);
+    
+    boxSizerLvl4_2->Add(boxSizerLvl5_2, 0, wxEXPAND, WXC_FROM_DIP(5));
+    
+    m_textCtrlReactivePower = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    #if wxVERSION_NUMBER >= 3000
+    m_textCtrlReactivePower->SetHint(wxT(""));
+    #endif
+    
+    boxSizerLvl5_2->Add(m_textCtrlReactivePower, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    
+    wxArrayString m_choiceReactivePowerArr;
+    m_choiceReactivePowerArr.Add(wxT("p.u."));
+    m_choiceReactivePowerArr.Add(wxT("VAr"));
+    m_choiceReactivePowerArr.Add(wxT("kVAr"));
+    m_choiceReactivePowerArr.Add(wxT("MVAr"));
+    m_choiceReactivePower = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceReactivePowerArr, 0);
+    m_choiceReactivePower->SetSelection(3);
+    
+    boxSizerLvl5_2->Add(m_choiceReactivePower, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
+    
+    m_staticTextType = new wxStaticText(m_panelGeneral, wxID_ANY, _("Load type"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl2_1->Add(m_staticTextType, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    
+    wxArrayString m_choiceTypeArr;
+    m_choiceTypeArr.Add(wxT("Constant power"));
+    m_choiceTypeArr.Add(wxT("Constant impedance"));
+    m_choiceType = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTypeArr, 0);
+    m_choiceType->SetSelection(0);
+    
+    boxSizerLvl2_1->Add(m_choiceType, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
     
     wxBoxSizer* boxSizerBottomButtons = new wxBoxSizer(wxHORIZONTAL);
     
-    boxSizerLvl1_1->Add(boxSizerBottomButtons, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    boxSizerLvl1_1->Add(boxSizerBottomButtons, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
+    
+    m_buttonStabButton = new wxButton(this, wxID_ANY, _("Stability"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerBottomButtons->Add(m_buttonStabButton, 0, wxALL|wxALIGN_LEFT, WXC_FROM_DIP(5));
+    
+    boxSizerBottomButtons->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5));
     
     m_buttonOK = new wxButton(this, wxID_ANY, _("OK"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
     
     boxSizerBottomButtons->Add(m_buttonOK, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
-    m_buttonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    m_ButtonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
     
-    boxSizerBottomButtons->Add(m_buttonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    boxSizerBottomButtons->Add(m_ButtonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
-    SetName(wxT("SwitchingFormBase"));
+    
+    #if wxVERSION_NUMBER >= 2900
+    if(!wxPersistenceManager::Get().Find(m_notebook)){
+        wxPersistenceManager::Get().RegisterAndRestore(m_notebook);
+    } else {
+        wxPersistenceManager::Get().Restore(m_notebook);
+    }
+    #endif
+    
+    SetName(wxT("LoadFormBase"));
     SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
@@ -2098,31 +2148,21 @@ SwitchingFormBase::SwitchingFormBase(wxWindow* parent, wxWindowID id, const wxSt
     }
 #endif
     // Connect events
-    m_pgMgrSwitchingsProp->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(SwitchingFormBase::OnChangeProperties), NULL, this);
-    m_buttonInsert->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnInsertButtonClick), NULL, this);
-    m_buttonRemove->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnRemoveButtonClick), NULL, this);
-    m_buttonUp->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnUpButtonClick), NULL, this);
-    m_buttonDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnDownButtonClick), NULL, this);
-    m_listCtrlSwitchings->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(SwitchingFormBase::OnSelectItem), NULL, this);
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnOKButtonClick), NULL, this);
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnOnButtonClick), NULL, this);
+    m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-SwitchingFormBase::~SwitchingFormBase()
+LoadFormBase::~LoadFormBase()
 {
-    m_pgMgrSwitchingsProp->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(SwitchingFormBase::OnChangeProperties), NULL, this);
-    m_buttonInsert->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnInsertButtonClick), NULL, this);
-    m_buttonRemove->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnRemoveButtonClick), NULL, this);
-    m_buttonUp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnUpButtonClick), NULL, this);
-    m_buttonDown->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnDownButtonClick), NULL, this);
-    m_listCtrlSwitchings->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(SwitchingFormBase::OnSelectItem), NULL, this);
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnOKButtonClick), NULL, this);
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnOnButtonClick), NULL, this);
+    m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
     : wxDialog(parent, id, title, pos, size, style)
 {
     if ( !bBitmapLoaded ) {
@@ -2162,35 +2202,6 @@ LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& titl
     
     boxSizerLvl2_1->Add(gridSizerLvl3_1, 0, wxEXPAND, WXC_FROM_DIP(5));
     
-    wxBoxSizer* boxSizerLvl4_1 = new wxBoxSizer(wxVERTICAL);
-    
-    gridSizerLvl3_1->Add(boxSizerLvl4_1, 0, wxEXPAND, WXC_FROM_DIP(5));
-    
-    m_staticTextActivePower = new wxStaticText(m_panelGeneral, wxID_ANY, _("Active power"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
-    
-    boxSizerLvl4_1->Add(m_staticTextActivePower, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
-    
-    wxBoxSizer* boxSizerLvl5_1 = new wxBoxSizer(wxHORIZONTAL);
-    
-    boxSizerLvl4_1->Add(boxSizerLvl5_1, 0, wxEXPAND, WXC_FROM_DIP(5));
-    
-    m_textCtrlActivePower = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
-    #if wxVERSION_NUMBER >= 3000
-    m_textCtrlActivePower->SetHint(wxT(""));
-    #endif
-    
-    boxSizerLvl5_1->Add(m_textCtrlActivePower, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
-    
-    wxArrayString m_choiceActivePowerArr;
-    m_choiceActivePowerArr.Add(wxT("p.u."));
-    m_choiceActivePowerArr.Add(wxT("W"));
-    m_choiceActivePowerArr.Add(wxT("kW"));
-    m_choiceActivePowerArr.Add(wxT("MW"));
-    m_choiceActivePower = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceActivePowerArr, 0);
-    m_choiceActivePower->SetSelection(3);
-    
-    boxSizerLvl5_1->Add(m_choiceActivePower, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
-    
     wxBoxSizer* boxSizerLvl4_2 = new wxBoxSizer(wxVERTICAL);
     
     gridSizerLvl3_1->Add(boxSizerLvl4_2, 0, wxEXPAND, WXC_FROM_DIP(5));
@@ -2220,18 +2231,6 @@ LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& titl
     
     boxSizerLvl5_2->Add(m_choiceReactivePower, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
     
-    m_staticTextType = new wxStaticText(m_panelGeneral, wxID_ANY, _("Load type"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
-    
-    boxSizerLvl2_1->Add(m_staticTextType, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
-    
-    wxArrayString m_choiceTypeArr;
-    m_choiceTypeArr.Add(wxT("Constant power"));
-    m_choiceTypeArr.Add(wxT("Constant impedance"));
-    m_choiceType = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceTypeArr, 0);
-    m_choiceType->SetSelection(0);
-    
-    boxSizerLvl2_1->Add(m_choiceType, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5));
-    
     wxBoxSizer* boxSizerBottomButtons = new wxBoxSizer(wxHORIZONTAL);
     
     boxSizerLvl1_1->Add(boxSizerBottomButtons, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
@@ -2246,9 +2245,9 @@ LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& titl
     
     boxSizerBottomButtons->Add(m_buttonOK, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
-    m_ButtonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    m_buttonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
     
-    boxSizerBottomButtons->Add(m_ButtonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    boxSizerBottomButtons->Add(m_buttonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
     
     #if wxVERSION_NUMBER >= 2900
@@ -2259,7 +2258,7 @@ LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& titl
     }
     #endif
     
-    SetName(wxT("LoadFormBase"));
+    SetName(wxT("ReactiveShuntElementFormBase"));
     SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
@@ -2277,21 +2276,150 @@ LoadFormBase::LoadFormBase(wxWindow* parent, wxWindowID id, const wxString& titl
     }
 #endif
     // Connect events
-    m_buttonStabButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnOnButtonClick), NULL, this);
-    m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnOKButtonClick), NULL, this);
+    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-LoadFormBase::~LoadFormBase()
+ReactiveShuntElementFormBase::~ReactiveShuntElementFormBase()
 {
-    m_buttonStabButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnOnButtonClick), NULL, this);
-    m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(LoadFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnOKButtonClick), NULL, this);
+    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+SwitchingFormBase::SwitchingFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+    : wxDialog(parent, id, title, pos, size, style)
+{
+    if ( !bBitmapLoaded ) {
+        // We need to initialise the default bitmap handler
+        wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+        wxC9EE9InitBitmapResources();
+        bBitmapLoaded = true;
+    }
+    
+    wxBoxSizer* boxSizerLvl1_1 = new wxBoxSizer(wxVERTICAL);
+    this->SetSizer(boxSizerLvl1_1);
+    
+    wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxHORIZONTAL);
+    
+    boxSizerLvl1_1->Add(boxSizerLvl2_1, 0, wxALL, WXC_FROM_DIP(5));
+    
+    wxBoxSizer* boxSizerLvl3_1 = new wxBoxSizer(wxVERTICAL);
+    
+    boxSizerLvl2_1->Add(boxSizerLvl3_1, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
+    
+    wxArrayString m_pgMgrSwitchingsPropArr;
+    wxUnusedVar(m_pgMgrSwitchingsPropArr);
+    wxArrayInt m_pgMgrSwitchingsPropIntArr;
+    wxUnusedVar(m_pgMgrSwitchingsPropIntArr);
+    m_pgMgrSwitchingsProp = new wxPropertyGridManager(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxPG_STATIC_LAYOUT|wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED);
+    
+    boxSizerLvl3_1->Add(m_pgMgrSwitchingsProp, 1, wxALL, WXC_FROM_DIP(5));
+    
+    m_pgPropTitle = m_pgMgrSwitchingsProp->Append(  new wxPropertyCategory( _("Switching properties") ) );
+    m_pgPropTitle->SetHelpString(wxT(""));
+    
+    m_pgMgrSwitchingsPropArr.Clear();
+    m_pgMgrSwitchingsPropIntArr.Clear();
+    m_pgMgrSwitchingsPropArr.Add(_("Insert"));
+    m_pgMgrSwitchingsPropArr.Add(_("Remove"));
+    m_pgPropType = m_pgMgrSwitchingsProp->Append(  new wxEnumProperty( _("Type"), wxPG_LABEL, m_pgMgrSwitchingsPropArr, m_pgMgrSwitchingsPropIntArr, 0) );
+    m_pgPropType->SetHelpString(wxT(""));
+    
+    m_pgPropTime = m_pgMgrSwitchingsProp->Append(  new wxFloatProperty( _("Time (s)"), wxPG_LABEL, 0) );
+    m_pgPropTime->SetHelpString(wxT(""));
+    m_pgMgrSwitchingsProp->SetMinSize(wxSize(150,-1));
+    
+    wxBoxSizer* boxSizerLvl3_3 = new wxBoxSizer(wxVERTICAL);
+    
+    boxSizerLvl2_1->Add(boxSizerLvl3_3, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    
+    m_buttonInsert = new wxButton(this, wxID_ANY, _("Add"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl3_3->Add(m_buttonInsert, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    m_buttonRemove = new wxButton(this, wxID_ANY, _("Remove"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl3_3->Add(m_buttonRemove, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    m_buttonUp = new wxButton(this, wxID_ANY, _("Up"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl3_3->Add(m_buttonUp, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    m_buttonDown = new wxButton(this, wxID_ANY, _("Down"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl3_3->Add(m_buttonDown, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    wxBoxSizer* boxSizerLvl3_2 = new wxBoxSizer(wxVERTICAL);
+    
+    boxSizerLvl2_1->Add(boxSizerLvl3_2, 0, wxALL, WXC_FROM_DIP(5));
+    
+    m_staticTextSwList = new wxStaticText(this, wxID_ANY, _("Switching list"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl3_2->Add(m_staticTextSwList, 0, wxLEFT|wxRIGHT|wxTOP, WXC_FROM_DIP(5));
+    
+    m_listCtrlSwitchings = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxLC_REPORT);
+    
+    boxSizerLvl3_2->Add(m_listCtrlSwitchings, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
+    
+    wxBoxSizer* boxSizerBottomButtons = new wxBoxSizer(wxHORIZONTAL);
+    
+    boxSizerLvl1_1->Add(boxSizerBottomButtons, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    m_buttonOK = new wxButton(this, wxID_ANY, _("OK"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerBottomButtons->Add(m_buttonOK, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    m_buttonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    
+    boxSizerBottomButtons->Add(m_buttonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    
+    SetName(wxT("SwitchingFormBase"));
+    SetSize(-1,-1);
+    if (GetSizer()) {
+         GetSizer()->Fit(this);
+    }
+    if(GetParent()) {
+        CentreOnParent(wxBOTH);
+    } else {
+        CentreOnScreen(wxBOTH);
+    }
+#if wxVERSION_NUMBER >= 2900
+    if(!wxPersistenceManager::Get().Find(this)) {
+        wxPersistenceManager::Get().RegisterAndRestore(this);
+    } else {
+        wxPersistenceManager::Get().Restore(this);
+    }
+#endif
+    // Connect events
+    m_pgMgrSwitchingsProp->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(SwitchingFormBase::OnChangeProperties), NULL, this);
+    m_buttonInsert->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnInsertButtonClick), NULL, this);
+    m_buttonRemove->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnRemoveButtonClick), NULL, this);
+    m_buttonUp->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnUpButtonClick), NULL, this);
+    m_buttonDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnDownButtonClick), NULL, this);
+    m_listCtrlSwitchings->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(SwitchingFormBase::OnSelectItem), NULL, this);
+    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnOKButtonClick), NULL, this);
+    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnCancelButtonClick), NULL, this);
+    
+}
+
+SwitchingFormBase::~SwitchingFormBase()
+{
+    m_pgMgrSwitchingsProp->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(SwitchingFormBase::OnChangeProperties), NULL, this);
+    m_buttonInsert->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnInsertButtonClick), NULL, this);
+    m_buttonRemove->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnRemoveButtonClick), NULL, this);
+    m_buttonUp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnUpButtonClick), NULL, this);
+    m_buttonDown->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnDownButtonClick), NULL, this);
+    m_listCtrlSwitchings->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(SwitchingFormBase::OnSelectItem), NULL, this);
+    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnOKButtonClick), NULL, this);
+    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SwitchingFormBase::OnCancelButtonClick), NULL, this);
+    
+}
+
+IndMotorFormBase::IndMotorFormBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
     : wxDialog(parent, id, title, pos, size, style)
 {
     if ( !bBitmapLoaded ) {
@@ -2331,6 +2459,35 @@ ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxW
     
     boxSizerLvl2_1->Add(gridSizerLvl3_1, 0, wxEXPAND, WXC_FROM_DIP(5));
     
+    wxBoxSizer* boxSizerLvl4_1 = new wxBoxSizer(wxVERTICAL);
+    
+    gridSizerLvl3_1->Add(boxSizerLvl4_1, 0, wxEXPAND, WXC_FROM_DIP(5));
+    
+    m_staticTextActivePower = new wxStaticText(m_panelGeneral, wxID_ANY, _("Active power"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    
+    boxSizerLvl4_1->Add(m_staticTextActivePower, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    
+    wxBoxSizer* boxSizerLvl5_1 = new wxBoxSizer(wxHORIZONTAL);
+    
+    boxSizerLvl4_1->Add(boxSizerLvl5_1, 0, wxEXPAND, WXC_FROM_DIP(5));
+    
+    m_textCtrlActivePower = new wxTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0);
+    #if wxVERSION_NUMBER >= 3000
+    m_textCtrlActivePower->SetHint(wxT(""));
+    #endif
+    
+    boxSizerLvl5_1->Add(m_textCtrlActivePower, 1, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
+    
+    wxArrayString m_choiceActivePowerArr;
+    m_choiceActivePowerArr.Add(wxT("p.u."));
+    m_choiceActivePowerArr.Add(wxT("W"));
+    m_choiceActivePowerArr.Add(wxT("kW"));
+    m_choiceActivePowerArr.Add(wxT("MW"));
+    m_choiceActivePower = new wxChoice(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_choiceActivePowerArr, 0);
+    m_choiceActivePower->SetSelection(3);
+    
+    boxSizerLvl5_1->Add(m_choiceActivePower, 0, wxLEFT|wxRIGHT|wxBOTTOM, WXC_FROM_DIP(5));
+    
     wxBoxSizer* boxSizerLvl4_2 = new wxBoxSizer(wxVERTICAL);
     
     gridSizerLvl3_1->Add(boxSizerLvl4_2, 0, wxEXPAND, WXC_FROM_DIP(5));
@@ -2374,9 +2531,9 @@ ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxW
     
     boxSizerBottomButtons->Add(m_buttonOK, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
-    m_buttonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
+    m_ButtonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0);
     
-    boxSizerBottomButtons->Add(m_buttonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
+    boxSizerBottomButtons->Add(m_ButtonCancel, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
     
     #if wxVERSION_NUMBER >= 2900
@@ -2387,7 +2544,7 @@ ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxW
     }
     #endif
     
-    SetName(wxT("ReactiveShuntElementFormBase"));
+    SetName(wxT("IndMotorFormBase"));
     SetSize(-1,-1);
     if (GetSizer()) {
          GetSizer()->Fit(this);
@@ -2405,16 +2562,16 @@ ReactiveShuntElementFormBase::ReactiveShuntElementFormBase(wxWindow* parent, wxW
     }
 #endif
     // Connect events
-    m_buttonStabButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnOKButtonClick), NULL, this);
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnOKButtonClick), NULL, this);
+    m_ButtonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnCancelButtonClick), NULL, this);
     
 }
 
-ReactiveShuntElementFormBase::~ReactiveShuntElementFormBase()
+IndMotorFormBase::~IndMotorFormBase()
 {
-    m_buttonStabButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnStabilityButtonClick), NULL, this);
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnOKButtonClick), NULL, this);
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ReactiveShuntElementFormBase::OnCancelButtonClick), NULL, this);
+    m_buttonStabButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnStabilityButtonClick), NULL, this);
+    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnOKButtonClick), NULL, this);
+    m_ButtonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(IndMotorFormBase::OnCancelButtonClick), NULL, this);
     
 }
diff --git a/Project/ElementForm.h b/Project/ElementForm.h
index 52d5e00..1af839c 100644
--- a/Project/ElementForm.h
+++ b/Project/ElementForm.h
@@ -145,7 +145,7 @@ public:
 };
 
 
-class GeneratorFormBase : public wxDialog
+class SyncMachineFormBase : public wxDialog
 {
 protected:
     wxNotebook* m_notebook;
@@ -239,8 +239,8 @@ public:
     wxButton* GetButtonStab() { return m_buttonStab; }
     wxButton* GetButtonOK() { return m_buttonOK; }
     wxButton* GetButtonCancel() { return m_ButtonCancel; }
-    GeneratorFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
-    virtual ~GeneratorFormBase();
+    SyncMachineFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
+    virtual ~SyncMachineFormBase();
 };
 
 
@@ -549,47 +549,6 @@ public:
 };
 
 
-class SwitchingFormBase : public wxDialog
-{
-protected:
-    wxPropertyGridManager* m_pgMgrSwitchingsProp;
-    wxPGProperty* m_pgPropTitle;
-    wxPGProperty* m_pgPropType;
-    wxPGProperty* m_pgPropTime;
-    wxButton* m_buttonInsert;
-    wxButton* m_buttonRemove;
-    wxButton* m_buttonUp;
-    wxButton* m_buttonDown;
-    wxStaticText* m_staticTextSwList;
-    wxListCtrl* m_listCtrlSwitchings;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
-
-protected:
-    virtual void OnChangeProperties(wxPropertyGridEvent& event) { event.Skip(); }
-    virtual void OnInsertButtonClick(wxCommandEvent& event) { event.Skip(); }
-    virtual void OnRemoveButtonClick(wxCommandEvent& event) { event.Skip(); }
-    virtual void OnUpButtonClick(wxCommandEvent& event) { event.Skip(); }
-    virtual void OnDownButtonClick(wxCommandEvent& event) { event.Skip(); }
-    virtual void OnSelectItem(wxListEvent& event) { event.Skip(); }
-    virtual void OnOKButtonClick(wxCommandEvent& event) { event.Skip(); }
-    virtual void OnCancelButtonClick(wxCommandEvent& event) { event.Skip(); }
-
-public:
-    wxPropertyGridManager* GetPgMgrSwitchingsProp() { return m_pgMgrSwitchingsProp; }
-    wxButton* GetButtonInsert() { return m_buttonInsert; }
-    wxButton* GetButtonRemove() { return m_buttonRemove; }
-    wxButton* GetButtonUp() { return m_buttonUp; }
-    wxButton* GetButtonDown() { return m_buttonDown; }
-    wxStaticText* GetStaticTextSwList() { return m_staticTextSwList; }
-    wxListCtrl* GetListCtrlSwitchings() { return m_listCtrlSwitchings; }
-    wxButton* GetButtonOK() { return m_buttonOK; }
-    wxButton* GetButtonCancel() { return m_buttonCancel; }
-    SwitchingFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Switching"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
-    virtual ~SwitchingFormBase();
-};
-
-
 class LoadFormBase : public wxDialog
 {
 protected:
@@ -669,4 +628,86 @@ public:
     virtual ~ReactiveShuntElementFormBase();
 };
 
+
+class SwitchingFormBase : public wxDialog
+{
+protected:
+    wxPropertyGridManager* m_pgMgrSwitchingsProp;
+    wxPGProperty* m_pgPropTitle;
+    wxPGProperty* m_pgPropType;
+    wxPGProperty* m_pgPropTime;
+    wxButton* m_buttonInsert;
+    wxButton* m_buttonRemove;
+    wxButton* m_buttonUp;
+    wxButton* m_buttonDown;
+    wxStaticText* m_staticTextSwList;
+    wxListCtrl* m_listCtrlSwitchings;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonCancel;
+
+protected:
+    virtual void OnChangeProperties(wxPropertyGridEvent& event) { event.Skip(); }
+    virtual void OnInsertButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnRemoveButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnUpButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnDownButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnSelectItem(wxListEvent& event) { event.Skip(); }
+    virtual void OnOKButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { event.Skip(); }
+
+public:
+    wxPropertyGridManager* GetPgMgrSwitchingsProp() { return m_pgMgrSwitchingsProp; }
+    wxButton* GetButtonInsert() { return m_buttonInsert; }
+    wxButton* GetButtonRemove() { return m_buttonRemove; }
+    wxButton* GetButtonUp() { return m_buttonUp; }
+    wxButton* GetButtonDown() { return m_buttonDown; }
+    wxStaticText* GetStaticTextSwList() { return m_staticTextSwList; }
+    wxListCtrl* GetListCtrlSwitchings() { return m_listCtrlSwitchings; }
+    wxButton* GetButtonOK() { return m_buttonOK; }
+    wxButton* GetButtonCancel() { return m_buttonCancel; }
+    SwitchingFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Switching"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
+    virtual ~SwitchingFormBase();
+};
+
+
+class IndMotorFormBase : public wxDialog
+{
+protected:
+    wxNotebook* m_notebook;
+    wxPanel* m_panelGeneral;
+    wxStaticText* m_staticTextName;
+    wxTextCtrl* m_textCtrlName;
+    wxStaticText* m_staticTextActivePower;
+    wxTextCtrl* m_textCtrlActivePower;
+    wxChoice* m_choiceActivePower;
+    wxStaticText* m_staticTextReactivePower;
+    wxTextCtrl* m_textCtrlReactivePower;
+    wxChoice* m_choiceReactivePower;
+    wxButton* m_buttonStabButton;
+    wxButton* m_buttonOK;
+    wxButton* m_ButtonCancel;
+
+protected:
+    virtual void OnStabilityButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnOKButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { event.Skip(); }
+
+public:
+    wxStaticText* GetStaticTextName() { return m_staticTextName; }
+    wxTextCtrl* GetTextCtrlName() { return m_textCtrlName; }
+    wxStaticText* GetStaticTextActivePower() { return m_staticTextActivePower; }
+    wxTextCtrl* GetTextCtrlActivePower() { return m_textCtrlActivePower; }
+    wxChoice* GetChoiceActivePower() { return m_choiceActivePower; }
+    wxStaticText* GetStaticTextReactivePower() { return m_staticTextReactivePower; }
+    wxTextCtrl* GetTextCtrlReactivePower() { return m_textCtrlReactivePower; }
+    wxChoice* GetChoiceReactivePower() { return m_choiceReactivePower; }
+    wxPanel* GetPanelGeneral() { return m_panelGeneral; }
+    wxNotebook* GetNotebook() { return m_notebook; }
+    wxButton* GetButtonStabButton() { return m_buttonStabButton; }
+    wxButton* GetButtonOK() { return m_buttonOK; }
+    wxButton* GetButtonCancel() { return m_ButtonCancel; }
+    IndMotorFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Motor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE);
+    virtual ~IndMotorFormBase();
+};
+
 #endif
diff --git a/Project/ElementForm.wxcp b/Project/ElementForm.wxcp
index 3925291..cb77338 100644
--- a/Project/ElementForm.wxcp
+++ b/Project/ElementForm.wxcp
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "m_generatedFilesDir": ".",
-  "m_objCounter": 1318,
+  "m_objCounter": 1508,
   "m_includeFiles": [],
   "m_bitmapFunction": "wxC9EE9InitBitmapResources",
   "m_bitmapsFile": "ElementFormBitmaps.cpp",
@@ -4104,7 +4104,7 @@
     }, {
      "type": "string",
      "m_label": "Name:",
-     "m_value": "GeneratorFormBase"
+     "m_value": "SyncMachineFormBase"
     }, {
      "type": "multi-string",
      "m_label": "Tooltip:",
@@ -4165,11 +4165,11 @@
     }, {
      "type": "string",
      "m_label": "Inherited Class",
-     "m_value": "GeneratorForm"
+     "m_value": "SyncMachineForm"
     }, {
      "type": "string",
      "m_label": "File:",
-     "m_value": "GeneratorForm"
+     "m_value": "SyncMachineForm"
     }, {
      "type": "string",
      "m_label": "Class Decorator",
@@ -21827,7 +21827,7 @@
     }, {
      "type": "string",
      "m_label": "Name:",
-     "m_value": "SwitchingFormBase"
+     "m_value": "LoadFormBase"
     }, {
      "type": "multi-string",
      "m_label": "Tooltip:",
@@ -21875,7 +21875,7 @@
     }, {
      "type": "string",
      "m_label": "Title:",
-     "m_value": "Switching"
+     "m_value": "Load"
     }, {
      "type": "virtualFolderPicker",
      "m_label": "Virtual Folder:",
@@ -21888,11 +21888,11 @@
     }, {
      "type": "string",
      "m_label": "Inherited Class",
-     "m_value": "SwitchingForm"
+     "m_value": "LoadForm"
     }, {
      "type": "string",
      "m_label": "File:",
-     "m_value": "SwitchingForm"
+     "m_value": "LoadForm"
     }, {
      "type": "string",
      "m_label": "Class Decorator",
@@ -21947,156 +21947,204 @@
       }],
      "m_events": [],
      "m_children": [{
-       "m_type": 4401,
-       "proportion": 0,
+       "m_type": 4442,
+       "proportion": 1,
        "border": 5,
        "gbSpan": "1,1",
        "gbPosition": "0,0",
-       "m_styles": [],
-       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+       "m_styles": ["wxBK_DEFAULT"],
+       "m_sizerFlags": ["wxEXPAND"],
        "m_properties": [{
+         "type": "winid",
+         "m_label": "ID:",
+         "m_winid": "wxID_ANY"
+        }, {
+         "type": "string",
+         "m_label": "Size:",
+         "m_value": "-1,-1"
+        }, {
          "type": "string",
          "m_label": "Minimum Size:",
          "m_value": "-1,-1"
         }, {
          "type": "string",
          "m_label": "Name:",
-         "m_value": "boxSizerLvl2_1"
+         "m_value": "m_notebook"
+        }, {
+         "type": "multi-string",
+         "m_label": "Tooltip:",
+         "m_value": ""
+        }, {
+         "type": "colour",
+         "m_label": "Bg Colour:",
+         "colour": "<Default>"
+        }, {
+         "type": "colour",
+         "m_label": "Fg Colour:",
+         "colour": "<Default>"
+        }, {
+         "type": "font",
+         "m_label": "Font:",
+         "m_value": ""
+        }, {
+         "type": "bool",
+         "m_label": "Hidden",
+         "m_value": false
+        }, {
+         "type": "bool",
+         "m_label": "Disabled",
+         "m_value": false
+        }, {
+         "type": "bool",
+         "m_label": "Focused",
+         "m_value": false
         }, {
          "type": "string",
-         "m_label": "Style:",
+         "m_label": "Class Name:",
          "m_value": ""
         }, {
-         "type": "choice",
-         "m_label": "Orientation:",
-         "m_selection": 1,
-         "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+         "type": "string",
+         "m_label": "Include File:",
+         "m_value": ""
+        }, {
+         "type": "string",
+         "m_label": "Style:",
+         "m_value": ""
         }],
        "m_events": [],
        "m_children": [{
-         "m_type": 4401,
+         "m_type": 4441,
          "proportion": 0,
          "border": 5,
          "gbSpan": "1,1",
          "gbPosition": "0,0",
-         "m_styles": [],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+         "m_styles": ["wxTAB_TRAVERSAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
          "m_properties": [{
+           "type": "winid",
+           "m_label": "ID:",
+           "m_winid": "wxID_ANY"
+          }, {
+           "type": "string",
+           "m_label": "Size:",
+           "m_value": "-1,-1"
+          }, {
            "type": "string",
            "m_label": "Minimum Size:",
            "m_value": "-1,-1"
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "boxSizerLvl3_1"
+           "m_value": "m_panelGeneral"
+          }, {
+           "type": "multi-string",
+           "m_label": "Tooltip:",
+           "m_value": ""
+          }, {
+           "type": "colour",
+           "m_label": "Bg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "colour",
+           "m_label": "Fg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "font",
+           "m_label": "Font:",
+           "m_value": ""
+          }, {
+           "type": "bool",
+           "m_label": "Hidden",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Disabled",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Focused",
+           "m_value": false
+          }, {
+           "type": "string",
+           "m_label": "Class Name:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Include File:",
+           "m_value": ""
           }, {
            "type": "string",
            "m_label": "Style:",
            "m_value": ""
           }, {
-           "type": "choice",
-           "m_label": "Orientation:",
-           "m_selection": 0,
-           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+           "type": "string",
+           "m_label": "Label:",
+           "m_value": "General"
+          }, {
+           "type": "bitmapPicker",
+           "m_label": "Bitmap File:",
+           "m_path": ""
+          }, {
+           "type": "bool",
+           "m_label": "Selected",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Null Page",
+           "m_value": false
           }],
          "m_events": [],
          "m_children": [{
-           "m_type": 4485,
+           "m_type": 4401,
            "proportion": 1,
            "border": 5,
            "gbSpan": "1,1",
            "gbPosition": "0,0",
-           "m_styles": ["wxPG_STATIC_LAYOUT", "wxPG_SPLITTER_AUTO_CENTER", "wxPG_BOLD_MODIFIED"],
-           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+           "m_styles": [],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
            "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
              "type": "string",
              "m_label": "Minimum Size:",
-             "m_value": "150,-1"
+             "m_value": "-1,-1"
             }, {
              "type": "string",
              "m_label": "Name:",
-             "m_value": "m_pgMgrSwitchingsProp"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
+             "m_value": "boxSizerLvl2_1"
             }, {
              "type": "string",
              "m_label": "Style:",
              "m_value": ""
             }, {
-             "type": "integer",
-             "m_label": "Sash Position:",
-             "m_value": -1
-            }, {
-             "type": "bool",
-             "m_label": "Set Splitter Left:",
-             "m_value": false
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_PG_CHANGED",
-             "m_eventClass": "wxPropertyGridEvent",
-             "m_eventHandler": "wxPropertyGridEventHandler",
-             "m_functionNameAndSignature": "OnChangeProperties(wxPropertyGridEvent& event)",
-             "m_description": "Respond to wxEVT_PG_CHANGED event, generated when property value has been changed by the user",
-             "m_noBody": false
+             "type": "choice",
+             "m_label": "Orientation:",
+             "m_selection": 0,
+             "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
             }],
+           "m_events": [],
            "m_children": [{
-             "m_type": 4486,
+             "m_type": 4405,
              "proportion": 0,
              "border": 5,
              "gbSpan": "1,1",
              "gbPosition": "0,0",
              "m_styles": [],
-             "m_sizerFlags": [],
+             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
              "m_properties": [{
+               "type": "winid",
+               "m_label": "ID:",
+               "m_winid": "wxID_ANY"
+              }, {
                "type": "string",
-               "m_label": "Name:",
-               "m_value": "m_pgPropTitle"
+               "m_label": "Size:",
+               "m_value": "-1,-1"
               }, {
                "type": "string",
-               "m_label": "Label:",
-               "m_value": "Switching properties"
+               "m_label": "Minimum Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_staticTextName"
               }, {
                "type": "multi-string",
                "m_label": "Tooltip:",
@@ -22106,62 +22154,72 @@
                "m_label": "Bg Colour:",
                "colour": "<Default>"
               }, {
-               "type": "choice",
-               "m_label": "Property Editor Control",
-               "m_selection": 0,
-               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
-              }, {
-               "type": "choice",
-               "m_label": "Kind:",
-               "m_selection": 0,
-               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+               "type": "colour",
+               "m_label": "Fg Colour:",
+               "colour": "<Default>"
               }, {
-               "type": "string",
-               "m_label": "String Value",
+               "type": "font",
+               "m_label": "Font:",
                "m_value": ""
               }, {
-               "type": "multi-string",
-               "m_label": "Choices:",
-               "m_value": ""
+               "type": "bool",
+               "m_label": "Hidden",
+               "m_value": false
               }, {
-               "type": "multi-string",
-               "m_label": "Array Integer Values",
-               "m_value": ""
+               "type": "bool",
+               "m_label": "Disabled",
+               "m_value": false
               }, {
                "type": "bool",
-               "m_label": "Bool Value",
-               "m_value": true
+               "m_label": "Focused",
+               "m_value": false
               }, {
                "type": "string",
-               "m_label": "Wildcard",
+               "m_label": "Class Name:",
                "m_value": ""
               }, {
-               "type": "font",
-               "m_label": "Font:",
+               "type": "string",
+               "m_label": "Include File:",
                "m_value": ""
               }, {
-               "type": "colour",
-               "m_label": "Initial Colour",
-               "colour": "<Default>"
+               "type": "string",
+               "m_label": "Style:",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Label:",
+               "m_value": "Name"
+              }, {
+               "type": "string",
+               "m_label": "Wrap:",
+               "m_value": "-1"
               }],
              "m_events": [],
              "m_children": []
             }, {
-             "m_type": 4486,
+             "m_type": 4406,
              "proportion": 0,
              "border": 5,
              "gbSpan": "1,1",
              "gbPosition": "0,0",
              "m_styles": [],
-             "m_sizerFlags": [],
+             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
              "m_properties": [{
+               "type": "winid",
+               "m_label": "ID:",
+               "m_winid": "wxID_ANY"
+              }, {
                "type": "string",
-               "m_label": "Name:",
-               "m_value": "m_pgPropType"
+               "m_label": "Size:",
+               "m_value": "-1,-1"
               }, {
                "type": "string",
-               "m_label": "Label:",
-               "m_value": "Type"
+               "m_label": "Minimum Size:",
+               "m_value": "300,-1"
+              }, {
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_textCtrlName"
               }, {
                "type": "multi-string",
                "m_label": "Tooltip:",
@@ -22171,62 +22229,709 @@
                "m_label": "Bg Colour:",
                "colour": "<Default>"
               }, {
-               "type": "choice",
-               "m_label": "Property Editor Control",
-               "m_selection": 0,
-               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
+               "type": "colour",
+               "m_label": "Fg Colour:",
+               "colour": "<Default>"
               }, {
-               "type": "choice",
-               "m_label": "Kind:",
-               "m_selection": 9,
-               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+               "type": "font",
+               "m_label": "Font:",
+               "m_value": ""
+              }, {
+               "type": "bool",
+               "m_label": "Hidden",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Disabled",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Focused",
+               "m_value": false
               }, {
                "type": "string",
-               "m_label": "String Value",
+               "m_label": "Class Name:",
                "m_value": ""
               }, {
-               "type": "multi-string",
-               "m_label": "Choices:",
-               "m_value": "Insert;Remove"
-              }, {
-               "type": "multi-string",
-               "m_label": "Array Integer Values",
+               "type": "string",
+               "m_label": "Include File:",
                "m_value": ""
               }, {
-               "type": "bool",
-               "m_label": "Bool Value",
-               "m_value": true
+               "type": "string",
+               "m_label": "Style:",
+               "m_value": ""
               }, {
                "type": "string",
-               "m_label": "Wildcard",
+               "m_label": "Value:",
                "m_value": ""
               }, {
-               "type": "font",
-               "m_label": "Font:",
+               "type": "string",
+               "m_label": "Text Hint",
                "m_value": ""
               }, {
-               "type": "colour",
-               "m_label": "Initial Colour",
-               "colour": "<Default>"
+               "type": "string",
+               "m_label": "Max Length:",
+               "m_value": "0"
+              }, {
+               "type": "bool",
+               "m_label": "Auto Complete Directories:",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Auto Complete Files:",
+               "m_value": false
               }],
              "m_events": [],
              "m_children": []
             }, {
-             "m_type": 4486,
+             "m_type": 4452,
              "proportion": 0,
              "border": 5,
              "gbSpan": "1,1",
              "gbPosition": "0,0",
              "m_styles": [],
-             "m_sizerFlags": [],
+             "m_sizerFlags": ["wxEXPAND"],
              "m_properties": [{
                "type": "string",
+               "m_label": "Minimum Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
                "m_label": "Name:",
-               "m_value": "m_pgPropTime"
+               "m_value": "gridSizerLvl3_1"
               }, {
                "type": "string",
-               "m_label": "Label:",
-               "m_value": "Time (s)"
+               "m_label": "Style:",
+               "m_value": ""
+              }, {
+               "type": "string",
+               "m_label": "# Columns:",
+               "m_value": "2"
+              }, {
+               "type": "string",
+               "m_label": "# Rows:",
+               "m_value": "0"
+              }, {
+               "type": "string",
+               "m_label": "Horizontal gap:",
+               "m_value": "0"
+              }, {
+               "type": "string",
+               "m_label": "Vertical gap:",
+               "m_value": "0"
+              }],
+             "m_events": [],
+             "m_children": [{
+               "m_type": 4401,
+               "proportion": 0,
+               "border": 5,
+               "gbSpan": "1,1",
+               "gbPosition": "0,0",
+               "m_styles": [],
+               "m_sizerFlags": ["wxEXPAND"],
+               "m_properties": [{
+                 "type": "string",
+                 "m_label": "Minimum Size:",
+                 "m_value": "-1,-1"
+                }, {
+                 "type": "string",
+                 "m_label": "Name:",
+                 "m_value": "boxSizerLvl4_1"
+                }, {
+                 "type": "string",
+                 "m_label": "Style:",
+                 "m_value": ""
+                }, {
+                 "type": "choice",
+                 "m_label": "Orientation:",
+                 "m_selection": 0,
+                 "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                }],
+               "m_events": [],
+               "m_children": [{
+                 "m_type": 4405,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+                 "m_properties": [{
+                   "type": "winid",
+                   "m_label": "ID:",
+                   "m_winid": "wxID_ANY"
+                  }, {
+                   "type": "string",
+                   "m_label": "Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "m_staticTextActivePower"
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Tooltip:",
+                   "m_value": ""
+                  }, {
+                   "type": "colour",
+                   "m_label": "Bg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "colour",
+                   "m_label": "Fg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "font",
+                   "m_label": "Font:",
+                   "m_value": ""
+                  }, {
+                   "type": "bool",
+                   "m_label": "Hidden",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Disabled",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Focused",
+                   "m_value": false
+                  }, {
+                   "type": "string",
+                   "m_label": "Class Name:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Include File:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Label:",
+                   "m_value": "Active power"
+                  }, {
+                   "type": "string",
+                   "m_label": "Wrap:",
+                   "m_value": "-1"
+                  }],
+                 "m_events": [],
+                 "m_children": []
+                }, {
+                 "m_type": 4401,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxEXPAND"],
+                 "m_properties": [{
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "boxSizerLvl5_1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "choice",
+                   "m_label": "Orientation:",
+                   "m_selection": 1,
+                   "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                  }],
+                 "m_events": [],
+                 "m_children": [{
+                   "m_type": 4406,
+                   "proportion": 1,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_textCtrlActivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Value:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Text Hint",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Max Length:",
+                     "m_value": "0"
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Directories:",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Files:",
+                     "m_value": false
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }, {
+                   "m_type": 4411,
+                   "proportion": 0,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_choiceActivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Choices:",
+                     "m_value": "p.u.;W;kW;MW"
+                    }, {
+                     "type": "string",
+                     "m_label": "Selection:",
+                     "m_value": "3"
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }]
+                }]
+              }, {
+               "m_type": 4401,
+               "proportion": 0,
+               "border": 5,
+               "gbSpan": "1,1",
+               "gbPosition": "0,0",
+               "m_styles": [],
+               "m_sizerFlags": ["wxEXPAND"],
+               "m_properties": [{
+                 "type": "string",
+                 "m_label": "Minimum Size:",
+                 "m_value": "-1,-1"
+                }, {
+                 "type": "string",
+                 "m_label": "Name:",
+                 "m_value": "boxSizerLvl4_2"
+                }, {
+                 "type": "string",
+                 "m_label": "Style:",
+                 "m_value": ""
+                }, {
+                 "type": "choice",
+                 "m_label": "Orientation:",
+                 "m_selection": 0,
+                 "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                }],
+               "m_events": [],
+               "m_children": [{
+                 "m_type": 4405,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+                 "m_properties": [{
+                   "type": "winid",
+                   "m_label": "ID:",
+                   "m_winid": "wxID_ANY"
+                  }, {
+                   "type": "string",
+                   "m_label": "Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "m_staticTextReactivePower"
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Tooltip:",
+                   "m_value": ""
+                  }, {
+                   "type": "colour",
+                   "m_label": "Bg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "colour",
+                   "m_label": "Fg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "font",
+                   "m_label": "Font:",
+                   "m_value": ""
+                  }, {
+                   "type": "bool",
+                   "m_label": "Hidden",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Disabled",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Focused",
+                   "m_value": false
+                  }, {
+                   "type": "string",
+                   "m_label": "Class Name:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Include File:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Label:",
+                   "m_value": "Reactive power"
+                  }, {
+                   "type": "string",
+                   "m_label": "Wrap:",
+                   "m_value": "-1"
+                  }],
+                 "m_events": [],
+                 "m_children": []
+                }, {
+                 "m_type": 4401,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxEXPAND"],
+                 "m_properties": [{
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "boxSizerLvl5_2"
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "choice",
+                   "m_label": "Orientation:",
+                   "m_selection": 1,
+                   "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                  }],
+                 "m_events": [],
+                 "m_children": [{
+                   "m_type": 4406,
+                   "proportion": 1,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_textCtrlReactivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Value:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Text Hint",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Max Length:",
+                     "m_value": "0"
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Directories:",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Files:",
+                     "m_value": false
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }, {
+                   "m_type": 4411,
+                   "proportion": 0,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_choiceReactivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Choices:",
+                     "m_value": "p.u.;VAr;kVAr;MVAr"
+                    }, {
+                     "type": "string",
+                     "m_label": "Selection:",
+                     "m_value": "3"
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }]
+                }]
+              }]
+            }, {
+             "m_type": 4405,
+             "proportion": 0,
+             "border": 5,
+             "gbSpan": "1,1",
+             "gbPosition": "0,0",
+             "m_styles": [],
+             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+             "m_properties": [{
+               "type": "winid",
+               "m_label": "ID:",
+               "m_winid": "wxID_ANY"
+              }, {
+               "type": "string",
+               "m_label": "Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
+               "m_label": "Minimum Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_staticTextType"
               }, {
                "type": "multi-string",
                "m_label": "Tooltip:",
@@ -22236,459 +22941,251 @@
                "m_label": "Bg Colour:",
                "colour": "<Default>"
               }, {
-               "type": "choice",
-               "m_label": "Property Editor Control",
-               "m_selection": 0,
-               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
+               "type": "colour",
+               "m_label": "Fg Colour:",
+               "colour": "<Default>"
               }, {
-               "type": "choice",
-               "m_label": "Kind:",
-               "m_selection": 2,
-               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+               "type": "font",
+               "m_label": "Font:",
+               "m_value": ""
+              }, {
+               "type": "bool",
+               "m_label": "Hidden",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Disabled",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Focused",
+               "m_value": false
               }, {
                "type": "string",
-               "m_label": "String Value",
-               "m_value": "0"
+               "m_label": "Class Name:",
+               "m_value": ""
               }, {
-               "type": "multi-string",
-               "m_label": "Choices:",
+               "type": "string",
+               "m_label": "Include File:",
                "m_value": ""
               }, {
-               "type": "multi-string",
-               "m_label": "Array Integer Values",
+               "type": "string",
+               "m_label": "Style:",
                "m_value": ""
               }, {
-               "type": "bool",
-               "m_label": "Bool Value",
-               "m_value": true
+               "type": "multi-string",
+               "m_label": "Label:",
+               "m_value": "Load type"
               }, {
                "type": "string",
-               "m_label": "Wildcard",
+               "m_label": "Wrap:",
+               "m_value": "-1"
+              }],
+             "m_events": [],
+             "m_children": []
+            }, {
+             "m_type": 4411,
+             "proportion": 0,
+             "border": 5,
+             "gbSpan": "1,1",
+             "gbPosition": "0,0",
+             "m_styles": [],
+             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
+             "m_properties": [{
+               "type": "winid",
+               "m_label": "ID:",
+               "m_winid": "wxID_ANY"
+              }, {
+               "type": "string",
+               "m_label": "Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
+               "m_label": "Minimum Size:",
+               "m_value": "-1,-1"
+              }, {
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_choiceType"
+              }, {
+               "type": "multi-string",
+               "m_label": "Tooltip:",
                "m_value": ""
               }, {
+               "type": "colour",
+               "m_label": "Bg Colour:",
+               "colour": "<Default>"
+              }, {
+               "type": "colour",
+               "m_label": "Fg Colour:",
+               "colour": "<Default>"
+              }, {
                "type": "font",
                "m_label": "Font:",
                "m_value": ""
               }, {
-               "type": "colour",
-               "m_label": "Initial Colour",
-               "colour": "<Default>"
+               "type": "bool",
+               "m_label": "Hidden",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Disabled",
+               "m_value": false
+              }, {
+               "type": "bool",
+               "m_label": "Focused",
+               "m_value": false
+              }, {
+               "type": "string",
+               "m_label": "Class Name:",
+               "m_value": ""
+              }, {
+               "type": "string",
+               "m_label": "Include File:",
+               "m_value": ""
+              }, {
+               "type": "string",
+               "m_label": "Style:",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Choices:",
+               "m_value": "Constant power;Constant impedance"
+              }, {
+               "type": "string",
+               "m_label": "Selection:",
+               "m_value": "0"
               }],
              "m_events": [],
              "m_children": []
             }]
           }]
+        }]
+      }, {
+       "m_type": 4401,
+       "proportion": 0,
+       "border": 5,
+       "gbSpan": "1,1",
+       "gbPosition": "0,0",
+       "m_styles": [],
+       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+       "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
         }, {
-         "m_type": 4401,
+         "type": "string",
+         "m_label": "Name:",
+         "m_value": "boxSizerBottomButtons"
+        }, {
+         "type": "string",
+         "m_label": "Style:",
+         "m_value": ""
+        }, {
+         "type": "choice",
+         "m_label": "Orientation:",
+         "m_selection": 1,
+         "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+        }],
+       "m_events": [],
+       "m_children": [{
+         "m_type": 4400,
          "proportion": 0,
          "border": 5,
          "gbSpan": "1,1",
          "gbPosition": "0,0",
          "m_styles": [],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_LEFT"],
          "m_properties": [{
+           "type": "winid",
+           "m_label": "ID:",
+           "m_winid": "wxID_ANY"
+          }, {
+           "type": "string",
+           "m_label": "Size:",
+           "m_value": "-1,-1"
+          }, {
            "type": "string",
            "m_label": "Minimum Size:",
            "m_value": "-1,-1"
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "boxSizerLvl3_3"
+           "m_value": "m_buttonStabButton"
+          }, {
+           "type": "multi-string",
+           "m_label": "Tooltip:",
+           "m_value": ""
+          }, {
+           "type": "colour",
+           "m_label": "Bg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "colour",
+           "m_label": "Fg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "font",
+           "m_label": "Font:",
+           "m_value": ""
+          }, {
+           "type": "bool",
+           "m_label": "Hidden",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Disabled",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Focused",
+           "m_value": false
+          }, {
+           "type": "string",
+           "m_label": "Class Name:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Include File:",
+           "m_value": ""
           }, {
            "type": "string",
            "m_label": "Style:",
            "m_value": ""
           }, {
-           "type": "choice",
-           "m_label": "Orientation:",
-           "m_selection": 0,
-           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
-          }],
-         "m_events": [],
-         "m_children": [{
-           "m_type": 4400,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": [],
-           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_buttonInsert"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Label:",
-             "m_value": "Add"
-            }, {
-             "type": "bool",
-             "m_label": "Default Button",
-             "m_value": false
-            }, {
-             "type": "bitmapPicker",
-             "m_label": "Bitmap File:",
-             "m_path": ""
-            }, {
-             "type": "choice",
-             "m_label": "Direction",
-             "m_selection": 0,
-             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
-            }, {
-             "type": "string",
-             "m_label": "Margins:",
-             "m_value": "2,2"
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
-             "m_eventClass": "wxCommandEvent",
-             "m_eventHandler": "wxCommandEventHandler",
-             "m_functionNameAndSignature": "OnInsertButtonClick(wxCommandEvent& event)",
-             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
-             "m_noBody": false
-            }],
-           "m_children": []
+           "type": "string",
+           "m_label": "Label:",
+           "m_value": "Stability"
           }, {
-           "m_type": 4400,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": [],
-           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_buttonRemove"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Label:",
-             "m_value": "Remove"
-            }, {
-             "type": "bool",
-             "m_label": "Default Button",
-             "m_value": false
-            }, {
-             "type": "bitmapPicker",
-             "m_label": "Bitmap File:",
-             "m_path": ""
-            }, {
-             "type": "choice",
-             "m_label": "Direction",
-             "m_selection": 0,
-             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
-            }, {
-             "type": "string",
-             "m_label": "Margins:",
-             "m_value": "2,2"
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
-             "m_eventClass": "wxCommandEvent",
-             "m_eventHandler": "wxCommandEventHandler",
-             "m_functionNameAndSignature": "OnRemoveButtonClick(wxCommandEvent& event)",
-             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
-             "m_noBody": false
-            }],
-           "m_children": []
+           "type": "bool",
+           "m_label": "Default Button",
+           "m_value": false
           }, {
-           "m_type": 4400,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": [],
-           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_buttonUp"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Label:",
-             "m_value": "Up"
-            }, {
-             "type": "bool",
-             "m_label": "Default Button",
-             "m_value": false
-            }, {
-             "type": "bitmapPicker",
-             "m_label": "Bitmap File:",
-             "m_path": ""
-            }, {
-             "type": "choice",
-             "m_label": "Direction",
-             "m_selection": 0,
-             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
-            }, {
-             "type": "string",
-             "m_label": "Margins:",
-             "m_value": "2,2"
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
-             "m_eventClass": "wxCommandEvent",
-             "m_eventHandler": "wxCommandEventHandler",
-             "m_functionNameAndSignature": "OnUpButtonClick(wxCommandEvent& event)",
-             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
-             "m_noBody": false
-            }],
-           "m_children": []
+           "type": "bitmapPicker",
+           "m_label": "Bitmap File:",
+           "m_path": ""
           }, {
-           "m_type": 4400,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": [],
-           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_buttonDown"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Label:",
-             "m_value": "Down"
-            }, {
-             "type": "bool",
-             "m_label": "Default Button",
-             "m_value": false
-            }, {
-             "type": "bitmapPicker",
-             "m_label": "Bitmap File:",
-             "m_path": ""
-            }, {
-             "type": "choice",
-             "m_label": "Direction",
-             "m_selection": 0,
-             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
-            }, {
-             "type": "string",
-             "m_label": "Margins:",
-             "m_value": "2,2"
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
-             "m_eventClass": "wxCommandEvent",
-             "m_eventHandler": "wxCommandEventHandler",
-             "m_functionNameAndSignature": "OnDownButtonClick(wxCommandEvent& event)",
-             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
-             "m_noBody": false
-            }],
-           "m_children": []
-          }]
+           "type": "choice",
+           "m_label": "Direction",
+           "m_selection": 0,
+           "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+          }, {
+           "type": "string",
+           "m_label": "Margins:",
+           "m_value": "2,2"
+          }],
+         "m_events": [{
+           "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+           "m_eventClass": "wxCommandEvent",
+           "m_eventHandler": "wxCommandEventHandler",
+           "m_functionNameAndSignature": "OnStabilityButtonClick(wxCommandEvent& event)",
+           "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+           "m_noBody": false
+          }],
+         "m_children": []
         }, {
-         "m_type": 4401,
-         "proportion": 0,
+         "m_type": 4454,
+         "proportion": 1,
          "border": 5,
          "gbSpan": "1,1",
          "gbPosition": "0,0",
@@ -22696,202 +23193,16 @@
          "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
          "m_properties": [{
            "type": "string",
-           "m_label": "Minimum Size:",
-           "m_value": "-1,-1"
-          }, {
-           "type": "string",
            "m_label": "Name:",
-           "m_value": "boxSizerLvl3_2"
+           "m_value": "Spacer_1"
           }, {
            "type": "string",
-           "m_label": "Style:",
-           "m_value": ""
-          }, {
-           "type": "choice",
-           "m_label": "Orientation:",
-           "m_selection": 0,
-           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+           "m_label": "Size:",
+           "m_value": "0,0"
           }],
          "m_events": [],
-         "m_children": [{
-           "m_type": 4405,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": [],
-           "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_staticTextSwList"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }, {
-             "type": "multi-string",
-             "m_label": "Label:",
-             "m_value": "Switching list"
-            }, {
-             "type": "string",
-             "m_label": "Wrap:",
-             "m_value": "-1"
-            }],
-           "m_events": [],
-           "m_children": []
-          }, {
-           "m_type": 4413,
-           "proportion": 0,
-           "border": 5,
-           "gbSpan": "1,1",
-           "gbPosition": "0,0",
-           "m_styles": ["wxLC_REPORT"],
-           "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
-           "m_properties": [{
-             "type": "winid",
-             "m_label": "ID:",
-             "m_winid": "wxID_ANY"
-            }, {
-             "type": "string",
-             "m_label": "Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Minimum Size:",
-             "m_value": "-1,-1"
-            }, {
-             "type": "string",
-             "m_label": "Name:",
-             "m_value": "m_listCtrlSwitchings"
-            }, {
-             "type": "multi-string",
-             "m_label": "Tooltip:",
-             "m_value": ""
-            }, {
-             "type": "colour",
-             "m_label": "Bg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "colour",
-             "m_label": "Fg Colour:",
-             "colour": "<Default>"
-            }, {
-             "type": "font",
-             "m_label": "Font:",
-             "m_value": ""
-            }, {
-             "type": "bool",
-             "m_label": "Hidden",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Disabled",
-             "m_value": false
-            }, {
-             "type": "bool",
-             "m_label": "Focused",
-             "m_value": false
-            }, {
-             "type": "string",
-             "m_label": "Class Name:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Include File:",
-             "m_value": ""
-            }, {
-             "type": "string",
-             "m_label": "Style:",
-             "m_value": ""
-            }],
-           "m_events": [{
-             "m_eventName": "wxEVT_COMMAND_LIST_ITEM_SELECTED",
-             "m_eventClass": "wxListEvent",
-             "m_eventHandler": "wxListEventHandler",
-             "m_functionNameAndSignature": "OnSelectItem(wxListEvent& event)",
-             "m_description": "The item has been selected",
-             "m_noBody": false
-            }],
-           "m_children": []
-          }]
-        }]
-      }, {
-       "m_type": 4401,
-       "proportion": 0,
-       "border": 5,
-       "gbSpan": "1,1",
-       "gbPosition": "0,0",
-       "m_styles": [],
-       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
-       "m_properties": [{
-         "type": "string",
-         "m_label": "Minimum Size:",
-         "m_value": "-1,-1"
-        }, {
-         "type": "string",
-         "m_label": "Name:",
-         "m_value": "boxSizerBottomButtons"
-        }, {
-         "type": "string",
-         "m_label": "Style:",
-         "m_value": ""
+         "m_children": []
         }, {
-         "type": "choice",
-         "m_label": "Orientation:",
-         "m_selection": 1,
-         "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
-        }],
-       "m_events": [],
-       "m_children": [{
          "m_type": 4400,
          "proportion": 0,
          "border": 5,
@@ -22981,7 +23292,7 @@
            "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
            "m_eventClass": "wxCommandEvent",
            "m_eventHandler": "wxCommandEventHandler",
-           "m_functionNameAndSignature": "OnOKButtonClick(wxCommandEvent& event)",
+           "m_functionNameAndSignature": "OnOnButtonClick(wxCommandEvent& event)",
            "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
            "m_noBody": false
           }],
@@ -23009,7 +23320,7 @@
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "m_buttonCancel"
+           "m_value": "m_ButtonCancel"
           }, {
            "type": "multi-string",
            "m_label": "Tooltip:",
@@ -23103,7 +23414,7 @@
     }, {
      "type": "string",
      "m_label": "Name:",
-     "m_value": "LoadFormBase"
+     "m_value": "ReactiveShuntElementFormBase"
     }, {
      "type": "multi-string",
      "m_label": "Tooltip:",
@@ -23151,7 +23462,7 @@
     }, {
      "type": "string",
      "m_label": "Title:",
-     "m_value": "Load"
+     "m_value": "Reactive shunt element"
     }, {
      "type": "virtualFolderPicker",
      "m_label": "Virtual Folder:",
@@ -23164,11 +23475,11 @@
     }, {
      "type": "string",
      "m_label": "Inherited Class",
-     "m_value": "LoadForm"
+     "m_value": "ReactiveShuntElementForm"
     }, {
      "type": "string",
      "m_label": "File:",
-     "m_value": "LoadForm"
+     "m_value": "ReactiveShuntElementForm"
     }, {
      "type": "string",
      "m_label": "Class Decorator",
@@ -23612,299 +23923,6 @@
                 }, {
                  "type": "string",
                  "m_label": "Name:",
-                 "m_value": "boxSizerLvl4_1"
-                }, {
-                 "type": "string",
-                 "m_label": "Style:",
-                 "m_value": ""
-                }, {
-                 "type": "choice",
-                 "m_label": "Orientation:",
-                 "m_selection": 0,
-                 "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
-                }],
-               "m_events": [],
-               "m_children": [{
-                 "m_type": 4405,
-                 "proportion": 0,
-                 "border": 5,
-                 "gbSpan": "1,1",
-                 "gbPosition": "0,0",
-                 "m_styles": [],
-                 "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
-                 "m_properties": [{
-                   "type": "winid",
-                   "m_label": "ID:",
-                   "m_winid": "wxID_ANY"
-                  }, {
-                   "type": "string",
-                   "m_label": "Size:",
-                   "m_value": "-1,-1"
-                  }, {
-                   "type": "string",
-                   "m_label": "Minimum Size:",
-                   "m_value": "-1,-1"
-                  }, {
-                   "type": "string",
-                   "m_label": "Name:",
-                   "m_value": "m_staticTextActivePower"
-                  }, {
-                   "type": "multi-string",
-                   "m_label": "Tooltip:",
-                   "m_value": ""
-                  }, {
-                   "type": "colour",
-                   "m_label": "Bg Colour:",
-                   "colour": "<Default>"
-                  }, {
-                   "type": "colour",
-                   "m_label": "Fg Colour:",
-                   "colour": "<Default>"
-                  }, {
-                   "type": "font",
-                   "m_label": "Font:",
-                   "m_value": ""
-                  }, {
-                   "type": "bool",
-                   "m_label": "Hidden",
-                   "m_value": false
-                  }, {
-                   "type": "bool",
-                   "m_label": "Disabled",
-                   "m_value": false
-                  }, {
-                   "type": "bool",
-                   "m_label": "Focused",
-                   "m_value": false
-                  }, {
-                   "type": "string",
-                   "m_label": "Class Name:",
-                   "m_value": ""
-                  }, {
-                   "type": "string",
-                   "m_label": "Include File:",
-                   "m_value": ""
-                  }, {
-                   "type": "string",
-                   "m_label": "Style:",
-                   "m_value": ""
-                  }, {
-                   "type": "multi-string",
-                   "m_label": "Label:",
-                   "m_value": "Active power"
-                  }, {
-                   "type": "string",
-                   "m_label": "Wrap:",
-                   "m_value": "-1"
-                  }],
-                 "m_events": [],
-                 "m_children": []
-                }, {
-                 "m_type": 4401,
-                 "proportion": 0,
-                 "border": 5,
-                 "gbSpan": "1,1",
-                 "gbPosition": "0,0",
-                 "m_styles": [],
-                 "m_sizerFlags": ["wxEXPAND"],
-                 "m_properties": [{
-                   "type": "string",
-                   "m_label": "Minimum Size:",
-                   "m_value": "-1,-1"
-                  }, {
-                   "type": "string",
-                   "m_label": "Name:",
-                   "m_value": "boxSizerLvl5_1"
-                  }, {
-                   "type": "string",
-                   "m_label": "Style:",
-                   "m_value": ""
-                  }, {
-                   "type": "choice",
-                   "m_label": "Orientation:",
-                   "m_selection": 1,
-                   "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
-                  }],
-                 "m_events": [],
-                 "m_children": [{
-                   "m_type": 4406,
-                   "proportion": 1,
-                   "border": 5,
-                   "gbSpan": "1,1",
-                   "gbPosition": "0,0",
-                   "m_styles": [],
-                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
-                   "m_properties": [{
-                     "type": "winid",
-                     "m_label": "ID:",
-                     "m_winid": "wxID_ANY"
-                    }, {
-                     "type": "string",
-                     "m_label": "Size:",
-                     "m_value": "-1,-1"
-                    }, {
-                     "type": "string",
-                     "m_label": "Minimum Size:",
-                     "m_value": "-1,-1"
-                    }, {
-                     "type": "string",
-                     "m_label": "Name:",
-                     "m_value": "m_textCtrlActivePower"
-                    }, {
-                     "type": "multi-string",
-                     "m_label": "Tooltip:",
-                     "m_value": ""
-                    }, {
-                     "type": "colour",
-                     "m_label": "Bg Colour:",
-                     "colour": "<Default>"
-                    }, {
-                     "type": "colour",
-                     "m_label": "Fg Colour:",
-                     "colour": "<Default>"
-                    }, {
-                     "type": "font",
-                     "m_label": "Font:",
-                     "m_value": ""
-                    }, {
-                     "type": "bool",
-                     "m_label": "Hidden",
-                     "m_value": false
-                    }, {
-                     "type": "bool",
-                     "m_label": "Disabled",
-                     "m_value": false
-                    }, {
-                     "type": "bool",
-                     "m_label": "Focused",
-                     "m_value": false
-                    }, {
-                     "type": "string",
-                     "m_label": "Class Name:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Include File:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Style:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Value:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Text Hint",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Max Length:",
-                     "m_value": "0"
-                    }, {
-                     "type": "bool",
-                     "m_label": "Auto Complete Directories:",
-                     "m_value": false
-                    }, {
-                     "type": "bool",
-                     "m_label": "Auto Complete Files:",
-                     "m_value": false
-                    }],
-                   "m_events": [],
-                   "m_children": []
-                  }, {
-                   "m_type": 4411,
-                   "proportion": 0,
-                   "border": 5,
-                   "gbSpan": "1,1",
-                   "gbPosition": "0,0",
-                   "m_styles": [],
-                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
-                   "m_properties": [{
-                     "type": "winid",
-                     "m_label": "ID:",
-                     "m_winid": "wxID_ANY"
-                    }, {
-                     "type": "string",
-                     "m_label": "Size:",
-                     "m_value": "-1,-1"
-                    }, {
-                     "type": "string",
-                     "m_label": "Minimum Size:",
-                     "m_value": "-1,-1"
-                    }, {
-                     "type": "string",
-                     "m_label": "Name:",
-                     "m_value": "m_choiceActivePower"
-                    }, {
-                     "type": "multi-string",
-                     "m_label": "Tooltip:",
-                     "m_value": ""
-                    }, {
-                     "type": "colour",
-                     "m_label": "Bg Colour:",
-                     "colour": "<Default>"
-                    }, {
-                     "type": "colour",
-                     "m_label": "Fg Colour:",
-                     "colour": "<Default>"
-                    }, {
-                     "type": "font",
-                     "m_label": "Font:",
-                     "m_value": ""
-                    }, {
-                     "type": "bool",
-                     "m_label": "Hidden",
-                     "m_value": false
-                    }, {
-                     "type": "bool",
-                     "m_label": "Disabled",
-                     "m_value": false
-                    }, {
-                     "type": "bool",
-                     "m_label": "Focused",
-                     "m_value": false
-                    }, {
-                     "type": "string",
-                     "m_label": "Class Name:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Include File:",
-                     "m_value": ""
-                    }, {
-                     "type": "string",
-                     "m_label": "Style:",
-                     "m_value": ""
-                    }, {
-                     "type": "multi-string",
-                     "m_label": "Choices:",
-                     "m_value": "p.u.;W;kW;MW"
-                    }, {
-                     "type": "string",
-                     "m_label": "Selection:",
-                     "m_value": "3"
-                    }],
-                   "m_events": [],
-                   "m_children": []
-                  }]
-                }]
-              }, {
-               "m_type": 4401,
-               "proportion": 0,
-               "border": 5,
-               "gbSpan": "1,1",
-               "gbPosition": "0,0",
-               "m_styles": [],
-               "m_sizerFlags": ["wxEXPAND"],
-               "m_properties": [{
-                 "type": "string",
-                 "m_label": "Minimum Size:",
-                 "m_value": "-1,-1"
-                }, {
-                 "type": "string",
-                 "m_label": "Name:",
                  "m_value": "boxSizerLvl4_2"
                 }, {
                  "type": "string",
@@ -24184,156 +24202,6 @@
                   }]
                 }]
               }]
-            }, {
-             "m_type": 4405,
-             "proportion": 0,
-             "border": 5,
-             "gbSpan": "1,1",
-             "gbPosition": "0,0",
-             "m_styles": [],
-             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
-             "m_properties": [{
-               "type": "winid",
-               "m_label": "ID:",
-               "m_winid": "wxID_ANY"
-              }, {
-               "type": "string",
-               "m_label": "Size:",
-               "m_value": "-1,-1"
-              }, {
-               "type": "string",
-               "m_label": "Minimum Size:",
-               "m_value": "-1,-1"
-              }, {
-               "type": "string",
-               "m_label": "Name:",
-               "m_value": "m_staticTextType"
-              }, {
-               "type": "multi-string",
-               "m_label": "Tooltip:",
-               "m_value": ""
-              }, {
-               "type": "colour",
-               "m_label": "Bg Colour:",
-               "colour": "<Default>"
-              }, {
-               "type": "colour",
-               "m_label": "Fg Colour:",
-               "colour": "<Default>"
-              }, {
-               "type": "font",
-               "m_label": "Font:",
-               "m_value": ""
-              }, {
-               "type": "bool",
-               "m_label": "Hidden",
-               "m_value": false
-              }, {
-               "type": "bool",
-               "m_label": "Disabled",
-               "m_value": false
-              }, {
-               "type": "bool",
-               "m_label": "Focused",
-               "m_value": false
-              }, {
-               "type": "string",
-               "m_label": "Class Name:",
-               "m_value": ""
-              }, {
-               "type": "string",
-               "m_label": "Include File:",
-               "m_value": ""
-              }, {
-               "type": "string",
-               "m_label": "Style:",
-               "m_value": ""
-              }, {
-               "type": "multi-string",
-               "m_label": "Label:",
-               "m_value": "Load type"
-              }, {
-               "type": "string",
-               "m_label": "Wrap:",
-               "m_value": "-1"
-              }],
-             "m_events": [],
-             "m_children": []
-            }, {
-             "m_type": 4411,
-             "proportion": 0,
-             "border": 5,
-             "gbSpan": "1,1",
-             "gbPosition": "0,0",
-             "m_styles": [],
-             "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
-             "m_properties": [{
-               "type": "winid",
-               "m_label": "ID:",
-               "m_winid": "wxID_ANY"
-              }, {
-               "type": "string",
-               "m_label": "Size:",
-               "m_value": "-1,-1"
-              }, {
-               "type": "string",
-               "m_label": "Minimum Size:",
-               "m_value": "-1,-1"
-              }, {
-               "type": "string",
-               "m_label": "Name:",
-               "m_value": "m_choiceType"
-              }, {
-               "type": "multi-string",
-               "m_label": "Tooltip:",
-               "m_value": ""
-              }, {
-               "type": "colour",
-               "m_label": "Bg Colour:",
-               "colour": "<Default>"
-              }, {
-               "type": "colour",
-               "m_label": "Fg Colour:",
-               "colour": "<Default>"
-              }, {
-               "type": "font",
-               "m_label": "Font:",
-               "m_value": ""
-              }, {
-               "type": "bool",
-               "m_label": "Hidden",
-               "m_value": false
-              }, {
-               "type": "bool",
-               "m_label": "Disabled",
-               "m_value": false
-              }, {
-               "type": "bool",
-               "m_label": "Focused",
-               "m_value": false
-              }, {
-               "type": "string",
-               "m_label": "Class Name:",
-               "m_value": ""
-              }, {
-               "type": "string",
-               "m_label": "Include File:",
-               "m_value": ""
-              }, {
-               "type": "string",
-               "m_label": "Style:",
-               "m_value": ""
-              }, {
-               "type": "multi-string",
-               "m_label": "Choices:",
-               "m_value": "Constant power;Constant impedance"
-              }, {
-               "type": "string",
-               "m_label": "Selection:",
-               "m_value": "0"
-              }],
-             "m_events": [],
-             "m_children": []
             }]
           }]
         }]
@@ -24568,7 +24436,7 @@
            "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
            "m_eventClass": "wxCommandEvent",
            "m_eventHandler": "wxCommandEventHandler",
-           "m_functionNameAndSignature": "OnOnButtonClick(wxCommandEvent& event)",
+           "m_functionNameAndSignature": "OnOKButtonClick(wxCommandEvent& event)",
            "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
            "m_noBody": false
           }],
@@ -24596,7 +24464,7 @@
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "m_ButtonCancel"
+           "m_value": "m_buttonCancel"
           }, {
            "type": "multi-string",
            "m_label": "Tooltip:",
@@ -24690,7 +24558,7 @@
     }, {
      "type": "string",
      "m_label": "Name:",
-     "m_value": "ReactiveShuntElementFormBase"
+     "m_value": "SwitchingFormBase"
     }, {
      "type": "multi-string",
      "m_label": "Tooltip:",
@@ -24738,7 +24606,7 @@
     }, {
      "type": "string",
      "m_label": "Title:",
-     "m_value": "Reactive shunt element"
+     "m_value": "Switching"
     }, {
      "type": "virtualFolderPicker",
      "m_label": "Virtual Folder:",
@@ -24751,11 +24619,1287 @@
     }, {
      "type": "string",
      "m_label": "Inherited Class",
-     "m_value": "ReactiveShuntElementForm"
+     "m_value": "SwitchingForm"
     }, {
      "type": "string",
      "m_label": "File:",
-     "m_value": "ReactiveShuntElementForm"
+     "m_value": "SwitchingForm"
+    }, {
+     "type": "string",
+     "m_label": "Class Decorator",
+     "m_value": ""
+    }, {
+     "type": "bitmapPicker",
+     "m_label": "Bitmap File (16x16)  :",
+     "m_path": ""
+    }, {
+     "type": "bitmapPicker",
+     "m_label": "Bitmap File (32x32)  :",
+     "m_path": ""
+    }, {
+     "type": "bitmapPicker",
+     "m_label": "Bitmap File (64x64)  :",
+     "m_path": ""
+    }, {
+     "type": "bitmapPicker",
+     "m_label": "Bitmap File (128x128):",
+     "m_path": ""
+    }, {
+     "type": "bitmapPicker",
+     "m_label": "Bitmap File (256x256):",
+     "m_path": ""
+    }],
+   "m_events": [],
+   "m_children": [{
+     "m_type": 4401,
+     "proportion": 1,
+     "border": 5,
+     "gbSpan": "1,1",
+     "gbPosition": "0,0",
+     "m_styles": [],
+     "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+     "m_properties": [{
+       "type": "string",
+       "m_label": "Minimum Size:",
+       "m_value": "-1,-1"
+      }, {
+       "type": "string",
+       "m_label": "Name:",
+       "m_value": "boxSizerLvl1_1"
+      }, {
+       "type": "string",
+       "m_label": "Style:",
+       "m_value": ""
+      }, {
+       "type": "choice",
+       "m_label": "Orientation:",
+       "m_selection": 0,
+       "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+      }],
+     "m_events": [],
+     "m_children": [{
+       "m_type": 4401,
+       "proportion": 0,
+       "border": 5,
+       "gbSpan": "1,1",
+       "gbPosition": "0,0",
+       "m_styles": [],
+       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+       "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
+         "type": "string",
+         "m_label": "Name:",
+         "m_value": "boxSizerLvl2_1"
+        }, {
+         "type": "string",
+         "m_label": "Style:",
+         "m_value": ""
+        }, {
+         "type": "choice",
+         "m_label": "Orientation:",
+         "m_selection": 1,
+         "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+        }],
+       "m_events": [],
+       "m_children": [{
+         "m_type": 4401,
+         "proportion": 0,
+         "border": 5,
+         "gbSpan": "1,1",
+         "gbPosition": "0,0",
+         "m_styles": [],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+         "m_properties": [{
+           "type": "string",
+           "m_label": "Minimum Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Name:",
+           "m_value": "boxSizerLvl3_1"
+          }, {
+           "type": "string",
+           "m_label": "Style:",
+           "m_value": ""
+          }, {
+           "type": "choice",
+           "m_label": "Orientation:",
+           "m_selection": 0,
+           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+          }],
+         "m_events": [],
+         "m_children": [{
+           "m_type": 4485,
+           "proportion": 1,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": ["wxPG_STATIC_LAYOUT", "wxPG_SPLITTER_AUTO_CENTER", "wxPG_BOLD_MODIFIED"],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "150,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_pgMgrSwitchingsProp"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "integer",
+             "m_label": "Sash Position:",
+             "m_value": -1
+            }, {
+             "type": "bool",
+             "m_label": "Set Splitter Left:",
+             "m_value": false
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_PG_CHANGED",
+             "m_eventClass": "wxPropertyGridEvent",
+             "m_eventHandler": "wxPropertyGridEventHandler",
+             "m_functionNameAndSignature": "OnChangeProperties(wxPropertyGridEvent& event)",
+             "m_description": "Respond to wxEVT_PG_CHANGED event, generated when property value has been changed by the user",
+             "m_noBody": false
+            }],
+           "m_children": [{
+             "m_type": 4486,
+             "proportion": 0,
+             "border": 5,
+             "gbSpan": "1,1",
+             "gbPosition": "0,0",
+             "m_styles": [],
+             "m_sizerFlags": [],
+             "m_properties": [{
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_pgPropTitle"
+              }, {
+               "type": "string",
+               "m_label": "Label:",
+               "m_value": "Switching properties"
+              }, {
+               "type": "multi-string",
+               "m_label": "Tooltip:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Bg Colour:",
+               "colour": "<Default>"
+              }, {
+               "type": "choice",
+               "m_label": "Property Editor Control",
+               "m_selection": 0,
+               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
+              }, {
+               "type": "choice",
+               "m_label": "Kind:",
+               "m_selection": 0,
+               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+              }, {
+               "type": "string",
+               "m_label": "String Value",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Choices:",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Array Integer Values",
+               "m_value": ""
+              }, {
+               "type": "bool",
+               "m_label": "Bool Value",
+               "m_value": true
+              }, {
+               "type": "string",
+               "m_label": "Wildcard",
+               "m_value": ""
+              }, {
+               "type": "font",
+               "m_label": "Font:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Initial Colour",
+               "colour": "<Default>"
+              }],
+             "m_events": [],
+             "m_children": []
+            }, {
+             "m_type": 4486,
+             "proportion": 0,
+             "border": 5,
+             "gbSpan": "1,1",
+             "gbPosition": "0,0",
+             "m_styles": [],
+             "m_sizerFlags": [],
+             "m_properties": [{
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_pgPropType"
+              }, {
+               "type": "string",
+               "m_label": "Label:",
+               "m_value": "Type"
+              }, {
+               "type": "multi-string",
+               "m_label": "Tooltip:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Bg Colour:",
+               "colour": "<Default>"
+              }, {
+               "type": "choice",
+               "m_label": "Property Editor Control",
+               "m_selection": 0,
+               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
+              }, {
+               "type": "choice",
+               "m_label": "Kind:",
+               "m_selection": 9,
+               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+              }, {
+               "type": "string",
+               "m_label": "String Value",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Choices:",
+               "m_value": "Insert;Remove"
+              }, {
+               "type": "multi-string",
+               "m_label": "Array Integer Values",
+               "m_value": ""
+              }, {
+               "type": "bool",
+               "m_label": "Bool Value",
+               "m_value": true
+              }, {
+               "type": "string",
+               "m_label": "Wildcard",
+               "m_value": ""
+              }, {
+               "type": "font",
+               "m_label": "Font:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Initial Colour",
+               "colour": "<Default>"
+              }],
+             "m_events": [],
+             "m_children": []
+            }, {
+             "m_type": 4486,
+             "proportion": 0,
+             "border": 5,
+             "gbSpan": "1,1",
+             "gbPosition": "0,0",
+             "m_styles": [],
+             "m_sizerFlags": [],
+             "m_properties": [{
+               "type": "string",
+               "m_label": "Name:",
+               "m_value": "m_pgPropTime"
+              }, {
+               "type": "string",
+               "m_label": "Label:",
+               "m_value": "Time (s)"
+              }, {
+               "type": "multi-string",
+               "m_label": "Tooltip:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Bg Colour:",
+               "colour": "<Default>"
+              }, {
+               "type": "choice",
+               "m_label": "Property Editor Control",
+               "m_selection": 0,
+               "m_options": ["", "TextCtrl", "Choice", "ComboBox", "CheckBox", "TextCtrlAndButton", "ChoiceAndButton", "SpinCtrl", "DatePickerCtrl"]
+              }, {
+               "type": "choice",
+               "m_label": "Kind:",
+               "m_selection": 2,
+               "m_options": ["wxPropertyCategory", "wxIntProperty", "wxFloatProperty", "wxBoolProperty", "wxStringProperty", "wxLongStringProperty", "wxDirProperty", "wxArrayStringProperty", "wxFileProperty", "wxEnumProperty", "wxEditEnumProperty", "wxFlagsProperty", "wxDateProperty", "wxImageFileProperty", "wxFontProperty", "wxSystemColourProperty"]
+              }, {
+               "type": "string",
+               "m_label": "String Value",
+               "m_value": "0"
+              }, {
+               "type": "multi-string",
+               "m_label": "Choices:",
+               "m_value": ""
+              }, {
+               "type": "multi-string",
+               "m_label": "Array Integer Values",
+               "m_value": ""
+              }, {
+               "type": "bool",
+               "m_label": "Bool Value",
+               "m_value": true
+              }, {
+               "type": "string",
+               "m_label": "Wildcard",
+               "m_value": ""
+              }, {
+               "type": "font",
+               "m_label": "Font:",
+               "m_value": ""
+              }, {
+               "type": "colour",
+               "m_label": "Initial Colour",
+               "colour": "<Default>"
+              }],
+             "m_events": [],
+             "m_children": []
+            }]
+          }]
+        }, {
+         "m_type": 4401,
+         "proportion": 0,
+         "border": 5,
+         "gbSpan": "1,1",
+         "gbPosition": "0,0",
+         "m_styles": [],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
+         "m_properties": [{
+           "type": "string",
+           "m_label": "Minimum Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Name:",
+           "m_value": "boxSizerLvl3_3"
+          }, {
+           "type": "string",
+           "m_label": "Style:",
+           "m_value": ""
+          }, {
+           "type": "choice",
+           "m_label": "Orientation:",
+           "m_selection": 0,
+           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+          }],
+         "m_events": [],
+         "m_children": [{
+           "m_type": 4400,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": [],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_buttonInsert"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Label:",
+             "m_value": "Add"
+            }, {
+             "type": "bool",
+             "m_label": "Default Button",
+             "m_value": false
+            }, {
+             "type": "bitmapPicker",
+             "m_label": "Bitmap File:",
+             "m_path": ""
+            }, {
+             "type": "choice",
+             "m_label": "Direction",
+             "m_selection": 0,
+             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+            }, {
+             "type": "string",
+             "m_label": "Margins:",
+             "m_value": "2,2"
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+             "m_eventClass": "wxCommandEvent",
+             "m_eventHandler": "wxCommandEventHandler",
+             "m_functionNameAndSignature": "OnInsertButtonClick(wxCommandEvent& event)",
+             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+             "m_noBody": false
+            }],
+           "m_children": []
+          }, {
+           "m_type": 4400,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": [],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_buttonRemove"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Label:",
+             "m_value": "Remove"
+            }, {
+             "type": "bool",
+             "m_label": "Default Button",
+             "m_value": false
+            }, {
+             "type": "bitmapPicker",
+             "m_label": "Bitmap File:",
+             "m_path": ""
+            }, {
+             "type": "choice",
+             "m_label": "Direction",
+             "m_selection": 0,
+             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+            }, {
+             "type": "string",
+             "m_label": "Margins:",
+             "m_value": "2,2"
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+             "m_eventClass": "wxCommandEvent",
+             "m_eventHandler": "wxCommandEventHandler",
+             "m_functionNameAndSignature": "OnRemoveButtonClick(wxCommandEvent& event)",
+             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+             "m_noBody": false
+            }],
+           "m_children": []
+          }, {
+           "m_type": 4400,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": [],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_buttonUp"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Label:",
+             "m_value": "Up"
+            }, {
+             "type": "bool",
+             "m_label": "Default Button",
+             "m_value": false
+            }, {
+             "type": "bitmapPicker",
+             "m_label": "Bitmap File:",
+             "m_path": ""
+            }, {
+             "type": "choice",
+             "m_label": "Direction",
+             "m_selection": 0,
+             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+            }, {
+             "type": "string",
+             "m_label": "Margins:",
+             "m_value": "2,2"
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+             "m_eventClass": "wxCommandEvent",
+             "m_eventHandler": "wxCommandEventHandler",
+             "m_functionNameAndSignature": "OnUpButtonClick(wxCommandEvent& event)",
+             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+             "m_noBody": false
+            }],
+           "m_children": []
+          }, {
+           "m_type": 4400,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": [],
+           "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_buttonDown"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Label:",
+             "m_value": "Down"
+            }, {
+             "type": "bool",
+             "m_label": "Default Button",
+             "m_value": false
+            }, {
+             "type": "bitmapPicker",
+             "m_label": "Bitmap File:",
+             "m_path": ""
+            }, {
+             "type": "choice",
+             "m_label": "Direction",
+             "m_selection": 0,
+             "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+            }, {
+             "type": "string",
+             "m_label": "Margins:",
+             "m_value": "2,2"
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+             "m_eventClass": "wxCommandEvent",
+             "m_eventHandler": "wxCommandEventHandler",
+             "m_functionNameAndSignature": "OnDownButtonClick(wxCommandEvent& event)",
+             "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+             "m_noBody": false
+            }],
+           "m_children": []
+          }]
+        }, {
+         "m_type": 4401,
+         "proportion": 0,
+         "border": 5,
+         "gbSpan": "1,1",
+         "gbPosition": "0,0",
+         "m_styles": [],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+         "m_properties": [{
+           "type": "string",
+           "m_label": "Minimum Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Name:",
+           "m_value": "boxSizerLvl3_2"
+          }, {
+           "type": "string",
+           "m_label": "Style:",
+           "m_value": ""
+          }, {
+           "type": "choice",
+           "m_label": "Orientation:",
+           "m_selection": 0,
+           "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+          }],
+         "m_events": [],
+         "m_children": [{
+           "m_type": 4405,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": [],
+           "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_staticTextSwList"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }, {
+             "type": "multi-string",
+             "m_label": "Label:",
+             "m_value": "Switching list"
+            }, {
+             "type": "string",
+             "m_label": "Wrap:",
+             "m_value": "-1"
+            }],
+           "m_events": [],
+           "m_children": []
+          }, {
+           "m_type": 4413,
+           "proportion": 0,
+           "border": 5,
+           "gbSpan": "1,1",
+           "gbPosition": "0,0",
+           "m_styles": ["wxLC_REPORT"],
+           "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
+           "m_properties": [{
+             "type": "winid",
+             "m_label": "ID:",
+             "m_winid": "wxID_ANY"
+            }, {
+             "type": "string",
+             "m_label": "Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Minimum Size:",
+             "m_value": "-1,-1"
+            }, {
+             "type": "string",
+             "m_label": "Name:",
+             "m_value": "m_listCtrlSwitchings"
+            }, {
+             "type": "multi-string",
+             "m_label": "Tooltip:",
+             "m_value": ""
+            }, {
+             "type": "colour",
+             "m_label": "Bg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "colour",
+             "m_label": "Fg Colour:",
+             "colour": "<Default>"
+            }, {
+             "type": "font",
+             "m_label": "Font:",
+             "m_value": ""
+            }, {
+             "type": "bool",
+             "m_label": "Hidden",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Disabled",
+             "m_value": false
+            }, {
+             "type": "bool",
+             "m_label": "Focused",
+             "m_value": false
+            }, {
+             "type": "string",
+             "m_label": "Class Name:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Include File:",
+             "m_value": ""
+            }, {
+             "type": "string",
+             "m_label": "Style:",
+             "m_value": ""
+            }],
+           "m_events": [{
+             "m_eventName": "wxEVT_COMMAND_LIST_ITEM_SELECTED",
+             "m_eventClass": "wxListEvent",
+             "m_eventHandler": "wxListEventHandler",
+             "m_functionNameAndSignature": "OnSelectItem(wxListEvent& event)",
+             "m_description": "The item has been selected",
+             "m_noBody": false
+            }],
+           "m_children": []
+          }]
+        }]
+      }, {
+       "m_type": 4401,
+       "proportion": 0,
+       "border": 5,
+       "gbSpan": "1,1",
+       "gbPosition": "0,0",
+       "m_styles": [],
+       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+       "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
+         "type": "string",
+         "m_label": "Name:",
+         "m_value": "boxSizerBottomButtons"
+        }, {
+         "type": "string",
+         "m_label": "Style:",
+         "m_value": ""
+        }, {
+         "type": "choice",
+         "m_label": "Orientation:",
+         "m_selection": 1,
+         "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+        }],
+       "m_events": [],
+       "m_children": [{
+         "m_type": 4400,
+         "proportion": 0,
+         "border": 5,
+         "gbSpan": "1,1",
+         "gbPosition": "0,0",
+         "m_styles": [],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+         "m_properties": [{
+           "type": "winid",
+           "m_label": "ID:",
+           "m_winid": "wxID_ANY"
+          }, {
+           "type": "string",
+           "m_label": "Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Minimum Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Name:",
+           "m_value": "m_buttonOK"
+          }, {
+           "type": "multi-string",
+           "m_label": "Tooltip:",
+           "m_value": ""
+          }, {
+           "type": "colour",
+           "m_label": "Bg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "colour",
+           "m_label": "Fg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "font",
+           "m_label": "Font:",
+           "m_value": ""
+          }, {
+           "type": "bool",
+           "m_label": "Hidden",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Disabled",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Focused",
+           "m_value": false
+          }, {
+           "type": "string",
+           "m_label": "Class Name:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Include File:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Style:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Label:",
+           "m_value": "OK"
+          }, {
+           "type": "bool",
+           "m_label": "Default Button",
+           "m_value": false
+          }, {
+           "type": "bitmapPicker",
+           "m_label": "Bitmap File:",
+           "m_path": ""
+          }, {
+           "type": "choice",
+           "m_label": "Direction",
+           "m_selection": 0,
+           "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+          }, {
+           "type": "string",
+           "m_label": "Margins:",
+           "m_value": "2,2"
+          }],
+         "m_events": [{
+           "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+           "m_eventClass": "wxCommandEvent",
+           "m_eventHandler": "wxCommandEventHandler",
+           "m_functionNameAndSignature": "OnOKButtonClick(wxCommandEvent& event)",
+           "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+           "m_noBody": false
+          }],
+         "m_children": []
+        }, {
+         "m_type": 4400,
+         "proportion": 0,
+         "border": 5,
+         "gbSpan": "1,1",
+         "gbPosition": "0,0",
+         "m_styles": [],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
+         "m_properties": [{
+           "type": "winid",
+           "m_label": "ID:",
+           "m_winid": "wxID_ANY"
+          }, {
+           "type": "string",
+           "m_label": "Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Minimum Size:",
+           "m_value": "-1,-1"
+          }, {
+           "type": "string",
+           "m_label": "Name:",
+           "m_value": "m_buttonCancel"
+          }, {
+           "type": "multi-string",
+           "m_label": "Tooltip:",
+           "m_value": ""
+          }, {
+           "type": "colour",
+           "m_label": "Bg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "colour",
+           "m_label": "Fg Colour:",
+           "colour": "<Default>"
+          }, {
+           "type": "font",
+           "m_label": "Font:",
+           "m_value": ""
+          }, {
+           "type": "bool",
+           "m_label": "Hidden",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Disabled",
+           "m_value": false
+          }, {
+           "type": "bool",
+           "m_label": "Focused",
+           "m_value": false
+          }, {
+           "type": "string",
+           "m_label": "Class Name:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Include File:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Style:",
+           "m_value": ""
+          }, {
+           "type": "string",
+           "m_label": "Label:",
+           "m_value": "Cancel"
+          }, {
+           "type": "bool",
+           "m_label": "Default Button",
+           "m_value": false
+          }, {
+           "type": "bitmapPicker",
+           "m_label": "Bitmap File:",
+           "m_path": ""
+          }, {
+           "type": "choice",
+           "m_label": "Direction",
+           "m_selection": 0,
+           "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"]
+          }, {
+           "type": "string",
+           "m_label": "Margins:",
+           "m_value": "2,2"
+          }],
+         "m_events": [{
+           "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
+           "m_eventClass": "wxCommandEvent",
+           "m_eventHandler": "wxCommandEventHandler",
+           "m_functionNameAndSignature": "OnCancelButtonClick(wxCommandEvent& event)",
+           "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
+           "m_noBody": false
+          }],
+         "m_children": []
+        }]
+      }]
+    }]
+  }, {
+   "m_type": 4421,
+   "proportion": 0,
+   "border": 5,
+   "gbSpan": "1,1",
+   "gbPosition": "0,0",
+   "m_styles": ["wxDEFAULT_DIALOG_STYLE"],
+   "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
+   "m_properties": [{
+     "type": "string",
+     "m_label": "Size:",
+     "m_value": "-1,-1"
+    }, {
+     "type": "string",
+     "m_label": "Minimum Size:",
+     "m_value": "-1,-1"
+    }, {
+     "type": "string",
+     "m_label": "Name:",
+     "m_value": "IndMotorFormBase"
+    }, {
+     "type": "multi-string",
+     "m_label": "Tooltip:",
+     "m_value": ""
+    }, {
+     "type": "colour",
+     "m_label": "Bg Colour:",
+     "colour": "<Default>"
+    }, {
+     "type": "colour",
+     "m_label": "Fg Colour:",
+     "colour": "<Default>"
+    }, {
+     "type": "font",
+     "m_label": "Font:",
+     "m_value": ""
+    }, {
+     "type": "bool",
+     "m_label": "Hidden",
+     "m_value": false
+    }, {
+     "type": "bool",
+     "m_label": "Disabled",
+     "m_value": false
+    }, {
+     "type": "bool",
+     "m_label": "Focused",
+     "m_value": false
+    }, {
+     "type": "string",
+     "m_label": "Class Name:",
+     "m_value": ""
+    }, {
+     "type": "string",
+     "m_label": "Include File:",
+     "m_value": ""
+    }, {
+     "type": "string",
+     "m_label": "Style:",
+     "m_value": ""
+    }, {
+     "type": "bool",
+     "m_label": "Enable Window Persistency:",
+     "m_value": true
+    }, {
+     "type": "string",
+     "m_label": "Title:",
+     "m_value": "Motor"
+    }, {
+     "type": "virtualFolderPicker",
+     "m_label": "Virtual Folder:",
+     "m_path": "Project:wxcrafter"
+    }, {
+     "type": "choice",
+     "m_label": "Centre:",
+     "m_selection": 1,
+     "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"]
+    }, {
+     "type": "string",
+     "m_label": "Inherited Class",
+     "m_value": "IndMotorForm"
+    }, {
+     "type": "string",
+     "m_label": "File:",
+     "m_value": "IndMotorForm"
     }, {
      "type": "string",
      "m_label": "Class Decorator",
@@ -25199,6 +26343,299 @@
                 }, {
                  "type": "string",
                  "m_label": "Name:",
+                 "m_value": "boxSizerLvl4_1"
+                }, {
+                 "type": "string",
+                 "m_label": "Style:",
+                 "m_value": ""
+                }, {
+                 "type": "choice",
+                 "m_label": "Orientation:",
+                 "m_selection": 0,
+                 "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                }],
+               "m_events": [],
+               "m_children": [{
+                 "m_type": 4405,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxALIGN_CENTER_VERTICAL"],
+                 "m_properties": [{
+                   "type": "winid",
+                   "m_label": "ID:",
+                   "m_winid": "wxID_ANY"
+                  }, {
+                   "type": "string",
+                   "m_label": "Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "m_staticTextActivePower"
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Tooltip:",
+                   "m_value": ""
+                  }, {
+                   "type": "colour",
+                   "m_label": "Bg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "colour",
+                   "m_label": "Fg Colour:",
+                   "colour": "<Default>"
+                  }, {
+                   "type": "font",
+                   "m_label": "Font:",
+                   "m_value": ""
+                  }, {
+                   "type": "bool",
+                   "m_label": "Hidden",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Disabled",
+                   "m_value": false
+                  }, {
+                   "type": "bool",
+                   "m_label": "Focused",
+                   "m_value": false
+                  }, {
+                   "type": "string",
+                   "m_label": "Class Name:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Include File:",
+                   "m_value": ""
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "multi-string",
+                   "m_label": "Label:",
+                   "m_value": "Active power"
+                  }, {
+                   "type": "string",
+                   "m_label": "Wrap:",
+                   "m_value": "-1"
+                  }],
+                 "m_events": [],
+                 "m_children": []
+                }, {
+                 "m_type": 4401,
+                 "proportion": 0,
+                 "border": 5,
+                 "gbSpan": "1,1",
+                 "gbPosition": "0,0",
+                 "m_styles": [],
+                 "m_sizerFlags": ["wxEXPAND"],
+                 "m_properties": [{
+                   "type": "string",
+                   "m_label": "Minimum Size:",
+                   "m_value": "-1,-1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Name:",
+                   "m_value": "boxSizerLvl5_1"
+                  }, {
+                   "type": "string",
+                   "m_label": "Style:",
+                   "m_value": ""
+                  }, {
+                   "type": "choice",
+                   "m_label": "Orientation:",
+                   "m_selection": 1,
+                   "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
+                  }],
+                 "m_events": [],
+                 "m_children": [{
+                   "m_type": 4406,
+                   "proportion": 1,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_textCtrlActivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Value:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Text Hint",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Max Length:",
+                     "m_value": "0"
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Directories:",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Auto Complete Files:",
+                     "m_value": false
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }, {
+                   "m_type": 4411,
+                   "proportion": 0,
+                   "border": 5,
+                   "gbSpan": "1,1",
+                   "gbPosition": "0,0",
+                   "m_styles": [],
+                   "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM"],
+                   "m_properties": [{
+                     "type": "winid",
+                     "m_label": "ID:",
+                     "m_winid": "wxID_ANY"
+                    }, {
+                     "type": "string",
+                     "m_label": "Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Minimum Size:",
+                     "m_value": "-1,-1"
+                    }, {
+                     "type": "string",
+                     "m_label": "Name:",
+                     "m_value": "m_choiceActivePower"
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Tooltip:",
+                     "m_value": ""
+                    }, {
+                     "type": "colour",
+                     "m_label": "Bg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "colour",
+                     "m_label": "Fg Colour:",
+                     "colour": "<Default>"
+                    }, {
+                     "type": "font",
+                     "m_label": "Font:",
+                     "m_value": ""
+                    }, {
+                     "type": "bool",
+                     "m_label": "Hidden",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Disabled",
+                     "m_value": false
+                    }, {
+                     "type": "bool",
+                     "m_label": "Focused",
+                     "m_value": false
+                    }, {
+                     "type": "string",
+                     "m_label": "Class Name:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Include File:",
+                     "m_value": ""
+                    }, {
+                     "type": "string",
+                     "m_label": "Style:",
+                     "m_value": ""
+                    }, {
+                     "type": "multi-string",
+                     "m_label": "Choices:",
+                     "m_value": "p.u.;W;kW;MW"
+                    }, {
+                     "type": "string",
+                     "m_label": "Selection:",
+                     "m_value": "3"
+                    }],
+                   "m_events": [],
+                   "m_children": []
+                  }]
+                }]
+              }, {
+               "m_type": 4401,
+               "proportion": 0,
+               "border": 5,
+               "gbSpan": "1,1",
+               "gbPosition": "0,0",
+               "m_styles": [],
+               "m_sizerFlags": ["wxEXPAND"],
+               "m_properties": [{
+                 "type": "string",
+                 "m_label": "Minimum Size:",
+                 "m_value": "-1,-1"
+                }, {
+                 "type": "string",
+                 "m_label": "Name:",
                  "m_value": "boxSizerLvl4_2"
                 }, {
                  "type": "string",
@@ -25740,7 +27177,7 @@
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "m_buttonCancel"
+           "m_value": "m_ButtonCancel"
           }, {
            "type": "multi-string",
            "m_label": "Tooltip:",
diff --git a/Project/GeneratorForm.cpp b/Project/GeneratorForm.cpp
deleted file mode 100644
index e8cc332..0000000
--- a/Project/GeneratorForm.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-#include "GeneratorForm.h"
-#include "GeneratorStabForm.h"
-#include "SyncGenerator.h"
-
-GeneratorForm::GeneratorForm(wxWindow* parent, SyncGenerator* syncGenerator) : GeneratorFormBase(parent)
-{
-    SetSize(GetBestSize());
-    ReplaceStaticTextLabelChar(m_staticTextPosResistance, L'\u2081');
-    ReplaceStaticTextLabelChar(m_staticTextPosReactance, L'\u2081');
-    ReplaceStaticTextLabelChar(m_staticTextNegResistance, L'\u2082');
-    ReplaceStaticTextLabelChar(m_staticTextNegReactance, L'\u2082');
-    ReplaceStaticTextLabelChar(m_staticTextZeroResistance, L'\u2080');
-    ReplaceStaticTextLabelChar(m_staticTextZeroReactance, L'\u2080');
-    Layout();
-    m_syncGenerator = syncGenerator;
-    m_parent = parent;
-
-    SyncGeneratorElectricalData data = syncGenerator->GetElectricalData();
-
-    m_textCtrlName->SetValue(data.name);
-
-    m_textCtrlnominalPower->SetValue(wxString::FromDouble(data.nominalPower));
-    switch(data.nominalPowerUnit)
-	{
-	    case UNIT_VA:
-		m_choiceNominalPower->SetSelection(0);
-		break;
-	    case UNIT_kVA:
-		m_choiceNominalPower->SetSelection(1);
-		break;
-	    case UNIT_MVA:
-		m_choiceNominalPower->SetSelection(2);
-		break;
-	    default:
-		break;
-	}
-
-    m_textCtrlActivePower->SetValue(wxString::FromDouble(data.activePower));
-    switch(data.activePowerUnit)
-	{
-	    case UNIT_PU:
-		m_choiceActivePower->SetSelection(0);
-		break;
-	    case UNIT_W:
-		m_choiceActivePower->SetSelection(1);
-		break;
-	    case UNIT_kW:
-		m_choiceActivePower->SetSelection(2);
-		break;
-	    case UNIT_MW:
-		m_choiceActivePower->SetSelection(3);
-		break;
-	    default:
-		break;
-	}
-
-    m_textCtrlReactivePower->SetValue(wxString::FromDouble(data.reactivePower));
-    switch(data.reactivePowerUnit)
-	{
-	    case UNIT_PU:
-		m_choiceReactivePower->SetSelection(0);
-		break;
-	    case UNIT_VAr:
-		m_choiceReactivePower->SetSelection(1);
-		break;
-	    case UNIT_kVAr:
-		m_choiceReactivePower->SetSelection(2);
-		break;
-	    case UNIT_MVAr:
-		m_choiceReactivePower->SetSelection(3);
-		break;
-	    default:
-		break;
-	}
-    m_checkBoxMaxReactive->SetValue(data.haveMaxReactive);
-
-    m_textCtrlMaxRectivePower->SetValue(wxString::FromDouble(data.maxReactive));
-    switch(data.maxReactiveUnit)
-	{
-	    case UNIT_PU:
-		m_choiceMaxRectivePower->SetSelection(0);
-		break;
-	    case UNIT_VAr:
-		m_choiceMaxRectivePower->SetSelection(1);
-		break;
-	    case UNIT_kVAr:
-		m_choiceMaxRectivePower->SetSelection(2);
-		break;
-	    case UNIT_MVAr:
-		m_choiceMaxRectivePower->SetSelection(3);
-		break;
-	    default:
-		break;
-	}
-    m_textCtrlMaxRectivePower->Enable(data.haveMaxReactive);
-    m_choiceMaxRectivePower->Enable(data.haveMaxReactive);
-
-    m_checkBoxMinReactive->SetValue(data.haveMinReactive);
-    m_textCtrlMinRectivePower->SetValue(wxString::FromDouble(data.minReactive));
-    switch(data.minReactiveUnit)
-	{
-	    case UNIT_PU:
-		m_choiceMinRectivePower->SetSelection(0);
-		break;
-	    case UNIT_VAr:
-		m_choiceMinRectivePower->SetSelection(1);
-		break;
-	    case UNIT_kVAr:
-		m_choiceMinRectivePower->SetSelection(2);
-		break;
-	    case UNIT_MVAr:
-		m_choiceMinRectivePower->SetSelection(3);
-		break;
-	    default:
-		break;
-	}
-    m_textCtrlMinRectivePower->Enable(data.haveMinReactive);
-    m_choiceMinRectivePower->Enable(data.haveMinReactive);
-
-    m_checkBoxUseMachinePower->SetValue(data.useMachineBase);
-
-    m_textCtrlPosResistance->SetValue(wxString::FromDouble(data.positiveResistance));
-    m_textCtrlPosReactance->SetValue(wxString::FromDouble(data.positiveReactance));
-    m_textCtrlNegResistance->SetValue(wxString::FromDouble(data.negativeResistance));
-    m_textCtrlNegReactance->SetValue(wxString::FromDouble(data.negativeReactance));
-    m_textCtrlZeroResistance->SetValue(wxString::FromDouble(data.zeroResistance));
-    m_textCtrlZeroReactance->SetValue(wxString::FromDouble(data.zeroReactance));
-    m_textCtrlGrdResistance->SetValue(wxString::FromDouble(data.groundResistance));
-    m_textCtrlGrdReactance->SetValue(wxString::FromDouble(data.groundReactance));
-    m_checkBoxGroundNeutral->SetValue(data.groundNeutral);
-}
-GeneratorForm::~GeneratorForm() {}
-void GeneratorForm::OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); }
-void GeneratorForm::OnCheckMaxReactive(wxCommandEvent& event)
-{
-    m_textCtrlMaxRectivePower->Enable(m_checkBoxMaxReactive->GetValue());
-    m_choiceMaxRectivePower->Enable(m_checkBoxMaxReactive->GetValue());
-}
-
-void GeneratorForm::OnCheckMinReactive(wxCommandEvent& event)
-{
-    m_textCtrlMinRectivePower->Enable(m_checkBoxMinReactive->GetValue());
-    m_choiceMinRectivePower->Enable(m_checkBoxMinReactive->GetValue());
-}
-
-void GeneratorForm::OnOKButtonClick(wxCommandEvent& event)
-{
-    if(!ValidateData()) return;
-    EndModal(wxID_OK);
-}
-void GeneratorForm::OnStabilityButtonClick(wxCommandEvent& event)
-{
-    if(!ValidateData()) return;
-    GeneratorStabForm* stabForm = new GeneratorStabForm(m_parent, m_syncGenerator);
-    if(stabForm->ShowModal() == wxID_OK) {
-	    stabForm->Destroy();
-	    EndModal(wxID_OK);
-	}
-
-    stabForm->Destroy();
-    EndModal(wxID_CANCEL);
-}
-
-void GeneratorForm::ReplaceStaticTextLabelChar(wxStaticText* staticText, wchar_t newChar)
-{
-    wxString label = staticText->GetLabel();
-    label[label.length() - 2] = newChar;
-    staticText->SetLabel(label);
-}
-
-bool GeneratorForm::ValidateData()
-{
-    SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
-    data.name = m_textCtrlName->GetValue();
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlnominalPower->GetValue(), data.nominalPower,
-                                          _("Value entered incorrectly in the field \"Nominal power\".")))
-	return false;
-    switch(m_choiceNominalPower->GetSelection())
-	{
-	    case 0:
-		data.nominalPowerUnit = UNIT_VA;
-		break;
-	    case 1:
-		data.nominalPowerUnit = UNIT_kVA;
-		break;
-	    case 2:
-		data.nominalPowerUnit = UNIT_MVA;
-		break;
-	}
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlActivePower->GetValue(), data.activePower,
-                                          _("Value entered incorrectly in the field \"Active power\".")))
-	return false;
-    switch(m_choiceActivePower->GetSelection())
-	{
-	    case 0:
-		data.activePowerUnit = UNIT_PU;
-		break;
-	    case 1:
-		data.activePowerUnit = UNIT_W;
-		break;
-	    case 2:
-		data.activePowerUnit = UNIT_kW;
-		break;
-	    case 3:
-		data.activePowerUnit = UNIT_MW;
-		break;
-	}
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlReactivePower->GetValue(), data.reactivePower,
-                                          _("Value entered incorrectly in the field \"Reactive power\".")))
-	return false;
-    switch(m_choiceReactivePower->GetSelection())
-	{
-	    case 0:
-		data.reactivePowerUnit = UNIT_PU;
-		break;
-	    case 1:
-		data.reactivePowerUnit = UNIT_VAr;
-		break;
-	    case 2:
-		data.reactivePowerUnit = UNIT_kVAr;
-		break;
-	    case 3:
-		data.reactivePowerUnit = UNIT_MVAr;
-		break;
-	}
-
-    data.haveMaxReactive = m_checkBoxMaxReactive->GetValue();
-    if(data.haveMaxReactive) {
-	    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlMaxRectivePower->GetValue(), data.maxReactive,
-	                                          _("Value entered incorrectly in the field \"Max reactive power\".")))
-		return false;
-	    switch(m_choiceMaxRectivePower->GetSelection())
-		{
-		    case 0:
-			data.maxReactiveUnit = UNIT_PU;
-			break;
-		    case 1:
-			data.maxReactiveUnit = UNIT_VAr;
-			break;
-		    case 2:
-			data.maxReactiveUnit = UNIT_kVAr;
-			break;
-		    case 3:
-			data.maxReactiveUnit = UNIT_MVAr;
-			break;
-		}
-	}
-
-    data.haveMinReactive = m_checkBoxMinReactive->GetValue();
-    if(data.haveMinReactive) {
-	    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlMinRectivePower->GetValue(), data.minReactive,
-	                                          _("Value entered incorrectly in the field \"Min reactive power\".")))
-		return false;
-	    switch(m_choiceMinRectivePower->GetSelection())
-		{
-		    case 0:
-			data.minReactiveUnit = UNIT_PU;
-			break;
-		    case 1:
-			data.minReactiveUnit = UNIT_VAr;
-			break;
-		    case 2:
-			data.minReactiveUnit = UNIT_kVAr;
-			break;
-		    case 3:
-			data.minReactiveUnit = UNIT_MVAr;
-			break;
-		}
-	}
-
-    data.useMachineBase = m_checkBoxUseMachinePower->GetValue();
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlPosResistance->GetValue(), data.positiveResistance,
-                                          _("Value entered incorrectly in the field \"Positive resistance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlPosReactance->GetValue(), data.positiveReactance,
-                                          _("Value entered incorrectly in the field \"Positive reactance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlNegResistance->GetValue(), data.negativeResistance,
-                                          _("Value entered incorrectly in the field \"Negative resistance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlNegReactance->GetValue(), data.negativeReactance,
-                                          _("Value entered incorrectly in the field \"Negative reactance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlZeroResistance->GetValue(), data.zeroResistance,
-                                          _("Value entered incorrectly in the field \"Zero resistance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlZeroReactance->GetValue(), data.zeroReactance,
-                                          _("Value entered incorrectly in the field \"Zero reactance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlGrdResistance->GetValue(), data.groundResistance,
-                                          _("Value entered incorrectly in the field \"Ground resistance\".")))
-	return false;
-
-    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlGrdReactance->GetValue(), data.groundReactance,
-                                          _("Value entered incorrectly in the field \"Ground reactance\".")))
-	return false;
-
-    data.groundNeutral = m_checkBoxGroundNeutral->GetValue();
-
-    m_syncGenerator->SetElectricalData(data);
-    return true;
-}
diff --git a/Project/GeneratorForm.h b/Project/GeneratorForm.h
deleted file mode 100644
index e017852..0000000
--- a/Project/GeneratorForm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef GENERATORFORM_H
-#define GENERATORFORM_H
-
-#include "ElementForm.h"
-
-class GeneratorStabForm;
-class SyncGenerator;
-
-class GeneratorForm : public GeneratorFormBase
-{
-   public:
-    GeneratorForm(wxWindow* parent, SyncGenerator* syncGenerator);
-    virtual ~GeneratorForm();
-	
-protected:
-    virtual void OnStabilityButtonClick(wxCommandEvent& event);
-    virtual void OnCancelButtonClick(wxCommandEvent& event);
-    virtual void OnCheckMaxReactive(wxCommandEvent& event);
-    virtual void OnCheckMinReactive(wxCommandEvent& event);
-    virtual void OnOKButtonClick(wxCommandEvent& event);
-	
-	virtual bool ValidateData();
-	virtual void ReplaceStaticTextLabelChar(wxStaticText* staticText, wchar_t newChar);
-
-	SyncGenerator* m_syncGenerator;
-	wxWindow* m_parent;
-	
-};
-#endif  // GENERATORFORM_H
diff --git a/Project/IndMotor.cpp b/Project/IndMotor.cpp
index b84e585..26d19e9 100644
--- a/Project/IndMotor.cpp
+++ b/Project/IndMotor.cpp
@@ -1,27 +1,34 @@
+#include "IndMotorForm.h"
 #include "IndMotor.h"
 
-IndMotor::IndMotor() : Machines()
-{
-}
-
-IndMotor::~IndMotor()
-{
-}
-
+IndMotor::IndMotor() : Machines() {}
+IndMotor::IndMotor(wxString name) : Machines() { m_electricalData.name = name; }
+IndMotor::~IndMotor() {}
 void IndMotor::DrawSymbol() const
 {
-	std::vector<wxPoint2DDouble> mPts;
-	mPts.push_back(wxPoint2DDouble(-10, 13) + m_position);
-	mPts.push_back(wxPoint2DDouble(-10, -13) + m_position);
-	mPts.push_back(wxPoint2DDouble(0, 2) + m_position);
-	mPts.push_back(wxPoint2DDouble(10, -13) + m_position);
-	mPts.push_back(wxPoint2DDouble(10, 13) + m_position);
-	DrawLine(mPts);
+    std::vector<wxPoint2DDouble> mPts;
+    mPts.push_back(wxPoint2DDouble(-10, 13) + m_position);
+    mPts.push_back(wxPoint2DDouble(-10, -13) + m_position);
+    mPts.push_back(wxPoint2DDouble(0, 2) + m_position);
+    mPts.push_back(wxPoint2DDouble(10, -13) + m_position);
+    mPts.push_back(wxPoint2DDouble(10, 13) + m_position);
+    DrawLine(mPts);
 }
 
 bool IndMotor::GetContextMenu(wxMenu& menu)
 {
-	menu.Append(ID_EDIT_INDMOTOR, _("Edit induction motor"));
+    menu.Append(ID_EDIT_INDMOTOR, _("Edit induction motor"));
     GeneralMenuItens(menu);
     return true;
 }
+
+bool IndMotor::ShowForm(wxWindow* parent, Element* element)
+{
+    IndMotorForm* indMotorForm = new IndMotorForm(parent, this);
+    if(indMotorForm->ShowModal() == wxID_OK) {
+        indMotorForm->Destroy();
+        return true;
+    }
+    indMotorForm->Destroy();
+    return false;
+}
diff --git a/Project/IndMotor.h b/Project/IndMotor.h
index 911edd1..7624e71 100644
--- a/Project/IndMotor.h
+++ b/Project/IndMotor.h
@@ -3,14 +3,30 @@
 
 #include "Machines.h"
 
+class IndMotorForm;
+
+struct IndMotorElectricalData {
+    wxString name;
+    double activePower = 100.0;
+    ElectricalUnit activePowerUnit = UNIT_MW;
+    double reactivePower = 0.0;
+    ElectricalUnit reactivePowerUnit = UNIT_MVAr;
+};
+
 class IndMotor : public Machines
 {
-public:
-	IndMotor();
-	~IndMotor();
-	
-	virtual void DrawSymbol() const;
-	virtual bool GetContextMenu(wxMenu& menu);
+   public:
+    IndMotor();
+    IndMotor(wxString name);
+    ~IndMotor();
+
+    virtual void DrawSymbol() const;
+    virtual bool GetContextMenu(wxMenu& menu);
+    virtual bool ShowForm(wxWindow* parent, Element* element);
+    virtual IndMotorElectricalData GetElectricalData() { return m_electricalData; }
+    virtual void SetElectricalData(IndMotorElectricalData electricalData) { m_electricalData = electricalData; }
+   protected:
+    IndMotorElectricalData m_electricalData;
 };
 
-#endif // INDMOTOR_H
+#endif  // INDMOTOR_H
diff --git a/Project/IndMotorForm.cpp b/Project/IndMotorForm.cpp
new file mode 100644
index 0000000..177b42b
--- /dev/null
+++ b/Project/IndMotorForm.cpp
@@ -0,0 +1,105 @@
+#include "IndMotorForm.h"
+#include "IndMotor.h"
+
+IndMotorForm::IndMotorForm(wxWindow* parent, IndMotor* indMotor) : IndMotorFormBase(parent)
+{
+    m_buttonStabButton->Enable(false);
+    IndMotorElectricalData data = indMotor->GetElectricalData();
+
+    m_textCtrlName->SetValue(data.name);
+
+    m_textCtrlActivePower->SetValue(IndMotor::StringFromDouble(data.activePower));
+    switch(data.activePowerUnit) {
+        case UNIT_PU: {
+            m_choiceActivePower->SetSelection(0);
+        } break;
+        case UNIT_W: {
+            m_choiceActivePower->SetSelection(1);
+        } break;
+        case UNIT_kW: {
+            m_choiceActivePower->SetSelection(2);
+        } break;
+        case UNIT_MW: {
+            m_choiceActivePower->SetSelection(3);
+        } break;
+        default:
+            break;
+    }
+
+    m_textCtrlReactivePower->SetValue(IndMotor::StringFromDouble(data.reactivePower));
+    switch(data.reactivePowerUnit) {
+        case UNIT_PU: {
+            m_choiceReactivePower->SetSelection(0);
+        } break;
+        case UNIT_VAr: {
+            m_choiceReactivePower->SetSelection(1);
+        } break;
+        case UNIT_kVAr: {
+            m_choiceReactivePower->SetSelection(2);
+        } break;
+        case UNIT_MVAr: {
+            m_choiceReactivePower->SetSelection(3);
+        } break;
+        default:
+            break;
+    }
+
+    m_parent = parent;
+    m_indMotor = indMotor;
+}
+
+IndMotorForm::~IndMotorForm() {}
+void IndMotorForm::OnOKButtonClick(wxCommandEvent& event)
+{
+    if(ValidateData()) EndModal(wxID_OK);
+}
+void IndMotorForm::OnStabilityButtonClick(wxCommandEvent& event)
+{
+    // TODO: Induction motor stability form
+}
+
+bool IndMotorForm::ValidateData()
+{
+    IndMotorElectricalData data;
+    
+    data.name = m_textCtrlName->GetValue();
+
+    if(!m_indMotor->DoubleFromString(m_parent, m_textCtrlActivePower->GetValue(), data.activePower,
+                                     _("Value entered incorrectly in the field \"Active power\".")))
+        return false;
+    switch(m_choiceActivePower->GetSelection()) {
+        case 0: {
+            data.activePowerUnit = UNIT_PU;
+        } break;
+        case 1: {
+            data.activePowerUnit = UNIT_W;
+        } break;
+        case 2: {
+            data.activePowerUnit = UNIT_kW;
+        } break;
+        case 3: {
+            data.activePowerUnit = UNIT_MW;
+        } break;
+    }
+
+    if(!m_indMotor->DoubleFromString(m_parent, m_textCtrlReactivePower->GetValue(), data.reactivePower,
+                                     _("Value entered incorrectly in the field \"Reactive power\".")))
+        return false;
+    switch(m_choiceReactivePower->GetSelection()) {
+        case 0: {
+            data.reactivePowerUnit = UNIT_PU;
+        } break;
+        case 1: {
+            data.reactivePowerUnit = UNIT_VAr;
+        } break;
+        case 2: {
+            data.reactivePowerUnit = UNIT_kVAr;
+        } break;
+        case 3: {
+            data.reactivePowerUnit = UNIT_MVAr;
+        } break;
+    }
+
+    m_indMotor->SetElectricalData(data);
+    return true;
+}
diff --git a/Project/IndMotorForm.h b/Project/IndMotorForm.h
new file mode 100644
index 0000000..90a680c
--- /dev/null
+++ b/Project/IndMotorForm.h
@@ -0,0 +1,22 @@
+#ifndef INDMOTORFORM_H
+#define INDMOTORFORM_H
+#include "ElementForm.h"
+
+class IndMotor;
+
+class IndMotorForm : public IndMotorFormBase
+{
+   public:
+    IndMotorForm(wxWindow* parent, IndMotor* indMotor);
+    virtual ~IndMotorForm();
+    virtual bool ValidateData();
+
+   protected:
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); };
+    virtual void OnOKButtonClick(wxCommandEvent& event);
+    virtual void OnStabilityButtonClick(wxCommandEvent& event);
+
+    wxWindow* m_parent;
+    IndMotor* m_indMotor;
+};
+#endif  // INDMOTORFORM_H
diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp
index 1eadf70..bff01f7 100644
--- a/Project/MainFrame.cpp
+++ b/Project/MainFrame.cpp
@@ -267,13 +267,15 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event)
                     newElement = true;
                 } break;
                 case ID_ADDMENU_INDMOTOR: {
-                    IndMotor* newIndMotor = new IndMotor();
+                    IndMotor* newIndMotor = new IndMotor(wxString::Format(_("Induction motor %d"), workspace->GetElementNumber(ID_INDMOTOR)));
+                    workspace->IncrementElementNumber(ID_INDMOTOR);
                     elementList.push_back(newIndMotor);
                     statusBarText = _("Insert Induction Motor: Click on a buses, ESC to cancel.");
                     newElement = true;
                 } break;
                 case ID_ADDMENU_SYNCCOMP: {
-                    SyncMotor* newSyncCondenser = new SyncMotor();
+                    SyncMotor* newSyncCondenser = new SyncMotor(wxString::Format(_("Synchronous condenser %d"), workspace->GetElementNumber(ID_SYNCMOTOR)));
+                    workspace->IncrementElementNumber(ID_SYNCMOTOR);
                     elementList.push_back(newSyncCondenser);
                     statusBarText = _("Insert Synchronous Condenser: Click on a buses, ESC to cancel.");
                     newElement = true;
diff --git a/Project/Project.mk b/Project/Project.mk
index a389d76..ab401cd 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=Thales
-Date                   :=25/10/2016
+Date                   :=27/10/2016
 CodeLitePath           :="C:/Program Files/CodeLite"
 LinkerName             :=C:/TDM-GCC-64/bin/g++.exe
 SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC
@@ -66,8 +66,8 @@ WXWIN:=C:\wxWidgets-3.1.0
 WXCFG:=gcc_dll\mswu
 Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) \
 	$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) 
+	$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) 
 
 
 
@@ -300,14 +300,6 @@ $(IntermediateDirectory)/BusForm.cpp$(DependSuffix): BusForm.cpp
 $(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix): BusForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix)BusForm.cpp
 
-$(IntermediateDirectory)/GeneratorForm.cpp$(ObjectSuffix): GeneratorForm.cpp $(IntermediateDirectory)/GeneratorForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GeneratorForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneratorForm.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/GeneratorForm.cpp$(DependSuffix): GeneratorForm.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GeneratorForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GeneratorForm.cpp$(DependSuffix) -MM GeneratorForm.cpp
-
-$(IntermediateDirectory)/GeneratorForm.cpp$(PreprocessSuffix): GeneratorForm.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GeneratorForm.cpp$(PreprocessSuffix)GeneratorForm.cpp
-
 $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix): GeneratorStabForm.cpp $(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GeneratorStabForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix): GeneratorStabForm.cpp
@@ -356,6 +348,22 @@ $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix): ReactiveSh
 $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix): ReactiveShuntElementForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix)ReactiveShuntElementForm.cpp
 
+$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix): IndMotorForm.cpp $(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/IndMotorForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix): IndMotorForm.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix) -MM IndMotorForm.cpp
+
+$(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix): IndMotorForm.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix)IndMotorForm.cpp
+
+$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix): SyncMachineForm.cpp $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SyncMachineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix): SyncMachineForm.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix) -MM SyncMachineForm.cpp
+
+$(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix): SyncMachineForm.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix)SyncMachineForm.cpp
+
 
 -include $(IntermediateDirectory)/*$(DependSuffix)
 ##
diff --git a/Project/Project.project b/Project/Project.project
index 19f1ccb..681835f 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -33,13 +33,14 @@
       <File Name="Workspace.cpp"/>
       <VirtualDirectory Name="element forms">
         <File Name="BusForm.cpp"/>
-        <File Name="GeneratorForm.cpp"/>
         <File Name="GeneratorStabForm.cpp"/>
         <File Name="LineForm.cpp"/>
         <File Name="SwitchingForm.cpp"/>
         <File Name="TransformerForm.cpp"/>
         <File Name="LoadForm.cpp"/>
         <File Name="ReactiveShuntElementForm.cpp"/>
+        <File Name="IndMotorForm.cpp"/>
+        <File Name="SyncMachineForm.cpp"/>
       </VirtualDirectory>
     </VirtualDirectory>
     <File Name="main.cpp"/>
@@ -70,13 +71,14 @@
       <File Name="Workspace.h"/>
       <VirtualDirectory Name="element forms">
         <File Name="BusForm.h"/>
-        <File Name="GeneratorForm.h"/>
         <File Name="GeneratorStabForm.h"/>
         <File Name="LineForm.h"/>
         <File Name="SwitchingForm.h"/>
         <File Name="TransformerForm.h"/>
         <File Name="LoadForm.h"/>
         <File Name="ReactiveShuntElementForm.h"/>
+        <File Name="IndMotorForm.h"/>
+        <File Name="SyncMachineForm.h"/>
       </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>
diff --git a/Project/Project.txt b/Project/Project.txt
index 15aedef..f5e70f8 100644
--- a/Project/Project.txt
+++ b/Project/Project.txt
@@ -1 +1 @@
-./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/ArtMetro.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/Element.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o   
+./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/ArtMetro.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/Element.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o   
diff --git a/Project/Release/Branch.cpp.o.d b/Project/Release/Branch.cpp.o.d
index ad389b7..28ab5bf 100644
--- a/Project/Release/Branch.cpp.o.d
+++ b/Project/Release/Branch.cpp.o.d
@@ -130,8 +130,10 @@ Release/Branch.cpp.o: Branch.cpp Branch.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h Bus.h BusForm.h ElementForm.h \
- C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h Bus.h BusForm.h \
+ ElementForm.h C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
  C:/wxWidgets-3.1.0/include/wx/filesys.h \
  C:/wxWidgets-3.1.0/include/wx/filename.h \
  C:/wxWidgets-3.1.0/include/wx/file.h \
@@ -170,6 +172,46 @@ Release/Branch.cpp.o: Branch.cpp Branch.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
  C:/wxWidgets-3.1.0/include/wx/statline.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/persist.h \
  C:/wxWidgets-3.1.0/include/wx/confbase.h \
  C:/wxWidgets-3.1.0/include/wx/base64.h \
@@ -183,7 +225,6 @@ Release/Branch.cpp.o: Branch.cpp Branch.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/treectrl.h \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
  C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h
 
 Branch.h:
@@ -456,6 +497,10 @@ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
 
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
+
 Bus.h:
 
 BusForm.h:
@@ -540,6 +585,88 @@ C:/wxWidgets-3.1.0/include/wx/statline.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
 
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 C:/wxWidgets-3.1.0/include/wx/persist.h:
 
 C:/wxWidgets-3.1.0/include/wx/confbase.h:
@@ -566,6 +693,4 @@ C:/wxWidgets-3.1.0/include/wx/treebase.h:
 
 C:/wxWidgets-3.1.0/include/wx/itemid.h:
 
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
diff --git a/Project/Release/Bus.cpp.o.d b/Project/Release/Bus.cpp.o.d
index 49e4119..ebbaf2d 100644
--- a/Project/Release/Bus.cpp.o.d
+++ b/Project/Release/Bus.cpp.o.d
@@ -159,6 +159,47 @@ Release/Bus.cpp.o: Bus.cpp Bus.h BusForm.h ElementForm.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
  C:/wxWidgets-3.1.0/include/wx/statline.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/persist.h \
  C:/wxWidgets-3.1.0/include/wx/confbase.h \
  C:/wxWidgets-3.1.0/include/wx/base64.h \
@@ -172,19 +213,19 @@ Release/Bus.cpp.o: Bus.cpp Bus.h BusForm.h ElementForm.h \
  C:/wxWidgets-3.1.0/include/wx/treectrl.h \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
  C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
 Bus.h:
 
@@ -514,6 +555,90 @@ C:/wxWidgets-3.1.0/include/wx/statline.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
 
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 C:/wxWidgets-3.1.0/include/wx/persist.h:
 
 C:/wxWidgets-3.1.0/include/wx/confbase.h:
@@ -540,8 +665,6 @@ C:/wxWidgets-3.1.0/include/wx/treebase.h:
 
 C:/wxWidgets-3.1.0/include/wx/itemid.h:
 
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
 
 Element.h:
@@ -554,8 +677,6 @@ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
 
-C:/wxWidgets-3.1.0/include/wx/geometry.h:
-
 C:/wxWidgets-3.1.0/include/wx/menu.h:
 
 C:/wxWidgets-3.1.0/include/wx/menuitem.h:
@@ -567,3 +688,7 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/BusForm.cpp.o.d b/Project/Release/BusForm.cpp.o.d
index b9eb44b..9320833 100644
--- a/Project/Release/BusForm.cpp.o.d
+++ b/Project/Release/BusForm.cpp.o.d
@@ -159,6 +159,47 @@ Release/BusForm.cpp.o: BusForm.cpp BusForm.h ElementForm.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
  C:/wxWidgets-3.1.0/include/wx/statline.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/persist.h \
  C:/wxWidgets-3.1.0/include/wx/confbase.h \
  C:/wxWidgets-3.1.0/include/wx/base64.h \
@@ -172,19 +213,19 @@ Release/BusForm.cpp.o: BusForm.cpp BusForm.h ElementForm.h \
  C:/wxWidgets-3.1.0/include/wx/treectrl.h \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
  C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
 BusForm.h:
 
@@ -512,6 +553,90 @@ C:/wxWidgets-3.1.0/include/wx/statline.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
 
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 C:/wxWidgets-3.1.0/include/wx/persist.h:
 
 C:/wxWidgets-3.1.0/include/wx/confbase.h:
@@ -538,8 +663,6 @@ C:/wxWidgets-3.1.0/include/wx/treebase.h:
 
 C:/wxWidgets-3.1.0/include/wx/itemid.h:
 
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
 
 Bus.h:
@@ -554,8 +677,6 @@ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
 
-C:/wxWidgets-3.1.0/include/wx/geometry.h:
-
 C:/wxWidgets-3.1.0/include/wx/menu.h:
 
 C:/wxWidgets-3.1.0/include/wx/menuitem.h:
@@ -567,3 +688,7 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/ElementForm.cpp.o b/Project/Release/ElementForm.cpp.o
index f76de5e..51e6cce 100644
--- a/Project/Release/ElementForm.cpp.o
+++ b/Project/Release/ElementForm.cpp.o
diff --git a/Project/Release/GeneratorForm.cpp.o b/Project/Release/GeneratorForm.cpp.o
deleted file mode 100644
index 38496f5..0000000
--- a/Project/Release/GeneratorForm.cpp.o
+++ /dev/null
diff --git a/Project/Release/GeneratorStabForm.cpp.o.d b/Project/Release/GeneratorStabForm.cpp.o.d
index ea12500..8a40081 100644
--- a/Project/Release/GeneratorStabForm.cpp.o.d
+++ b/Project/Release/GeneratorStabForm.cpp.o.d
@@ -215,7 +215,7 @@ Release/GeneratorStabForm.cpp.o: GeneratorStabForm.cpp \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
  C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h SwitchingForm.h \
- SyncGenerator.h GeneratorForm.h Machines.h Element.h \
+ SyncGenerator.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
@@ -671,8 +671,6 @@ SwitchingForm.h:
 
 SyncGenerator.h:
 
-GeneratorForm.h:
-
 Machines.h:
 
 Element.h:
diff --git a/Project/Release/IndMotor.cpp.o b/Project/Release/IndMotor.cpp.o
index 36b7efe..407305a 100644
--- a/Project/Release/IndMotor.cpp.o
+++ b/Project/Release/IndMotor.cpp.o
diff --git a/Project/Release/IndMotor.cpp.o.d b/Project/Release/IndMotor.cpp.o.d
index 880ed3c..2f88795 100644
--- a/Project/Release/IndMotor.cpp.o.d
+++ b/Project/Release/IndMotor.cpp.o.d
@@ -1,5 +1,6 @@
-Release/IndMotor.cpp.o: IndMotor.cpp IndMotor.h Machines.h Element.h \
- C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+Release/IndMotor.cpp.o: IndMotor.cpp IndMotorForm.h ElementForm.h \
+ C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/colour.h \
  C:/wxWidgets-3.1.0/include/wx/defs.h \
  C:/wxWidgets-3.1.0/include/wx/platform.h \
  C:/wxWidgets-3.1.0/include/wx/compiler.h \
@@ -16,11 +17,7 @@ Release/IndMotor.cpp.o: IndMotor.cpp IndMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/windowid.h \
  C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \
  C:/wxWidgets-3.1.0/include/wx/features.h \
- C:/wxWidgets-3.1.0/include/wx/dialog.h \
- C:/wxWidgets-3.1.0/include/wx/toplevel.h \
- C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/window.h \
- C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
  C:/wxWidgets-3.1.0/include/wx/object.h \
  C:/wxWidgets-3.1.0/include/wx/memory.h \
  C:/wxWidgets-3.1.0/include/wx/string.h \
@@ -39,10 +36,8 @@ Release/IndMotor.cpp.o: IndMotor.cpp IndMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \
  C:/wxWidgets-3.1.0/include/wx/flags.h \
  C:/wxWidgets-3.1.0/include/wx/xti2.h \
- C:/wxWidgets-3.1.0/include/wx/clntdata.h \
- C:/wxWidgets-3.1.0/include/wx/hashmap.h \
- C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
- C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/variant.h \
+ C:/wxWidgets-3.1.0/include/wx/arrstr.h \
  C:/wxWidgets-3.1.0/include/wx/list.h \
  C:/wxWidgets-3.1.0/include/wx/vector.h \
  C:/wxWidgets-3.1.0/include/wx/scopeguard.h \
@@ -50,53 +45,81 @@ Release/IndMotor.cpp.o: IndMotor.cpp IndMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/meta/movable.h \
  C:/wxWidgets-3.1.0/include/wx/meta/pod.h \
  C:/wxWidgets-3.1.0/include/wx/meta/if.h \
+ C:/wxWidgets-3.1.0/include/wx/longlong.h \
+ C:/wxWidgets-3.1.0/include/wx/datetime.h \
+ C:/wxWidgets-3.1.0/include/wx/anystr.h \
+ C:/wxWidgets-3.1.0/include/wx/dynarray.h \
+ C:/wxWidgets-3.1.0/include/wx/any.h \
+ C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/font.h \
+ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/hashmap.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
  C:/wxWidgets-3.1.0/include/wx/math.h \
- C:/wxWidgets-3.1.0/include/wx/cursor.h \
- C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/font.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/filesys.h \
+ C:/wxWidgets-3.1.0/include/wx/stream.h \
+ C:/wxWidgets-3.1.0/include/wx/filefn.h \
+ C:/wxWidgets-3.1.0/include/wx/filename.h \
+ C:/wxWidgets-3.1.0/include/wx/intl.h \
+ C:/wxWidgets-3.1.0/include/wx/translation.h \
+ C:/wxWidgets-3.1.0/include/wx/language.h \
+ C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
+ C:/wxWidgets-3.1.0/include/wx/file.h \
+ C:/wxWidgets-3.1.0/include/wx/convauto.h \
+ C:/wxWidgets-3.1.0/include/wx/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/image.h \
+ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpng.h \
+ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
+ C:/wxWidgets-3.1.0/include/wx/imaggif.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
+ C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtga.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagiff.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \
+ C:/wxWidgets-3.1.0/include/wx/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/iconloc.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/artprov.h \
+ C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
+ C:/wxWidgets-3.1.0/include/wx/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/window.h \
+ C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/clntdata.h \
+ C:/wxWidgets-3.1.0/include/wx/cursor.h \
  C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \
  C:/wxWidgets-3.1.0/include/wx/utils.h \
- C:/wxWidgets-3.1.0/include/wx/filefn.h \
- C:/wxWidgets-3.1.0/include/wx/arrstr.h \
- C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
  C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \
  C:/wxWidgets-3.1.0/include/wx/mousestate.h \
  C:/wxWidgets-3.1.0/include/wx/kbdstate.h \
- C:/wxWidgets-3.1.0/include/wx/longlong.h \
  C:/wxWidgets-3.1.0/include/wx/platinfo.h \
- C:/wxWidgets-3.1.0/include/wx/dynarray.h \
  C:/wxWidgets-3.1.0/include/wx/thread.h \
  C:/wxWidgets-3.1.0/include/wx/tracker.h \
- C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
- C:/wxWidgets-3.1.0/include/wx/any.h \
- C:/wxWidgets-3.1.0/include/wx/datetime.h \
- C:/wxWidgets-3.1.0/include/wx/anystr.h \
- C:/wxWidgets-3.1.0/include/wx/variant.h \
  C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \
  C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \
- C:/wxWidgets-3.1.0/include/wx/font.h \
- C:/wxWidgets-3.1.0/include/wx/msw/font.h \
- C:/wxWidgets-3.1.0/include/wx/colour.h \
- C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
  C:/wxWidgets-3.1.0/include/wx/region.h \
  C:/wxWidgets-3.1.0/include/wx/msw/region.h \
- C:/wxWidgets-3.1.0/include/wx/intl.h \
- C:/wxWidgets-3.1.0/include/wx/translation.h \
- C:/wxWidgets-3.1.0/include/wx/language.h \
- C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
- C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
  C:/wxWidgets-3.1.0/include/wx/validate.h \
- C:/wxWidgets-3.1.0/include/wx/palette.h \
- C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
  C:/wxWidgets-3.1.0/include/wx/accel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/accel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/window.h \
- C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
+ C:/wxWidgets-3.1.0/include/wx/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
  C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
- C:/wxWidgets-3.1.0/include/wx/icon.h \
- C:/wxWidgets-3.1.0/include/wx/iconloc.h \
- C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
  C:/wxWidgets-3.1.0/include/wx/weakref.h \
  C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \
  C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \
@@ -107,38 +130,110 @@ Release/IndMotor.cpp.o: IndMotor.cpp IndMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \
  C:/wxWidgets-3.1.0/include/wx/panel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/sizer.h \
+ C:/wxWidgets-3.1.0/include/wx/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/control.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/control.h \
+ C:/wxWidgets-3.1.0/include/wx/withimages.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist.h \
+ C:/wxWidgets-3.1.0/include/wx/confbase.h \
+ C:/wxWidgets-3.1.0/include/wx/base64.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/window.h \
+ C:/wxWidgets-3.1.0/include/wx/display.h \
+ C:/wxWidgets-3.1.0/include/wx/vidmode.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/treebase.h \
+ C:/wxWidgets-3.1.0/include/wx/itemid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h IndMotor.h Machines.h \
+ Element.h C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
- C:/wxWidgets-3.1.0/include/wx/bitmap.h \
- C:/wxWidgets-3.1.0/include/wx/image.h \
- C:/wxWidgets-3.1.0/include/wx/stream.h \
- C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
- C:/wxWidgets-3.1.0/include/wx/imagpng.h \
- C:/wxWidgets-3.1.0/include/wx/imaggif.h \
- C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
- C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
- C:/wxWidgets-3.1.0/include/wx/imagtga.h \
- C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
- C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
- C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
- C:/wxWidgets-3.1.0/include/wx/imagiff.h \
- C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
-IndMotor.h:
+IndMotorForm.h:
 
-Machines.h:
+ElementForm.h:
 
-Element.h:
+C:/wxWidgets-3.1.0/include/wx/settings.h:
 
-C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/colour.h:
 
 C:/wxWidgets-3.1.0/include/wx/defs.h:
 
@@ -172,15 +267,7 @@ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h:
 
 C:/wxWidgets-3.1.0/include/wx/features.h:
 
-C:/wxWidgets-3.1.0/include/wx/dialog.h:
-
-C:/wxWidgets-3.1.0/include/wx/toplevel.h:
-
-C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
-
-C:/wxWidgets-3.1.0/include/wx/window.h:
-
-C:/wxWidgets-3.1.0/include/wx/event.h:
+C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
 
 C:/wxWidgets-3.1.0/include/wx/object.h:
 
@@ -220,13 +307,9 @@ C:/wxWidgets-3.1.0/include/wx/flags.h:
 
 C:/wxWidgets-3.1.0/include/wx/xti2.h:
 
-C:/wxWidgets-3.1.0/include/wx/clntdata.h:
-
-C:/wxWidgets-3.1.0/include/wx/hashmap.h:
-
-C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
+C:/wxWidgets-3.1.0/include/wx/variant.h:
 
-C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
+C:/wxWidgets-3.1.0/include/wx/arrstr.h:
 
 C:/wxWidgets-3.1.0/include/wx/list.h:
 
@@ -242,99 +325,155 @@ C:/wxWidgets-3.1.0/include/wx/meta/pod.h:
 
 C:/wxWidgets-3.1.0/include/wx/meta/if.h:
 
-C:/wxWidgets-3.1.0/include/wx/math.h:
+C:/wxWidgets-3.1.0/include/wx/longlong.h:
 
-C:/wxWidgets-3.1.0/include/wx/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/datetime.h:
 
-C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
+C:/wxWidgets-3.1.0/include/wx/anystr.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
+C:/wxWidgets-3.1.0/include/wx/dynarray.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/any.h:
 
-C:/wxWidgets-3.1.0/include/wx/utils.h:
+C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
 
-C:/wxWidgets-3.1.0/include/wx/filefn.h:
+C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
 
-C:/wxWidgets-3.1.0/include/wx/arrstr.h:
+C:/wxWidgets-3.1.0/include/wx/font.h:
 
-C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
+C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+C:/wxWidgets-3.1.0/include/wx/hashmap.h:
 
-C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
 
-C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+C:/wxWidgets-3.1.0/include/wx/math.h:
 
-C:/wxWidgets-3.1.0/include/wx/longlong.h:
+C:/wxWidgets-3.1.0/include/wx/msw/font.h:
 
-C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
 
-C:/wxWidgets-3.1.0/include/wx/dynarray.h:
+C:/wxWidgets-3.1.0/include/wx/filesys.h:
 
-C:/wxWidgets-3.1.0/include/wx/thread.h:
+C:/wxWidgets-3.1.0/include/wx/stream.h:
 
-C:/wxWidgets-3.1.0/include/wx/tracker.h:
+C:/wxWidgets-3.1.0/include/wx/filefn.h:
 
-C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
+C:/wxWidgets-3.1.0/include/wx/filename.h:
 
-C:/wxWidgets-3.1.0/include/wx/any.h:
+C:/wxWidgets-3.1.0/include/wx/intl.h:
 
-C:/wxWidgets-3.1.0/include/wx/datetime.h:
+C:/wxWidgets-3.1.0/include/wx/translation.h:
 
-C:/wxWidgets-3.1.0/include/wx/anystr.h:
+C:/wxWidgets-3.1.0/include/wx/language.h:
 
-C:/wxWidgets-3.1.0/include/wx/variant.h:
+C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+C:/wxWidgets-3.1.0/include/wx/file.h:
 
-C:/wxWidgets-3.1.0/include/wx/font.h:
+C:/wxWidgets-3.1.0/include/wx/convauto.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/font.h:
+C:/wxWidgets-3.1.0/include/wx/bitmap.h:
 
-C:/wxWidgets-3.1.0/include/wx/colour.h:
+C:/wxWidgets-3.1.0/include/wx/image.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
+C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
 
-C:/wxWidgets-3.1.0/include/wx/region.h:
+C:/wxWidgets-3.1.0/include/wx/imagpng.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
 
-C:/wxWidgets-3.1.0/include/wx/intl.h:
+C:/wxWidgets-3.1.0/include/wx/imaggif.h:
 
-C:/wxWidgets-3.1.0/include/wx/translation.h:
+C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
 
-C:/wxWidgets-3.1.0/include/wx/language.h:
+C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
 
-C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
+C:/wxWidgets-3.1.0/include/wx/imagtga.h:
 
-C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
+C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
 
-C:/wxWidgets-3.1.0/include/wx/validate.h:
+C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
 
 C:/wxWidgets-3.1.0/include/wx/palette.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/palette.h:
 
+C:/wxWidgets-3.1.0/include/wx/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/artprov.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/event.h:
+
+C:/wxWidgets-3.1.0/include/wx/clntdata.h:
+
+C:/wxWidgets-3.1.0/include/wx/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/utils.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+
+C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+
+C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/thread.h:
+
+C:/wxWidgets-3.1.0/include/wx/tracker.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+
+C:/wxWidgets-3.1.0/include/wx/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/validate.h:
+
 C:/wxWidgets-3.1.0/include/wx/accel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/window.h:
 
-C:/wxWidgets-3.1.0/include/wx/settings.h:
-
-C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
 
-C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+C:/wxWidgets-3.1.0/include/wx/dialog.h:
 
-C:/wxWidgets-3.1.0/include/wx/icon.h:
+C:/wxWidgets-3.1.0/include/wx/toplevel.h:
 
-C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
 
 C:/wxWidgets-3.1.0/include/wx/weakref.h:
 
@@ -356,50 +495,202 @@ C:/wxWidgets-3.1.0/include/wx/panel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
 
-C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+C:/wxWidgets-3.1.0/include/wx/sizer.h:
 
-C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+C:/wxWidgets-3.1.0/include/wx/notebook.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/withimages.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
 
 C:/wxWidgets-3.1.0/include/wx/geometry.h:
 
-C:/wxWidgets-3.1.0/include/wx/menu.h:
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
 
-C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
 
-C:/wxWidgets-3.1.0/include/wx/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
 
-C:/wxWidgets-3.1.0/include/wx/image.h:
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
 
-C:/wxWidgets-3.1.0/include/wx/stream.h:
+C:/wxWidgets-3.1.0/include/wx/time.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpng.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
 
-C:/wxWidgets-3.1.0/include/wx/imaggif.h:
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagtga.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist.h:
+
+C:/wxWidgets-3.1.0/include/wx/confbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/base64.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/display.h:
+
+C:/wxWidgets-3.1.0/include/wx/vidmode.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebase.h:
+
+C:/wxWidgets-3.1.0/include/wx/itemid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
+
+IndMotor.h:
+
+Machines.h:
+
+Element.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
 
 C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/IndMotorForm.cpp.o b/Project/Release/IndMotorForm.cpp.o
new file mode 100644
index 0000000..4e427d4
--- /dev/null
+++ b/Project/Release/IndMotorForm.cpp.o
diff --git a/Project/Release/IndMotorForm.cpp.o.d b/Project/Release/IndMotorForm.cpp.o.d
new file mode 100644
index 0000000..29c5593
--- /dev/null
+++ b/Project/Release/IndMotorForm.cpp.o.d
@@ -0,0 +1,696 @@
+Release/IndMotorForm.cpp.o: IndMotorForm.cpp IndMotorForm.h ElementForm.h \
+ C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/defs.h \
+ C:/wxWidgets-3.1.0/include/wx/platform.h \
+ C:/wxWidgets-3.1.0/include/wx/compiler.h \
+ C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/libraries.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h \
+ C:/wxWidgets-3.1.0/include/wx/chkconf.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h \
+ C:/wxWidgets-3.1.0/include/wx/version.h \
+ C:/wxWidgets-3.1.0/include/wx/cpp.h \
+ C:/wxWidgets-3.1.0/include/wx/dlimpexp.h \
+ C:/wxWidgets-3.1.0/include/wx/debug.h \
+ C:/wxWidgets-3.1.0/include/wx/chartype.h \
+ C:/wxWidgets-3.1.0/include/wx/windowid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \
+ C:/wxWidgets-3.1.0/include/wx/features.h \
+ C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
+ C:/wxWidgets-3.1.0/include/wx/object.h \
+ C:/wxWidgets-3.1.0/include/wx/memory.h \
+ C:/wxWidgets-3.1.0/include/wx/string.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h \
+ C:/wxWidgets-3.1.0/include/wx/strvararg.h \
+ C:/wxWidgets-3.1.0/include/wx/strconv.h \
+ C:/wxWidgets-3.1.0/include/wx/buffer.h \
+ C:/wxWidgets-3.1.0/include/wx/fontenc.h \
+ C:/wxWidgets-3.1.0/include/wx/unichar.h \
+ C:/wxWidgets-3.1.0/include/wx/stringimpl.h \
+ C:/wxWidgets-3.1.0/include/wx/beforestd.h \
+ C:/wxWidgets-3.1.0/include/wx/afterstd.h \
+ C:/wxWidgets-3.1.0/include/wx/stringops.h \
+ C:/wxWidgets-3.1.0/include/wx/iosfwrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msgout.h \
+ C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \
+ C:/wxWidgets-3.1.0/include/wx/flags.h \
+ C:/wxWidgets-3.1.0/include/wx/xti2.h \
+ C:/wxWidgets-3.1.0/include/wx/variant.h \
+ C:/wxWidgets-3.1.0/include/wx/arrstr.h \
+ C:/wxWidgets-3.1.0/include/wx/list.h \
+ C:/wxWidgets-3.1.0/include/wx/vector.h \
+ C:/wxWidgets-3.1.0/include/wx/scopeguard.h \
+ C:/wxWidgets-3.1.0/include/wx/except.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/movable.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/pod.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/if.h \
+ C:/wxWidgets-3.1.0/include/wx/longlong.h \
+ C:/wxWidgets-3.1.0/include/wx/datetime.h \
+ C:/wxWidgets-3.1.0/include/wx/anystr.h \
+ C:/wxWidgets-3.1.0/include/wx/dynarray.h \
+ C:/wxWidgets-3.1.0/include/wx/any.h \
+ C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/font.h \
+ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/hashmap.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
+ C:/wxWidgets-3.1.0/include/wx/math.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/font.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/filesys.h \
+ C:/wxWidgets-3.1.0/include/wx/stream.h \
+ C:/wxWidgets-3.1.0/include/wx/filefn.h \
+ C:/wxWidgets-3.1.0/include/wx/filename.h \
+ C:/wxWidgets-3.1.0/include/wx/intl.h \
+ C:/wxWidgets-3.1.0/include/wx/translation.h \
+ C:/wxWidgets-3.1.0/include/wx/language.h \
+ C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
+ C:/wxWidgets-3.1.0/include/wx/file.h \
+ C:/wxWidgets-3.1.0/include/wx/convauto.h \
+ C:/wxWidgets-3.1.0/include/wx/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/image.h \
+ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpng.h \
+ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
+ C:/wxWidgets-3.1.0/include/wx/imaggif.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
+ C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtga.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagiff.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \
+ C:/wxWidgets-3.1.0/include/wx/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/iconloc.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/artprov.h \
+ C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
+ C:/wxWidgets-3.1.0/include/wx/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/window.h \
+ C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/clntdata.h \
+ C:/wxWidgets-3.1.0/include/wx/cursor.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \
+ C:/wxWidgets-3.1.0/include/wx/utils.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \
+ C:/wxWidgets-3.1.0/include/wx/mousestate.h \
+ C:/wxWidgets-3.1.0/include/wx/kbdstate.h \
+ C:/wxWidgets-3.1.0/include/wx/platinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/thread.h \
+ C:/wxWidgets-3.1.0/include/wx/tracker.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \
+ C:/wxWidgets-3.1.0/include/wx/region.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/region.h \
+ C:/wxWidgets-3.1.0/include/wx/validate.h \
+ C:/wxWidgets-3.1.0/include/wx/accel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/accel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/window.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
+ C:/wxWidgets-3.1.0/include/wx/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \
+ C:/wxWidgets-3.1.0/include/wx/weakref.h \
+ C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/containr.h \
+ C:/wxWidgets-3.1.0/include/wx/sharedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/atomic.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/sizer.h \
+ C:/wxWidgets-3.1.0/include/wx/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/control.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/control.h \
+ C:/wxWidgets-3.1.0/include/wx/withimages.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist.h \
+ C:/wxWidgets-3.1.0/include/wx/confbase.h \
+ C:/wxWidgets-3.1.0/include/wx/base64.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/window.h \
+ C:/wxWidgets-3.1.0/include/wx/display.h \
+ C:/wxWidgets-3.1.0/include/wx/vidmode.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/treebase.h \
+ C:/wxWidgets-3.1.0/include/wx/itemid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h IndMotor.h Machines.h \
+ Element.h C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/stockitem.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/menuitem.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
+ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
+
+IndMotorForm.h:
+
+ElementForm.h:
+
+C:/wxWidgets-3.1.0/include/wx/settings.h:
+
+C:/wxWidgets-3.1.0/include/wx/colour.h:
+
+C:/wxWidgets-3.1.0/include/wx/defs.h:
+
+C:/wxWidgets-3.1.0/include/wx/platform.h:
+
+C:/wxWidgets-3.1.0/include/wx/compiler.h:
+
+C:/wxWidgets-3.1.0/lib/gcc_dll/mswu/wx/setup.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/libraries.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gccpriv.h:
+
+C:/wxWidgets-3.1.0/include/wx/chkconf.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/chkconf.h:
+
+C:/wxWidgets-3.1.0/include/wx/version.h:
+
+C:/wxWidgets-3.1.0/include/wx/cpp.h:
+
+C:/wxWidgets-3.1.0/include/wx/dlimpexp.h:
+
+C:/wxWidgets-3.1.0/include/wx/debug.h:
+
+C:/wxWidgets-3.1.0/include/wx/chartype.h:
+
+C:/wxWidgets-3.1.0/include/wx/windowid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/winundef.h:
+
+C:/wxWidgets-3.1.0/include/wx/features.h:
+
+C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/object.h:
+
+C:/wxWidgets-3.1.0/include/wx/memory.h:
+
+C:/wxWidgets-3.1.0/include/wx/string.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrtbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/strvararg.h:
+
+C:/wxWidgets-3.1.0/include/wx/strconv.h:
+
+C:/wxWidgets-3.1.0/include/wx/buffer.h:
+
+C:/wxWidgets-3.1.0/include/wx/fontenc.h:
+
+C:/wxWidgets-3.1.0/include/wx/unichar.h:
+
+C:/wxWidgets-3.1.0/include/wx/stringimpl.h:
+
+C:/wxWidgets-3.1.0/include/wx/beforestd.h:
+
+C:/wxWidgets-3.1.0/include/wx/afterstd.h:
+
+C:/wxWidgets-3.1.0/include/wx/stringops.h:
+
+C:/wxWidgets-3.1.0/include/wx/iosfwrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgout.h:
+
+C:/wxWidgets-3.1.0/include/wx/xti.h:
+
+C:/wxWidgets-3.1.0/include/wx/rtti.h:
+
+C:/wxWidgets-3.1.0/include/wx/flags.h:
+
+C:/wxWidgets-3.1.0/include/wx/xti2.h:
+
+C:/wxWidgets-3.1.0/include/wx/variant.h:
+
+C:/wxWidgets-3.1.0/include/wx/arrstr.h:
+
+C:/wxWidgets-3.1.0/include/wx/list.h:
+
+C:/wxWidgets-3.1.0/include/wx/vector.h:
+
+C:/wxWidgets-3.1.0/include/wx/scopeguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/except.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/movable.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/pod.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/if.h:
+
+C:/wxWidgets-3.1.0/include/wx/longlong.h:
+
+C:/wxWidgets-3.1.0/include/wx/datetime.h:
+
+C:/wxWidgets-3.1.0/include/wx/anystr.h:
+
+C:/wxWidgets-3.1.0/include/wx/dynarray.h:
+
+C:/wxWidgets-3.1.0/include/wx/any.h:
+
+C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
+
+C:/wxWidgets-3.1.0/include/wx/font.h:
+
+C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
+
+C:/wxWidgets-3.1.0/include/wx/math.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/font.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
+
+C:/wxWidgets-3.1.0/include/wx/filesys.h:
+
+C:/wxWidgets-3.1.0/include/wx/stream.h:
+
+C:/wxWidgets-3.1.0/include/wx/filefn.h:
+
+C:/wxWidgets-3.1.0/include/wx/filename.h:
+
+C:/wxWidgets-3.1.0/include/wx/intl.h:
+
+C:/wxWidgets-3.1.0/include/wx/translation.h:
+
+C:/wxWidgets-3.1.0/include/wx/language.h:
+
+C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
+
+C:/wxWidgets-3.1.0/include/wx/file.h:
+
+C:/wxWidgets-3.1.0/include/wx/convauto.h:
+
+C:/wxWidgets-3.1.0/include/wx/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/image.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpng.h:
+
+C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaggif.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagtga.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
+
+C:/wxWidgets-3.1.0/include/wx/palette.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/palette.h:
+
+C:/wxWidgets-3.1.0/include/wx/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/artprov.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/event.h:
+
+C:/wxWidgets-3.1.0/include/wx/clntdata.h:
+
+C:/wxWidgets-3.1.0/include/wx/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/utils.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+
+C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+
+C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/thread.h:
+
+C:/wxWidgets-3.1.0/include/wx/tracker.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+
+C:/wxWidgets-3.1.0/include/wx/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/validate.h:
+
+C:/wxWidgets-3.1.0/include/wx/accel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/dialog.h:
+
+C:/wxWidgets-3.1.0/include/wx/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
+
+C:/wxWidgets-3.1.0/include/wx/weakref.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/int2type.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/containr.h:
+
+C:/wxWidgets-3.1.0/include/wx/sharedptr.h:
+
+C:/wxWidgets-3.1.0/include/wx/atomic.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/wrapwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/dialog.h:
+
+C:/wxWidgets-3.1.0/include/wx/panel.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
+
+C:/wxWidgets-3.1.0/include/wx/sizer.h:
+
+C:/wxWidgets-3.1.0/include/wx/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/withimages.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist.h:
+
+C:/wxWidgets-3.1.0/include/wx/confbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/base64.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/display.h:
+
+C:/wxWidgets-3.1.0/include/wx/vidmode.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebase.h:
+
+C:/wxWidgets-3.1.0/include/wx/itemid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
+
+IndMotor.h:
+
+Machines.h:
+
+Element.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/Line.cpp.o.d b/Project/Release/Line.cpp.o.d
index a121b34..12d45f6 100644
--- a/Project/Release/Line.cpp.o.d
+++ b/Project/Release/Line.cpp.o.d
@@ -223,7 +223,9 @@ Release/Line.cpp.o: Line.cpp Line.h LineForm.h ElementForm.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h Bus.h BusForm.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h Bus.h BusForm.h
 
 Line.h:
 
@@ -689,6 +691,10 @@ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
 
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
+
 Bus.h:
 
 BusForm.h:
diff --git a/Project/Release/Machines.cpp.o.d b/Project/Release/Machines.cpp.o.d
index 9764871..c65c002 100644
--- a/Project/Release/Machines.cpp.o.d
+++ b/Project/Release/Machines.cpp.o.d
@@ -130,7 +130,9 @@ Release/Machines.cpp.o: Machines.cpp Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
 Machines.h:
 
@@ -401,3 +403,7 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/MainFrame.cpp.o b/Project/Release/MainFrame.cpp.o
index 5ba00b0..963d460 100644
--- a/Project/Release/MainFrame.cpp.o
+++ b/Project/Release/MainFrame.cpp.o
diff --git a/Project/Release/MainFrame.cpp.o.d b/Project/Release/MainFrame.cpp.o.d
index 693b3c2..1313645 100644
--- a/Project/Release/MainFrame.cpp.o.d
+++ b/Project/Release/MainFrame.cpp.o.d
@@ -252,8 +252,8 @@ Release/MainFrame.cpp.o: MainFrame.cpp MainFrame.h \
  C:/wxWidgets-3.1.0/include/wx/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/listbase.h \
  C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h Element.h Line.h LineForm.h \
- Branch.h Transformer.h SyncGenerator.h GeneratorForm.h Machines.h \
- IndMotor.h SyncMotor.h Load.h LoadForm.h Shunt.h Inductor.h Capacitor.h
+ Branch.h Transformer.h SyncGenerator.h Machines.h IndMotor.h SyncMotor.h \
+ Load.h LoadForm.h Shunt.h Inductor.h Capacitor.h
 
 MainFrame.h:
 
@@ -791,8 +791,6 @@ Transformer.h:
 
 SyncGenerator.h:
 
-GeneratorForm.h:
-
 Machines.h:
 
 IndMotor.h:
diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe
index dcc39f4..ebc1db3 100644
--- a/Project/Release/PSP-UFU.exe
+++ b/Project/Release/PSP-UFU.exe
diff --git a/Project/Release/Shunt.cpp.o.d b/Project/Release/Shunt.cpp.o.d
index 4c3a1d1..688707b 100644
--- a/Project/Release/Shunt.cpp.o.d
+++ b/Project/Release/Shunt.cpp.o.d
@@ -130,7 +130,9 @@ Release/Shunt.cpp.o: Shunt.cpp Shunt.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
 Shunt.h:
 
@@ -401,3 +403,7 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/SyncGenerator.cpp.o b/Project/Release/SyncGenerator.cpp.o
index 42a3f12..8b9d321 100644
--- a/Project/Release/SyncGenerator.cpp.o
+++ b/Project/Release/SyncGenerator.cpp.o
diff --git a/Project/Release/SyncGenerator.cpp.o.d b/Project/Release/SyncGenerator.cpp.o.d
index cd865c0..c5fdd2d 100644
--- a/Project/Release/SyncGenerator.cpp.o.d
+++ b/Project/Release/SyncGenerator.cpp.o.d
@@ -1,5 +1,5 @@
-Release/SyncGenerator.cpp.o: SyncGenerator.cpp SyncGenerator.h \
- GeneratorForm.h ElementForm.h C:/wxWidgets-3.1.0/include/wx/settings.h \
+Release/SyncGenerator.cpp.o: SyncGenerator.cpp SyncMachineForm.h \
+ ElementForm.h C:/wxWidgets-3.1.0/include/wx/settings.h \
  C:/wxWidgets-3.1.0/include/wx/colour.h \
  C:/wxWidgets-3.1.0/include/wx/defs.h \
  C:/wxWidgets-3.1.0/include/wx/platform.h \
@@ -159,6 +159,47 @@ Release/SyncGenerator.cpp.o: SyncGenerator.cpp SyncGenerator.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
  C:/wxWidgets-3.1.0/include/wx/statline.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/persist.h \
  C:/wxWidgets-3.1.0/include/wx/confbase.h \
  C:/wxWidgets-3.1.0/include/wx/base64.h \
@@ -172,23 +213,21 @@ Release/SyncGenerator.cpp.o: SyncGenerator.cpp SyncGenerator.h \
  C:/wxWidgets-3.1.0/include/wx/treectrl.h \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
- C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Machines.h Element.h \
- C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h SyncGenerator.h Machines.h \
+ Element.h C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
-SyncGenerator.h:
-
-GeneratorForm.h:
+SyncMachineForm.h:
 
 ElementForm.h:
 
@@ -514,6 +553,90 @@ C:/wxWidgets-3.1.0/include/wx/statline.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
 
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 C:/wxWidgets-3.1.0/include/wx/persist.h:
 
 C:/wxWidgets-3.1.0/include/wx/confbase.h:
@@ -540,10 +663,10 @@ C:/wxWidgets-3.1.0/include/wx/treebase.h:
 
 C:/wxWidgets-3.1.0/include/wx/itemid.h:
 
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
 
+SyncGenerator.h:
+
 Machines.h:
 
 Element.h:
@@ -556,8 +679,6 @@ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
 
-C:/wxWidgets-3.1.0/include/wx/geometry.h:
-
 C:/wxWidgets-3.1.0/include/wx/menu.h:
 
 C:/wxWidgets-3.1.0/include/wx/menuitem.h:
@@ -569,3 +690,7 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/SyncMachineForm.cpp.o b/Project/Release/SyncMachineForm.cpp.o
new file mode 100644
index 0000000..b90dfda
--- /dev/null
+++ b/Project/Release/SyncMachineForm.cpp.o
diff --git a/Project/Release/GeneratorForm.cpp.o.d b/Project/Release/SyncMachineForm.cpp.o.d
index c13d9d6..bbbebae 100644
--- a/Project/Release/GeneratorForm.cpp.o.d
+++ b/Project/Release/SyncMachineForm.cpp.o.d
@@ -1,4 +1,4 @@
-Release/GeneratorForm.cpp.o: GeneratorForm.cpp GeneratorForm.h \
+Release/SyncMachineForm.cpp.o: SyncMachineForm.cpp GeneratorStabForm.h \
  ElementForm.h C:/wxWidgets-3.1.0/include/wx/settings.h \
  C:/wxWidgets-3.1.0/include/wx/colour.h \
  C:/wxWidgets-3.1.0/include/wx/defs.h \
@@ -159,6 +159,47 @@ Release/GeneratorForm.cpp.o: GeneratorForm.cpp GeneratorForm.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
  C:/wxWidgets-3.1.0/include/wx/statline.h \
  C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
  C:/wxWidgets-3.1.0/include/wx/persist.h \
  C:/wxWidgets-3.1.0/include/wx/confbase.h \
  C:/wxWidgets-3.1.0/include/wx/base64.h \
@@ -172,22 +213,22 @@ Release/GeneratorForm.cpp.o: GeneratorForm.cpp GeneratorForm.h \
  C:/wxWidgets-3.1.0/include/wx/treectrl.h \
  C:/wxWidgets-3.1.0/include/wx/treebase.h \
  C:/wxWidgets-3.1.0/include/wx/itemid.h \
- C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
- C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h GeneratorStabForm.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h SyncMachineForm.h \
  SyncGenerator.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h SyncMotor.h
 
-GeneratorForm.h:
+GeneratorStabForm.h:
 
 ElementForm.h:
 
@@ -513,6 +554,90 @@ C:/wxWidgets-3.1.0/include/wx/statline.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
 
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/geometry.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 C:/wxWidgets-3.1.0/include/wx/persist.h:
 
 C:/wxWidgets-3.1.0/include/wx/confbase.h:
@@ -539,11 +664,9 @@ C:/wxWidgets-3.1.0/include/wx/treebase.h:
 
 C:/wxWidgets-3.1.0/include/wx/itemid.h:
 
-C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
-
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
 
-GeneratorStabForm.h:
+SyncMachineForm.h:
 
 SyncGenerator.h:
 
@@ -559,8 +682,6 @@ C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
 
-C:/wxWidgets-3.1.0/include/wx/geometry.h:
-
 C:/wxWidgets-3.1.0/include/wx/menu.h:
 
 C:/wxWidgets-3.1.0/include/wx/menuitem.h:
@@ -572,3 +693,9 @@ C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
+
+SyncMotor.h:
diff --git a/Project/Release/SyncMotor.cpp.o b/Project/Release/SyncMotor.cpp.o
index 5dfbe05..878ebbe 100644
--- a/Project/Release/SyncMotor.cpp.o
+++ b/Project/Release/SyncMotor.cpp.o
diff --git a/Project/Release/SyncMotor.cpp.o.d b/Project/Release/SyncMotor.cpp.o.d
index 99ad551..2dedaa5 100644
--- a/Project/Release/SyncMotor.cpp.o.d
+++ b/Project/Release/SyncMotor.cpp.o.d
@@ -1,5 +1,6 @@
-Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMotor.h Machines.h Element.h \
- C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
+Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMachineForm.h ElementForm.h \
+ C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/colour.h \
  C:/wxWidgets-3.1.0/include/wx/defs.h \
  C:/wxWidgets-3.1.0/include/wx/platform.h \
  C:/wxWidgets-3.1.0/include/wx/compiler.h \
@@ -16,11 +17,7 @@ Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/windowid.h \
  C:/wxWidgets-3.1.0/include/wx/msw/winundef.h \
  C:/wxWidgets-3.1.0/include/wx/features.h \
- C:/wxWidgets-3.1.0/include/wx/dialog.h \
- C:/wxWidgets-3.1.0/include/wx/toplevel.h \
- C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/window.h \
- C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
  C:/wxWidgets-3.1.0/include/wx/object.h \
  C:/wxWidgets-3.1.0/include/wx/memory.h \
  C:/wxWidgets-3.1.0/include/wx/string.h \
@@ -39,10 +36,8 @@ Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/xti.h C:/wxWidgets-3.1.0/include/wx/rtti.h \
  C:/wxWidgets-3.1.0/include/wx/flags.h \
  C:/wxWidgets-3.1.0/include/wx/xti2.h \
- C:/wxWidgets-3.1.0/include/wx/clntdata.h \
- C:/wxWidgets-3.1.0/include/wx/hashmap.h \
- C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
- C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/variant.h \
+ C:/wxWidgets-3.1.0/include/wx/arrstr.h \
  C:/wxWidgets-3.1.0/include/wx/list.h \
  C:/wxWidgets-3.1.0/include/wx/vector.h \
  C:/wxWidgets-3.1.0/include/wx/scopeguard.h \
@@ -50,53 +45,81 @@ Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/meta/movable.h \
  C:/wxWidgets-3.1.0/include/wx/meta/pod.h \
  C:/wxWidgets-3.1.0/include/wx/meta/if.h \
+ C:/wxWidgets-3.1.0/include/wx/longlong.h \
+ C:/wxWidgets-3.1.0/include/wx/datetime.h \
+ C:/wxWidgets-3.1.0/include/wx/anystr.h \
+ C:/wxWidgets-3.1.0/include/wx/dynarray.h \
+ C:/wxWidgets-3.1.0/include/wx/any.h \
+ C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
+ C:/wxWidgets-3.1.0/include/wx/font.h \
+ C:/wxWidgets-3.1.0/include/wx/gdicmn.h \
+ C:/wxWidgets-3.1.0/include/wx/hashmap.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrt.h \
  C:/wxWidgets-3.1.0/include/wx/math.h \
- C:/wxWidgets-3.1.0/include/wx/cursor.h \
- C:/wxWidgets-3.1.0/include/wx/gdiobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/font.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h \
+ C:/wxWidgets-3.1.0/include/wx/filesys.h \
+ C:/wxWidgets-3.1.0/include/wx/stream.h \
+ C:/wxWidgets-3.1.0/include/wx/filefn.h \
+ C:/wxWidgets-3.1.0/include/wx/filename.h \
+ C:/wxWidgets-3.1.0/include/wx/intl.h \
+ C:/wxWidgets-3.1.0/include/wx/translation.h \
+ C:/wxWidgets-3.1.0/include/wx/language.h \
+ C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
+ C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
+ C:/wxWidgets-3.1.0/include/wx/file.h \
+ C:/wxWidgets-3.1.0/include/wx/convauto.h \
+ C:/wxWidgets-3.1.0/include/wx/bitmap.h \
+ C:/wxWidgets-3.1.0/include/wx/image.h \
+ C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpng.h \
+ C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
+ C:/wxWidgets-3.1.0/include/wx/imaggif.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
+ C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtga.h \
+ C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
+ C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
+ C:/wxWidgets-3.1.0/include/wx/imagiff.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h \
+ C:/wxWidgets-3.1.0/include/wx/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
+ C:/wxWidgets-3.1.0/include/wx/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/iconloc.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
+ C:/wxWidgets-3.1.0/include/wx/artprov.h \
+ C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h \
+ C:/wxWidgets-3.1.0/include/wx/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h \
+ C:/wxWidgets-3.1.0/include/wx/window.h \
+ C:/wxWidgets-3.1.0/include/wx/event.h \
+ C:/wxWidgets-3.1.0/include/wx/clntdata.h \
+ C:/wxWidgets-3.1.0/include/wx/cursor.h \
  C:/wxWidgets-3.1.0/include/wx/msw/cursor.h \
  C:/wxWidgets-3.1.0/include/wx/utils.h \
- C:/wxWidgets-3.1.0/include/wx/filefn.h \
- C:/wxWidgets-3.1.0/include/wx/arrstr.h \
- C:/wxWidgets-3.1.0/include/wx/versioninfo.h \
  C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h \
  C:/wxWidgets-3.1.0/include/wx/mousestate.h \
  C:/wxWidgets-3.1.0/include/wx/kbdstate.h \
- C:/wxWidgets-3.1.0/include/wx/longlong.h \
  C:/wxWidgets-3.1.0/include/wx/platinfo.h \
- C:/wxWidgets-3.1.0/include/wx/dynarray.h \
  C:/wxWidgets-3.1.0/include/wx/thread.h \
  C:/wxWidgets-3.1.0/include/wx/tracker.h \
- C:/wxWidgets-3.1.0/include/wx/typeinfo.h \
- C:/wxWidgets-3.1.0/include/wx/any.h \
- C:/wxWidgets-3.1.0/include/wx/datetime.h \
- C:/wxWidgets-3.1.0/include/wx/anystr.h \
- C:/wxWidgets-3.1.0/include/wx/variant.h \
  C:/wxWidgets-3.1.0/include/wx/meta/convertible.h \
  C:/wxWidgets-3.1.0/include/wx/meta/removeref.h \
- C:/wxWidgets-3.1.0/include/wx/font.h \
- C:/wxWidgets-3.1.0/include/wx/msw/font.h \
- C:/wxWidgets-3.1.0/include/wx/colour.h \
- C:/wxWidgets-3.1.0/include/wx/msw/colour.h \
  C:/wxWidgets-3.1.0/include/wx/region.h \
  C:/wxWidgets-3.1.0/include/wx/msw/region.h \
- C:/wxWidgets-3.1.0/include/wx/intl.h \
- C:/wxWidgets-3.1.0/include/wx/translation.h \
- C:/wxWidgets-3.1.0/include/wx/language.h \
- C:/wxWidgets-3.1.0/include/wx/scopedptr.h \
- C:/wxWidgets-3.1.0/include/wx/checkeddelete.h \
  C:/wxWidgets-3.1.0/include/wx/validate.h \
- C:/wxWidgets-3.1.0/include/wx/palette.h \
- C:/wxWidgets-3.1.0/include/wx/msw/palette.h \
  C:/wxWidgets-3.1.0/include/wx/accel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/accel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/window.h \
- C:/wxWidgets-3.1.0/include/wx/settings.h \
+ C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h \
+ C:/wxWidgets-3.1.0/include/wx/dialog.h \
+ C:/wxWidgets-3.1.0/include/wx/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h \
  C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h \
- C:/wxWidgets-3.1.0/include/wx/iconbndl.h \
- C:/wxWidgets-3.1.0/include/wx/icon.h \
- C:/wxWidgets-3.1.0/include/wx/iconloc.h \
- C:/wxWidgets-3.1.0/include/wx/msw/icon.h \
  C:/wxWidgets-3.1.0/include/wx/weakref.h \
  C:/wxWidgets-3.1.0/include/wx/meta/int2type.h \
  C:/wxWidgets-3.1.0/include/wx/msw/toplevel.h \
@@ -107,38 +130,110 @@ Release/SyncMotor.cpp.o: SyncMotor.cpp SyncMotor.h Machines.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/msw/dialog.h \
  C:/wxWidgets-3.1.0/include/wx/panel.h \
  C:/wxWidgets-3.1.0/include/wx/msw/panel.h \
+ C:/wxWidgets-3.1.0/include/wx/sizer.h \
+ C:/wxWidgets-3.1.0/include/wx/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/control.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/control.h \
+ C:/wxWidgets-3.1.0/include/wx/withimages.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/notebook.h \
+ C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textentry.h \
+ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/dcclient.h \
+ C:/wxWidgets-3.1.0/include/wx/dc.h C:/wxWidgets-3.1.0/include/wx/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/brush.h \
+ C:/wxWidgets-3.1.0/include/wx/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/pen.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h \
+ C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h \
+ C:/wxWidgets-3.1.0/include/wx/geometry.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist.h \
+ C:/wxWidgets-3.1.0/include/wx/confbase.h \
+ C:/wxWidgets-3.1.0/include/wx/base64.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/window.h \
+ C:/wxWidgets-3.1.0/include/wx/display.h \
+ C:/wxWidgets-3.1.0/include/wx/vidmode.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/persist/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treebook.h \
+ C:/wxWidgets-3.1.0/include/wx/treectrl.h \
+ C:/wxWidgets-3.1.0/include/wx/treebase.h \
+ C:/wxWidgets-3.1.0/include/wx/itemid.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h SyncMotor.h Machines.h \
+ Element.h C:/wxWidgets-3.1.0/include/wx/msgdlg.h \
  C:/wxWidgets-3.1.0/include/wx/stockitem.h \
  C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h \
  C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h \
- C:/wxWidgets-3.1.0/include/wx/geometry.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
- C:/wxWidgets-3.1.0/include/wx/bitmap.h \
- C:/wxWidgets-3.1.0/include/wx/image.h \
- C:/wxWidgets-3.1.0/include/wx/stream.h \
- C:/wxWidgets-3.1.0/include/wx/imagbmp.h \
- C:/wxWidgets-3.1.0/include/wx/imagpng.h \
- C:/wxWidgets-3.1.0/include/wx/imaggif.h \
- C:/wxWidgets-3.1.0/include/wx/imagpcx.h \
- C:/wxWidgets-3.1.0/include/wx/imagjpeg.h \
- C:/wxWidgets-3.1.0/include/wx/imagtga.h \
- C:/wxWidgets-3.1.0/include/wx/imagtiff.h \
- C:/wxWidgets-3.1.0/include/wx/imagpnm.h \
- C:/wxWidgets-3.1.0/include/wx/imagxpm.h \
- C:/wxWidgets-3.1.0/include/wx/imagiff.h \
- C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h \
+ C:/wxWidgets-3.1.0/include/wx/log.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/logg.h
 
-SyncMotor.h:
+SyncMachineForm.h:
 
-Machines.h:
+ElementForm.h:
 
-Element.h:
+C:/wxWidgets-3.1.0/include/wx/settings.h:
 
-C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/colour.h:
 
 C:/wxWidgets-3.1.0/include/wx/defs.h:
 
@@ -172,15 +267,7 @@ C:/wxWidgets-3.1.0/include/wx/msw/winundef.h:
 
 C:/wxWidgets-3.1.0/include/wx/features.h:
 
-C:/wxWidgets-3.1.0/include/wx/dialog.h:
-
-C:/wxWidgets-3.1.0/include/wx/toplevel.h:
-
-C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
-
-C:/wxWidgets-3.1.0/include/wx/window.h:
-
-C:/wxWidgets-3.1.0/include/wx/event.h:
+C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
 
 C:/wxWidgets-3.1.0/include/wx/object.h:
 
@@ -220,13 +307,9 @@ C:/wxWidgets-3.1.0/include/wx/flags.h:
 
 C:/wxWidgets-3.1.0/include/wx/xti2.h:
 
-C:/wxWidgets-3.1.0/include/wx/clntdata.h:
-
-C:/wxWidgets-3.1.0/include/wx/hashmap.h:
-
-C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
+C:/wxWidgets-3.1.0/include/wx/variant.h:
 
-C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
+C:/wxWidgets-3.1.0/include/wx/arrstr.h:
 
 C:/wxWidgets-3.1.0/include/wx/list.h:
 
@@ -242,99 +325,155 @@ C:/wxWidgets-3.1.0/include/wx/meta/pod.h:
 
 C:/wxWidgets-3.1.0/include/wx/meta/if.h:
 
-C:/wxWidgets-3.1.0/include/wx/math.h:
+C:/wxWidgets-3.1.0/include/wx/longlong.h:
 
-C:/wxWidgets-3.1.0/include/wx/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/datetime.h:
 
-C:/wxWidgets-3.1.0/include/wx/gdiobj.h:
+C:/wxWidgets-3.1.0/include/wx/anystr.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
+C:/wxWidgets-3.1.0/include/wx/dynarray.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+C:/wxWidgets-3.1.0/include/wx/any.h:
 
-C:/wxWidgets-3.1.0/include/wx/utils.h:
+C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
 
-C:/wxWidgets-3.1.0/include/wx/filefn.h:
+C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
 
-C:/wxWidgets-3.1.0/include/wx/arrstr.h:
+C:/wxWidgets-3.1.0/include/wx/font.h:
 
-C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
+C:/wxWidgets-3.1.0/include/wx/gdicmn.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+C:/wxWidgets-3.1.0/include/wx/hashmap.h:
 
-C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+C:/wxWidgets-3.1.0/include/wx/wxcrt.h:
 
-C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+C:/wxWidgets-3.1.0/include/wx/math.h:
 
-C:/wxWidgets-3.1.0/include/wx/longlong.h:
+C:/wxWidgets-3.1.0/include/wx/msw/font.h:
 
-C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlres.h:
 
-C:/wxWidgets-3.1.0/include/wx/dynarray.h:
+C:/wxWidgets-3.1.0/include/wx/filesys.h:
 
-C:/wxWidgets-3.1.0/include/wx/thread.h:
+C:/wxWidgets-3.1.0/include/wx/stream.h:
 
-C:/wxWidgets-3.1.0/include/wx/tracker.h:
+C:/wxWidgets-3.1.0/include/wx/filefn.h:
 
-C:/wxWidgets-3.1.0/include/wx/typeinfo.h:
+C:/wxWidgets-3.1.0/include/wx/filename.h:
 
-C:/wxWidgets-3.1.0/include/wx/any.h:
+C:/wxWidgets-3.1.0/include/wx/intl.h:
 
-C:/wxWidgets-3.1.0/include/wx/datetime.h:
+C:/wxWidgets-3.1.0/include/wx/translation.h:
 
-C:/wxWidgets-3.1.0/include/wx/anystr.h:
+C:/wxWidgets-3.1.0/include/wx/language.h:
 
-C:/wxWidgets-3.1.0/include/wx/variant.h:
+C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
 
-C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+C:/wxWidgets-3.1.0/include/wx/file.h:
 
-C:/wxWidgets-3.1.0/include/wx/font.h:
+C:/wxWidgets-3.1.0/include/wx/convauto.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/font.h:
+C:/wxWidgets-3.1.0/include/wx/bitmap.h:
 
-C:/wxWidgets-3.1.0/include/wx/colour.h:
+C:/wxWidgets-3.1.0/include/wx/image.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/colour.h:
+C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
 
-C:/wxWidgets-3.1.0/include/wx/region.h:
+C:/wxWidgets-3.1.0/include/wx/imagpng.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+C:/wxWidgets-3.1.0/include/wx/versioninfo.h:
 
-C:/wxWidgets-3.1.0/include/wx/intl.h:
+C:/wxWidgets-3.1.0/include/wx/imaggif.h:
 
-C:/wxWidgets-3.1.0/include/wx/translation.h:
+C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
 
-C:/wxWidgets-3.1.0/include/wx/language.h:
+C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
 
-C:/wxWidgets-3.1.0/include/wx/scopedptr.h:
+C:/wxWidgets-3.1.0/include/wx/imagtga.h:
 
-C:/wxWidgets-3.1.0/include/wx/checkeddelete.h:
+C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
 
-C:/wxWidgets-3.1.0/include/wx/validate.h:
+C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+
+C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gdiimage.h:
 
 C:/wxWidgets-3.1.0/include/wx/palette.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/palette.h:
 
+C:/wxWidgets-3.1.0/include/wx/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+
+C:/wxWidgets-3.1.0/include/wx/artprov.h:
+
+C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+
+C:/wxWidgets-3.1.0/include/wx/xrc/xmlreshandler.h:
+
+C:/wxWidgets-3.1.0/include/wx/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/imaglist.h:
+
+C:/wxWidgets-3.1.0/include/wx/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/event.h:
+
+C:/wxWidgets-3.1.0/include/wx/clntdata.h:
+
+C:/wxWidgets-3.1.0/include/wx/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/cursor.h:
+
+C:/wxWidgets-3.1.0/include/wx/utils.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/implicitconversion.h:
+
+C:/wxWidgets-3.1.0/include/wx/mousestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/kbdstate.h:
+
+C:/wxWidgets-3.1.0/include/wx/platinfo.h:
+
+C:/wxWidgets-3.1.0/include/wx/thread.h:
+
+C:/wxWidgets-3.1.0/include/wx/tracker.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/convertible.h:
+
+C:/wxWidgets-3.1.0/include/wx/meta/removeref.h:
+
+C:/wxWidgets-3.1.0/include/wx/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/region.h:
+
+C:/wxWidgets-3.1.0/include/wx/validate.h:
+
 C:/wxWidgets-3.1.0/include/wx/accel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/accel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/window.h:
 
-C:/wxWidgets-3.1.0/include/wx/settings.h:
-
-C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
+C:/wxWidgets-3.1.0/include/wx/xrc/xh_bmp.h:
 
-C:/wxWidgets-3.1.0/include/wx/iconbndl.h:
+C:/wxWidgets-3.1.0/include/wx/dialog.h:
 
-C:/wxWidgets-3.1.0/include/wx/icon.h:
+C:/wxWidgets-3.1.0/include/wx/toplevel.h:
 
-C:/wxWidgets-3.1.0/include/wx/iconloc.h:
+C:/wxWidgets-3.1.0/include/wx/nonownedwnd.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/icon.h:
+C:/wxWidgets-3.1.0/include/wx/msw/nonownedwnd.h:
 
 C:/wxWidgets-3.1.0/include/wx/weakref.h:
 
@@ -356,50 +495,202 @@ C:/wxWidgets-3.1.0/include/wx/panel.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/panel.h:
 
-C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+C:/wxWidgets-3.1.0/include/wx/sizer.h:
 
-C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+C:/wxWidgets-3.1.0/include/wx/notebook.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+C:/wxWidgets-3.1.0/include/wx/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/control.h:
+
+C:/wxWidgets-3.1.0/include/wx/withimages.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/notebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textentry.h:
+
+C:/wxWidgets-3.1.0/include/wx/ioswrap.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcclient.h:
+
+C:/wxWidgets-3.1.0/include/wx/dc.h:
+
+C:/wxWidgets-3.1.0/include/wx/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/brush.h:
+
+C:/wxWidgets-3.1.0/include/wx/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/pen.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2d.h:
+
+C:/wxWidgets-3.1.0/include/wx/affinematrix2dbase.h:
 
 C:/wxWidgets-3.1.0/include/wx/geometry.h:
 
-C:/wxWidgets-3.1.0/include/wx/menu.h:
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
 
-C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
 
-C:/wxWidgets-3.1.0/include/wx/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/tooltip.h:
 
-C:/wxWidgets-3.1.0/include/wx/image.h:
+C:/wxWidgets-3.1.0/include/wx/msw/tooltip.h:
 
-C:/wxWidgets-3.1.0/include/wx/stream.h:
+C:/wxWidgets-3.1.0/include/wx/time.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagbmp.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpng.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
 
-C:/wxWidgets-3.1.0/include/wx/imaggif.h:
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpcx.h:
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagjpeg.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagtga.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagtiff.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagpnm.h:
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagxpm.h:
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
 
-C:/wxWidgets-3.1.0/include/wx/imagiff.h:
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
 
-C:/wxWidgets-3.1.0/include/wx/msw/bitmap.h:
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist.h:
+
+C:/wxWidgets-3.1.0/include/wx/confbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/base64.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/toplevel.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/window.h:
+
+C:/wxWidgets-3.1.0/include/wx/display.h:
+
+C:/wxWidgets-3.1.0/include/wx/vidmode.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/bookctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/persist/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebook.h:
+
+C:/wxWidgets-3.1.0/include/wx/treectrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/treebase.h:
+
+C:/wxWidgets-3.1.0/include/wx/itemid.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
+
+SyncMotor.h:
+
+Machines.h:
+
+Element.h:
+
+C:/wxWidgets-3.1.0/include/wx/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/stockitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/msgdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/msgdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/menuitem.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h:
 
 C:/wxWidgets-3.1.0/include/wx/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
+
+C:/wxWidgets-3.1.0/include/wx/log.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/logg.h:
diff --git a/Project/Release/Workspace.cpp.o b/Project/Release/Workspace.cpp.o
index f7e0698..065631f 100644
--- a/Project/Release/Workspace.cpp.o
+++ b/Project/Release/Workspace.cpp.o
diff --git a/Project/Release/Workspace.cpp.o.d b/Project/Release/Workspace.cpp.o.d
index 522de7a..459ac12 100644
--- a/Project/Release/Workspace.cpp.o.d
+++ b/Project/Release/Workspace.cpp.o.d
@@ -238,8 +238,8 @@ Release/Workspace.cpp.o: Workspace.cpp Workspace.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menu.h Line.h LineForm.h Branch.h \
- Transformer.h SyncGenerator.h GeneratorForm.h Machines.h IndMotor.h \
- SyncMotor.h Load.h LoadForm.h Shunt.h Inductor.h Capacitor.h
+ Transformer.h SyncGenerator.h Machines.h IndMotor.h SyncMotor.h Load.h \
+ LoadForm.h Shunt.h Inductor.h Capacitor.h
 
 Workspace.h:
 
@@ -743,8 +743,6 @@ Transformer.h:
 
 SyncGenerator.h:
 
-GeneratorForm.h:
-
 Machines.h:
 
 IndMotor.h:
diff --git a/Project/SyncGenerator.cpp b/Project/SyncGenerator.cpp
index 7632b98..e30e918 100644
--- a/Project/SyncGenerator.cpp
+++ b/Project/SyncGenerator.cpp
@@ -1,3 +1,4 @@
+#include "SyncMachineForm.h"
 #include "SyncGenerator.h"
 
 SyncGenerator::SyncGenerator() : Machines()
@@ -45,7 +46,8 @@ bool SyncGenerator::GetContextMenu(wxMenu& menu)
 
 bool SyncGenerator::ShowForm(wxWindow* parent, Element* element)
 {
-	GeneratorForm* generatorForm = new GeneratorForm(parent, this);
+	SyncMachineForm* generatorForm = new SyncMachineForm(parent, this);
+    generatorForm->SetTitle(_("Generator"));
     if(generatorForm->ShowModal() == wxID_OK) {
 	    generatorForm->Destroy();
 	    return true;
diff --git a/Project/SyncGenerator.h b/Project/SyncGenerator.h
index 1ada9eb..cf1fda9 100644
--- a/Project/SyncGenerator.h
+++ b/Project/SyncGenerator.h
@@ -1,9 +1,10 @@
 #ifndef SYNCGENERATOR_H
 #define SYNCGENERATOR_H
 
-#include "GeneratorForm.h"
 #include "Machines.h"
 
+class SyncMachineForm;
+
 struct SyncGeneratorElectricalData
 {
     // General
diff --git a/Project/SyncMachineForm.cpp b/Project/SyncMachineForm.cpp
new file mode 100644
index 0000000..6ca490a
--- /dev/null
+++ b/Project/SyncMachineForm.cpp
@@ -0,0 +1,563 @@
+#include "GeneratorStabForm.h"
+#include "SyncMachineForm.h"
+#include "SyncGenerator.h"
+#include "SyncMotor.h"
+
+SyncMachineForm::SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator) : SyncMachineFormBase(parent)
+{
+    SetSize(GetBestSize());
+    ReplaceStaticTextLabelChar(m_staticTextPosResistance, L'\u2081');
+    ReplaceStaticTextLabelChar(m_staticTextPosReactance, L'\u2081');
+    ReplaceStaticTextLabelChar(m_staticTextNegResistance, L'\u2082');
+    ReplaceStaticTextLabelChar(m_staticTextNegReactance, L'\u2082');
+    ReplaceStaticTextLabelChar(m_staticTextZeroResistance, L'\u2080');
+    ReplaceStaticTextLabelChar(m_staticTextZeroReactance, L'\u2080');
+    Layout();
+    m_syncGenerator = syncGenerator;
+    m_parent = parent;
+
+    SyncGeneratorElectricalData data = syncGenerator->GetElectricalData();
+
+    m_textCtrlName->SetValue(data.name);
+
+    m_textCtrlnominalPower->SetValue(SyncGenerator::StringFromDouble(data.nominalPower));
+    switch(data.nominalPowerUnit) {
+        case UNIT_VA:
+            m_choiceNominalPower->SetSelection(0);
+            break;
+        case UNIT_kVA:
+            m_choiceNominalPower->SetSelection(1);
+            break;
+        case UNIT_MVA:
+            m_choiceNominalPower->SetSelection(2);
+            break;
+        default:
+            break;
+    }
+
+    m_textCtrlActivePower->SetValue(SyncGenerator::StringFromDouble(data.activePower));
+    switch(data.activePowerUnit) {
+        case UNIT_PU:
+            m_choiceActivePower->SetSelection(0);
+            break;
+        case UNIT_W:
+            m_choiceActivePower->SetSelection(1);
+            break;
+        case UNIT_kW:
+            m_choiceActivePower->SetSelection(2);
+            break;
+        case UNIT_MW:
+            m_choiceActivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+
+    m_textCtrlReactivePower->SetValue(SyncGenerator::StringFromDouble(data.reactivePower));
+    switch(data.reactivePowerUnit) {
+        case UNIT_PU:
+            m_choiceReactivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceReactivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceReactivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceReactivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_checkBoxMaxReactive->SetValue(data.haveMaxReactive);
+
+    m_textCtrlMaxRectivePower->SetValue(SyncGenerator::StringFromDouble(data.maxReactive));
+    switch(data.maxReactiveUnit) {
+        case UNIT_PU:
+            m_choiceMaxRectivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceMaxRectivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceMaxRectivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceMaxRectivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_textCtrlMaxRectivePower->Enable(data.haveMaxReactive);
+    m_choiceMaxRectivePower->Enable(data.haveMaxReactive);
+
+    m_checkBoxMinReactive->SetValue(data.haveMinReactive);
+    m_textCtrlMinRectivePower->SetValue(SyncGenerator::StringFromDouble(data.minReactive));
+    switch(data.minReactiveUnit) {
+        case UNIT_PU:
+            m_choiceMinRectivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceMinRectivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceMinRectivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceMinRectivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_textCtrlMinRectivePower->Enable(data.haveMinReactive);
+    m_choiceMinRectivePower->Enable(data.haveMinReactive);
+
+    m_checkBoxUseMachinePower->SetValue(data.useMachineBase);
+
+    m_textCtrlPosResistance->SetValue(SyncGenerator::StringFromDouble(data.positiveResistance));
+    m_textCtrlPosReactance->SetValue(SyncGenerator::StringFromDouble(data.positiveReactance));
+    m_textCtrlNegResistance->SetValue(SyncGenerator::StringFromDouble(data.negativeResistance));
+    m_textCtrlNegReactance->SetValue(SyncGenerator::StringFromDouble(data.negativeReactance));
+    m_textCtrlZeroResistance->SetValue(SyncGenerator::StringFromDouble(data.zeroResistance));
+    m_textCtrlZeroReactance->SetValue(SyncGenerator::StringFromDouble(data.zeroReactance));
+    m_textCtrlGrdResistance->SetValue(SyncGenerator::StringFromDouble(data.groundResistance));
+    m_textCtrlGrdReactance->SetValue(SyncGenerator::StringFromDouble(data.groundReactance));
+    m_checkBoxGroundNeutral->SetValue(data.groundNeutral);
+}
+
+SyncMachineForm::SyncMachineForm(wxWindow* parent, SyncMotor* syncMotor) : SyncMachineFormBase(parent)
+{
+    m_buttonStab->Enable(false);
+    SetSize(GetBestSize());
+    ReplaceStaticTextLabelChar(m_staticTextPosResistance, L'\u2081');
+    ReplaceStaticTextLabelChar(m_staticTextPosReactance, L'\u2081');
+    ReplaceStaticTextLabelChar(m_staticTextNegResistance, L'\u2082');
+    ReplaceStaticTextLabelChar(m_staticTextNegReactance, L'\u2082');
+    ReplaceStaticTextLabelChar(m_staticTextZeroResistance, L'\u2080');
+    ReplaceStaticTextLabelChar(m_staticTextZeroReactance, L'\u2080');
+    Layout();
+    m_syncMotor = syncMotor;
+    m_parent = parent;
+
+    SyncMotorElectricalData data = syncMotor->GetElectricalData();
+
+    m_textCtrlName->SetValue(data.name);
+
+    m_textCtrlnominalPower->SetValue(SyncMotor::StringFromDouble(data.nominalPower));
+    switch(data.nominalPowerUnit) {
+        case UNIT_VA:
+            m_choiceNominalPower->SetSelection(0);
+            break;
+        case UNIT_kVA:
+            m_choiceNominalPower->SetSelection(1);
+            break;
+        case UNIT_MVA:
+            m_choiceNominalPower->SetSelection(2);
+            break;
+        default:
+            break;
+    }
+
+    m_textCtrlActivePower->SetValue(SyncMotor::StringFromDouble(data.activePower));
+    switch(data.activePowerUnit) {
+        case UNIT_PU:
+            m_choiceActivePower->SetSelection(0);
+            break;
+        case UNIT_W:
+            m_choiceActivePower->SetSelection(1);
+            break;
+        case UNIT_kW:
+            m_choiceActivePower->SetSelection(2);
+            break;
+        case UNIT_MW:
+            m_choiceActivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+
+    m_textCtrlReactivePower->SetValue(SyncMotor::StringFromDouble(data.reactivePower));
+    switch(data.reactivePowerUnit) {
+        case UNIT_PU:
+            m_choiceReactivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceReactivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceReactivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceReactivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_checkBoxMaxReactive->SetValue(data.haveMaxReactive);
+
+    m_textCtrlMaxRectivePower->SetValue(SyncMotor::StringFromDouble(data.maxReactive));
+    switch(data.maxReactiveUnit) {
+        case UNIT_PU:
+            m_choiceMaxRectivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceMaxRectivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceMaxRectivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceMaxRectivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_textCtrlMaxRectivePower->Enable(data.haveMaxReactive);
+    m_choiceMaxRectivePower->Enable(data.haveMaxReactive);
+
+    m_checkBoxMinReactive->SetValue(data.haveMinReactive);
+    m_textCtrlMinRectivePower->SetValue(SyncMotor::StringFromDouble(data.minReactive));
+    switch(data.minReactiveUnit) {
+        case UNIT_PU:
+            m_choiceMinRectivePower->SetSelection(0);
+            break;
+        case UNIT_VAr:
+            m_choiceMinRectivePower->SetSelection(1);
+            break;
+        case UNIT_kVAr:
+            m_choiceMinRectivePower->SetSelection(2);
+            break;
+        case UNIT_MVAr:
+            m_choiceMinRectivePower->SetSelection(3);
+            break;
+        default:
+            break;
+    }
+    m_textCtrlMinRectivePower->Enable(data.haveMinReactive);
+    m_choiceMinRectivePower->Enable(data.haveMinReactive);
+
+    m_checkBoxUseMachinePower->SetValue(data.useMachineBase);
+
+    m_textCtrlPosResistance->SetValue(SyncMotor::StringFromDouble(data.positiveResistance));
+    m_textCtrlPosReactance->SetValue(SyncMotor::StringFromDouble(data.positiveReactance));
+    m_textCtrlNegResistance->SetValue(SyncMotor::StringFromDouble(data.negativeResistance));
+    m_textCtrlNegReactance->SetValue(SyncMotor::StringFromDouble(data.negativeReactance));
+    m_textCtrlZeroResistance->SetValue(SyncMotor::StringFromDouble(data.zeroResistance));
+    m_textCtrlZeroReactance->SetValue(SyncMotor::StringFromDouble(data.zeroReactance));
+    m_textCtrlGrdResistance->SetValue(SyncMotor::StringFromDouble(data.groundResistance));
+    m_textCtrlGrdReactance->SetValue(SyncMotor::StringFromDouble(data.groundReactance));
+    m_checkBoxGroundNeutral->SetValue(data.groundNeutral);
+}
+
+SyncMachineForm::~SyncMachineForm() {}
+void SyncMachineForm::OnCheckMaxReactive(wxCommandEvent& event)
+{
+    m_textCtrlMaxRectivePower->Enable(m_checkBoxMaxReactive->GetValue());
+    m_choiceMaxRectivePower->Enable(m_checkBoxMaxReactive->GetValue());
+}
+void SyncMachineForm::OnCheckMinReactive(wxCommandEvent& event)
+{
+    m_textCtrlMinRectivePower->Enable(m_checkBoxMinReactive->GetValue());
+    m_choiceMinRectivePower->Enable(m_checkBoxMinReactive->GetValue());
+}
+void SyncMachineForm::OnOKButtonClick(wxCommandEvent& event)
+{
+    if(ValidateData()) EndModal(wxID_OK);
+}
+void SyncMachineForm::OnStabilityButtonClick(wxCommandEvent& event)
+{
+    if(ValidateData()) {
+        if(m_syncGenerator) {
+            GeneratorStabForm* stabForm = new GeneratorStabForm(m_parent, m_syncGenerator);
+            if(stabForm->ShowModal() == wxID_OK) {
+                stabForm->Destroy();
+                EndModal(wxID_OK);
+            }
+
+            stabForm->Destroy();
+            EndModal(wxID_CANCEL);
+        }
+    }
+}
+
+bool SyncMachineForm::ValidateData()
+{
+    if(m_syncGenerator) {
+        SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
+        data.name = m_textCtrlName->GetValue();
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlnominalPower->GetValue(), data.nominalPower,
+                                              _("Value entered incorrectly in the field \"Nominal power\".")))
+            return false;
+        switch(m_choiceNominalPower->GetSelection()) {
+            case 0:
+                data.nominalPowerUnit = UNIT_VA;
+                break;
+            case 1:
+                data.nominalPowerUnit = UNIT_kVA;
+                break;
+            case 2:
+                data.nominalPowerUnit = UNIT_MVA;
+                break;
+        }
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlActivePower->GetValue(), data.activePower,
+                                              _("Value entered incorrectly in the field \"Active power\".")))
+            return false;
+        switch(m_choiceActivePower->GetSelection()) {
+            case 0:
+                data.activePowerUnit = UNIT_PU;
+                break;
+            case 1:
+                data.activePowerUnit = UNIT_W;
+                break;
+            case 2:
+                data.activePowerUnit = UNIT_kW;
+                break;
+            case 3:
+                data.activePowerUnit = UNIT_MW;
+                break;
+        }
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlReactivePower->GetValue(), data.reactivePower,
+                                              _("Value entered incorrectly in the field \"Reactive power\".")))
+            return false;
+        switch(m_choiceReactivePower->GetSelection()) {
+            case 0:
+                data.reactivePowerUnit = UNIT_PU;
+                break;
+            case 1:
+                data.reactivePowerUnit = UNIT_VAr;
+                break;
+            case 2:
+                data.reactivePowerUnit = UNIT_kVAr;
+                break;
+            case 3:
+                data.reactivePowerUnit = UNIT_MVAr;
+                break;
+        }
+
+        data.haveMaxReactive = m_checkBoxMaxReactive->GetValue();
+        if(data.haveMaxReactive) {
+            if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlMaxRectivePower->GetValue(), data.maxReactive,
+                                                  _("Value entered incorrectly in the field \"Max reactive power\".")))
+                return false;
+            switch(m_choiceMaxRectivePower->GetSelection()) {
+                case 0:
+                    data.maxReactiveUnit = UNIT_PU;
+                    break;
+                case 1:
+                    data.maxReactiveUnit = UNIT_VAr;
+                    break;
+                case 2:
+                    data.maxReactiveUnit = UNIT_kVAr;
+                    break;
+                case 3:
+                    data.maxReactiveUnit = UNIT_MVAr;
+                    break;
+            }
+        }
+
+        data.haveMinReactive = m_checkBoxMinReactive->GetValue();
+        if(data.haveMinReactive) {
+            if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlMinRectivePower->GetValue(), data.minReactive,
+                                                  _("Value entered incorrectly in the field \"Min reactive power\".")))
+                return false;
+            switch(m_choiceMinRectivePower->GetSelection()) {
+                case 0:
+                    data.minReactiveUnit = UNIT_PU;
+                    break;
+                case 1:
+                    data.minReactiveUnit = UNIT_VAr;
+                    break;
+                case 2:
+                    data.minReactiveUnit = UNIT_kVAr;
+                    break;
+                case 3:
+                    data.minReactiveUnit = UNIT_MVAr;
+                    break;
+            }
+        }
+
+        data.useMachineBase = m_checkBoxUseMachinePower->GetValue();
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlPosResistance->GetValue(), data.positiveResistance,
+                                              _("Value entered incorrectly in the field \"Positive resistance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlPosReactance->GetValue(), data.positiveReactance,
+                                              _("Value entered incorrectly in the field \"Positive reactance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlNegResistance->GetValue(), data.negativeResistance,
+                                              _("Value entered incorrectly in the field \"Negative resistance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlNegReactance->GetValue(), data.negativeReactance,
+                                              _("Value entered incorrectly in the field \"Negative reactance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlZeroResistance->GetValue(), data.zeroResistance,
+                                              _("Value entered incorrectly in the field \"Zero resistance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlZeroReactance->GetValue(), data.zeroReactance,
+                                              _("Value entered incorrectly in the field \"Zero reactance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlGrdResistance->GetValue(), data.groundResistance,
+                                              _("Value entered incorrectly in the field \"Ground resistance\".")))
+            return false;
+
+        if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlGrdReactance->GetValue(), data.groundReactance,
+                                              _("Value entered incorrectly in the field \"Ground reactance\".")))
+            return false;
+
+        data.groundNeutral = m_checkBoxGroundNeutral->GetValue();
+
+        m_syncGenerator->SetElectricalData(data);
+    } else if(m_syncMotor) {
+        SyncMotorElectricalData data = m_syncMotor->GetElectricalData();
+        data.name = m_textCtrlName->GetValue();
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlnominalPower->GetValue(), data.nominalPower,
+                                          _("Value entered incorrectly in the field \"Nominal power\".")))
+            return false;
+        switch(m_choiceNominalPower->GetSelection()) {
+            case 0:
+                data.nominalPowerUnit = UNIT_VA;
+                break;
+            case 1:
+                data.nominalPowerUnit = UNIT_kVA;
+                break;
+            case 2:
+                data.nominalPowerUnit = UNIT_MVA;
+                break;
+        }
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlActivePower->GetValue(), data.activePower,
+                                          _("Value entered incorrectly in the field \"Active power\".")))
+            return false;
+        switch(m_choiceActivePower->GetSelection()) {
+            case 0:
+                data.activePowerUnit = UNIT_PU;
+                break;
+            case 1:
+                data.activePowerUnit = UNIT_W;
+                break;
+            case 2:
+                data.activePowerUnit = UNIT_kW;
+                break;
+            case 3:
+                data.activePowerUnit = UNIT_MW;
+                break;
+        }
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlReactivePower->GetValue(), data.reactivePower,
+                                          _("Value entered incorrectly in the field \"Reactive power\".")))
+            return false;
+        switch(m_choiceReactivePower->GetSelection()) {
+            case 0:
+                data.reactivePowerUnit = UNIT_PU;
+                break;
+            case 1:
+                data.reactivePowerUnit = UNIT_VAr;
+                break;
+            case 2:
+                data.reactivePowerUnit = UNIT_kVAr;
+                break;
+            case 3:
+                data.reactivePowerUnit = UNIT_MVAr;
+                break;
+        }
+
+        data.haveMaxReactive = m_checkBoxMaxReactive->GetValue();
+        if(data.haveMaxReactive) {
+            if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlMaxRectivePower->GetValue(), data.maxReactive,
+                                              _("Value entered incorrectly in the field \"Max reactive power\".")))
+                return false;
+            switch(m_choiceMaxRectivePower->GetSelection()) {
+                case 0:
+                    data.maxReactiveUnit = UNIT_PU;
+                    break;
+                case 1:
+                    data.maxReactiveUnit = UNIT_VAr;
+                    break;
+                case 2:
+                    data.maxReactiveUnit = UNIT_kVAr;
+                    break;
+                case 3:
+                    data.maxReactiveUnit = UNIT_MVAr;
+                    break;
+            }
+        }
+
+        data.haveMinReactive = m_checkBoxMinReactive->GetValue();
+        if(data.haveMinReactive) {
+            if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlMinRectivePower->GetValue(), data.minReactive,
+                                              _("Value entered incorrectly in the field \"Min reactive power\".")))
+                return false;
+            switch(m_choiceMinRectivePower->GetSelection()) {
+                case 0:
+                    data.minReactiveUnit = UNIT_PU;
+                    break;
+                case 1:
+                    data.minReactiveUnit = UNIT_VAr;
+                    break;
+                case 2:
+                    data.minReactiveUnit = UNIT_kVAr;
+                    break;
+                case 3:
+                    data.minReactiveUnit = UNIT_MVAr;
+                    break;
+            }
+        }
+
+        data.useMachineBase = m_checkBoxUseMachinePower->GetValue();
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlPosResistance->GetValue(), data.positiveResistance,
+                                          _("Value entered incorrectly in the field \"Positive resistance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlPosReactance->GetValue(), data.positiveReactance,
+                                          _("Value entered incorrectly in the field \"Positive reactance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlNegResistance->GetValue(), data.negativeResistance,
+                                          _("Value entered incorrectly in the field \"Negative resistance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlNegReactance->GetValue(), data.negativeReactance,
+                                          _("Value entered incorrectly in the field \"Negative reactance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlZeroResistance->GetValue(), data.zeroResistance,
+                                          _("Value entered incorrectly in the field \"Zero resistance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlZeroReactance->GetValue(), data.zeroReactance,
+                                          _("Value entered incorrectly in the field \"Zero reactance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlGrdResistance->GetValue(), data.groundResistance,
+                                          _("Value entered incorrectly in the field \"Ground resistance\".")))
+            return false;
+
+        if(!m_syncMotor->DoubleFromString(m_parent, m_textCtrlGrdReactance->GetValue(), data.groundReactance,
+                                          _("Value entered incorrectly in the field \"Ground reactance\".")))
+            return false;
+
+        data.groundNeutral = m_checkBoxGroundNeutral->GetValue();
+
+        m_syncMotor->SetElectricalData(data);
+    }
+    return true;
+}
+
+void SyncMachineForm::ReplaceStaticTextLabelChar(wxStaticText* staticText, wchar_t newChar)
+{
+    wxString label = staticText->GetLabel();
+    label[label.length() - 2] = newChar;
+    staticText->SetLabel(label);
+}
diff --git a/Project/SyncMachineForm.h b/Project/SyncMachineForm.h
new file mode 100644
index 0000000..04d8e82
--- /dev/null
+++ b/Project/SyncMachineForm.h
@@ -0,0 +1,31 @@
+#ifndef SYNCMACHINEFORM_H
+#define SYNCMACHINEFORM_H
+
+#include "ElementForm.h"
+
+class GeneratorStabForm;
+class SyncGenerator;
+class SyncMotor;
+
+class SyncMachineForm : public SyncMachineFormBase
+{
+   public:
+    SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator);
+    SyncMachineForm(wxWindow* parent, SyncMotor* syncMotor);
+    virtual ~SyncMachineForm();
+
+   protected:
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); };
+    virtual void OnCheckMaxReactive(wxCommandEvent& event);
+    virtual void OnCheckMinReactive(wxCommandEvent& event);
+    virtual void OnOKButtonClick(wxCommandEvent& event);
+    virtual void OnStabilityButtonClick(wxCommandEvent& event);
+
+    virtual bool ValidateData();
+    virtual void ReplaceStaticTextLabelChar(wxStaticText* staticText, wchar_t newChar);
+
+    SyncGenerator* m_syncGenerator;
+    SyncMotor* m_syncMotor;
+    wxWindow* m_parent;
+};
+#endif  // SYNCMACHINEFORM_H
diff --git a/Project/SyncMotor.cpp b/Project/SyncMotor.cpp
index b6d9e9a..fba2ee5 100644
--- a/Project/SyncMotor.cpp
+++ b/Project/SyncMotor.cpp
@@ -1,22 +1,27 @@
+#include "SyncMachineForm.h"
 #include "SyncMotor.h"
 
-SyncMotor::SyncMotor() : Machines()
+SyncMotor::SyncMotor() : Machines() {}
+SyncMotor::SyncMotor(wxString name) : Machines() { m_electricalData.name = name; }
+SyncMotor::~SyncMotor() {}
+void SyncMotor::DrawSymbol() const { DrawArc(m_position, 12, 30, 330, 10, GL_LINE_STRIP); }
+bool SyncMotor::GetContextMenu(wxMenu& menu)
 {
-}
+    menu.Append(ID_EDIT_SYNCMOTOR, _("Edit Synchronous Condenser"));
+    GeneralMenuItens(menu);
 
-SyncMotor::~SyncMotor()
-{
+    return true;
 }
 
-void SyncMotor::DrawSymbol() const
+bool SyncMotor::ShowForm(wxWindow* parent, Element* element)
 {
-	DrawArc(m_position, 12, 30, 330, 10, GL_LINE_STRIP);
-}
+    SyncMachineForm* syncMotorForm = new SyncMachineForm(parent, this);
+    syncMotorForm->SetTitle(_("Synchronous Condenser"));
+    if(syncMotorForm->ShowModal() == wxID_OK) {
+        syncMotorForm->Destroy();
+        return true;
+    }
 
-bool SyncMotor::GetContextMenu(wxMenu& menu)
-{
-	menu.Append(ID_EDIT_SYNCMOTOR, _("Edit Synchronous Condenser"));
-	GeneralMenuItens(menu);
-	
-	return true;
+    syncMotorForm->Destroy();
+    return false;
 }
diff --git a/Project/SyncMotor.h b/Project/SyncMotor.h
index ab7a1ac..e199808 100644
--- a/Project/SyncMotor.h
+++ b/Project/SyncMotor.h
@@ -3,15 +3,74 @@
 
 #include "Machines.h"
 
+class SyncMachineForm;
+
+struct SyncMotorElectricalData {
+    // General
+    wxString name = "";
+    double nominalPower = 100.0;
+    ElectricalUnit nominalPowerUnit = UNIT_MVA;
+    double activePower = 100.0;
+    ElectricalUnit activePowerUnit = UNIT_MVA;
+    double reactivePower = 0.0;
+    ElectricalUnit reactivePowerUnit = UNIT_MVA;
+    bool haveMaxReactive = false;
+    double maxReactive = 9999.0;
+    ElectricalUnit maxReactiveUnit = UNIT_MVA;
+    bool haveMinReactive = false;
+    double minReactive = -9999.0;
+    ElectricalUnit minReactiveUnit = UNIT_MVA;
+    bool useMachineBase = false;
+
+    // Fault
+    double positiveResistance = 0.0;
+    double positiveReactance = 1.0;
+    double negativeResistance = 0.0;
+    double negativeReactance = 1.0;
+    double zeroResistance = 0.0;
+    double zeroReactance = 1.0;
+    double groundResistance = 0.0;
+    double groundReactance = 0.0;
+    bool groundNeutral = true;
+
+    // Stability
+    bool plotSyncMachine = false;
+    double inertia = 0.0;
+    double damping = 0.0;
+    bool useAVR = false;
+    bool useSpeedGovernor = false;
+
+    double armResistance = 0.0;
+    double potierReactance = 0.0;
+    double satFactor = 0.0;
+
+    double syncXd = 0.0;
+    double syncXq = 0.0;
+    double transXd = 1.0;
+    double transXq = 0.0;
+    double transTd0 = 0.0;
+    double transTq0 = 0.0;
+    double subXd = 0.0;
+    double subXq = 0.0;
+    double subTd0 = 0.0;
+    double subTq0 = 0.0;
+};
+
 class SyncMotor : public Machines
 {
-public:
-	SyncMotor();
-	~SyncMotor();
-	
-	virtual void DrawSymbol() const;
-	virtual bool GetContextMenu(wxMenu& menu);
+   public:
+    SyncMotor();
+    SyncMotor(wxString name);
+    ~SyncMotor();
+
+    virtual void DrawSymbol() const;
+    virtual bool GetContextMenu(wxMenu& menu);
+    virtual SyncMotorElectricalData GetElectricalData() { return m_electricalData; }
+    virtual void SetElectricalData(SyncMotorElectricalData electricalData) { m_electricalData = electricalData; }
+    virtual bool ShowForm(wxWindow* parent, Element* element);
 
+   protected:
+    SyncMotorElectricalData m_electricalData;
 };
 
-#endif // SYNCMOTOR_H
+#endif  // SYNCMOTOR_H
diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp
index 69c11c3..acb8d04 100644
--- a/Project/Workspace.cpp
+++ b/Project/Workspace.cpp
@@ -633,7 +633,8 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
                         m_statusBar->SetStatusText(_("Insert Inductor: Click on a buses, ESC to cancel."));
                     } else  // Insert an induction motor.
                     {
-                        IndMotor* newIndMotor = new IndMotor();
+                        IndMotor* newIndMotor = new IndMotor(wxString::Format(_("Induction motor %d"), GetElementNumber(ID_INDMOTOR)));
+                        IncrementElementNumber(ID_INDMOTOR);
                         m_elementList.push_back(newIndMotor);
                         m_mode = MODE_INSERT;
                         m_statusBar->SetStatusText(_("Insert Induction Motor: Click on a buses, ESC to cancel."));
@@ -644,7 +645,8 @@ void Workspace::OnKeyDown(wxKeyEvent& event)
             case 'K':  // Insert a synchronous condenser.
             {
                 if(m_mode != MODE_INSERT) {
-                    SyncMotor* newSyncCondenser = new SyncMotor();
+                    SyncMotor* newSyncCondenser = new SyncMotor(wxString::Format(_("Synchronous condenser %d"), GetElementNumber(ID_SYNCMOTOR)));
+                    IncrementElementNumber(ID_SYNCMOTOR);
                     m_elementList.push_back(newSyncCondenser);
                     m_mode = MODE_INSERT;
                     m_statusBar->SetStatusText(_("Insert Synchronous Condenser: Click on a buses, ESC to cancel."));