#2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / view / listConfigDialog.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.cxx
index d1b1776fd40a3616249ed5154a4f267053501c7c..84f9c53b90208f30c8a75762903b615f2130ec9f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listConfigDialog.cxx
@@ -43,6 +43,7 @@ namespace creaButtonContainer
                        this->m_CurrentListWx->Reparent(this);
                        this->m_CurrentListWx->SetFunctorEnabled(false);
                        this->m_CurrentListWx->Show(true);
+                       this->m_LastStatus = this->m_CurrentListWx->GetListBox()->GetStrings();
 
                        wxGridBagSizer* dialogSizer = new wxGridBagSizer(0, 0);
                        dialogSizer->AddGrowableCol(0);
@@ -57,12 +58,19 @@ namespace creaButtonContainer
                                        wxALL | wxEXPAND | wxALIGN_CENTER_HORIZONTAL
                                                        | wxALIGN_CENTER_VERTICAL, 5);
                        wxBoxSizer* boxSizer1 = new wxBoxSizer(wxVERTICAL);
-                       this->m_AddButton = new wxBitmapButton(this, 1, wxNullBitmap,
+
+                       wxBitmap AddIcon(Add_xpm);
+                       this->m_AddButton = new wxBitmapButton(this, 1, AddIcon,
                                        wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
                                        _T(">"));
+
+
                        boxSizer1->Add(this->m_AddButton, 1,
                                        wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
-                       this->m_RemoveButton = new wxBitmapButton(this, 2, wxNullBitmap,
+
+                       wxBitmap DeleteIcon(Delete_xpm);
+
+                       this->m_RemoveButton = new wxBitmapButton(this, 2, DeleteIcon,
                                        wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
                                        _T("<"));
                        boxSizer1->Add(this->m_RemoveButton, 1,
@@ -74,15 +82,23 @@ namespace creaButtonContainer
                                        wxALL | wxEXPAND | wxALIGN_CENTER_HORIZONTAL
                                                        | wxALIGN_CENTER_VERTICAL, 5);
                        wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL);
+
+                       //wxBitmap UppIcon(settings_xpm);
+
                        this->m_UpButton = new wxBitmapButton(this, 3, wxNullBitmap,
                                        wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
                                        _T("+"));
                        boxSizer2->Add(this->m_UpButton, 1,
                                        wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
-                       this->m_RemoveButton = new wxBitmapButton(this, 4, wxNullBitmap,
+
+
+
+                       //wxBitmap DownIcon(Delete_xpm);
+
+                       this->m_DownButton = new wxBitmapButton(this, 4, wxNullBitmap,
                                        wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
                                        _T("-"));
-                       boxSizer2->Add(this->m_RemoveButton, 1,
+                       boxSizer2->Add(this->m_DownButton, 1,
                                        wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
                        topSizer->Add(boxSizer2, wxGBPosition(0, 3), wxDefaultSpan,
                                        wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
@@ -90,6 +106,8 @@ namespace creaButtonContainer
                                        wxALL | wxEXPAND | wxALIGN_CENTER_HORIZONTAL
                                                        | wxALIGN_CENTER_VERTICAL, 5);
 
+                       //Bottom Sizer
+
                        wxBoxSizer* bottomSizer = new wxBoxSizer(wxHORIZONTAL);
                        bottomSizer->Add(0, 0, 1,
                                        wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
@@ -211,11 +229,15 @@ namespace creaButtonContainer
                }
                void ListConfigDialog::OnOk(wxCommandEvent& event)
                {
+
                        this->EndModal(1);
                }
                void ListConfigDialog::OnCancel(wxCommandEvent& event)
                {
-                       Close();
+
+                       this->m_CurrentListWx->GetListBox()->Clear();
+                       this->m_CurrentListWx->GetListBox()->Append(this->m_LastStatus);
+                       this->Close();
                }
        }
 }