Feature #1665 . RaC - New dialog to set diagrams properties and decide diagram type.

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxDiagramPropertiesEditionDialog.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
index c9479f19d4fe4d8bbb54e39977dfc83a5669c314..4351e4a9eae357f568b33e5e2ee25ac10f5ab4da 100755 (executable)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx
@@ -40,7 +40,7 @@ namespace bbtk
 {
        //=========================================================================
 
-       wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(520, 640),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+       wxDiagramPropertiesEditionDialog::wxDiagramPropertiesEditionDialog(wxGUIEditorGraphicBBS *parent):wxDialog(parent,wxID_ANY,_T("Diagram Properties"), wxDefaultPosition, wxSize(420, 340),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        {
                _parent = parent;
                constructDiagramPropertiesEditionDialog();
@@ -58,11 +58,28 @@ namespace bbtk
 
        void wxDiagramPropertiesEditionDialog::constructDiagramPropertiesEditionDialog()
        {
-
+               const int ID_COMBO = 1;
                wxPanel *panel = new wxPanel(this, -1);
                wxBoxSizer *hbox = new wxBoxSizer(wxHORIZONTAL);
-               wxFlexGridSizer *fgsizer = new wxFlexGridSizer(4, 2, 9, 25);
+               wxFlexGridSizer *fgsizer = new wxFlexGridSizer(5, 2, 9, 25);
+
+
+               // SELECTION CONSTANTS
+               // 0 - Application
+               // 1 - Complex box
+               _diagramType = new wxComboBox(panel, -1, wxEmptyString, wxDefaultPosition, wxSize(100,-1) );
+               _diagramType->Append (wxT("Application"));
+               _diagramType->Append (wxT("Complex box"));
+               _diagramType->SetEditable(false);
+               //_diagramType->Enable(false);
+
+               Connect(ID_COMBO, wxEVT_COMMAND_COMBOBOX_SELECTED,
+                                       wxCommandEventHandler(wxDiagramPropertiesEditionDialog::OnComboBoxSelected));
 
+               int currentType = (_parent->isCurrentDiagramComplexBox()==false)? 0 : 1;
+               _diagramType->Select(currentType);
+
+               wxStaticText *type = new wxStaticText(panel, -1, wxT("Type"));
                wxStaticText *author = new wxStaticText(panel, -1, wxT("Author"));
                wxStaticText *category = new wxStaticText(panel, -1, wxT("Category"));
                wxStaticText *description = new wxStaticText(panel, -1, wxT("Description"));
@@ -77,7 +94,14 @@ namespace bbtk
                Connect(okButton->GetId(),wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxDiagramPropertiesEditionDialog::onClickOk));
                Connect(closeButton->GetId(),wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxDiagramPropertiesEditionDialog::onClickClose));
 
+               // Assign loaded values
+               _txtAuthor->SetValue(crea::std2wx(_parent->getCurrentDiagramAuthor()));
+               _txtCategory->SetValue(crea::std2wx(_parent->getCurrentDiagramCategory()));
+               _txtDescription->SetValue(crea::std2wx(_parent->getCurrentDiagramDescription()));
+
 
+               fgsizer->Add(type);
+               fgsizer->Add(_diagramType, 1, wxEXPAND);
                fgsizer->Add(author);
                fgsizer->Add(_txtAuthor, 1, wxEXPAND);
                fgsizer->Add(category);
@@ -87,7 +111,7 @@ namespace bbtk
                fgsizer->Add(okButton, 1, wxEXPAND);
                fgsizer->Add(closeButton, 1, wxEXPAND);
 
-               fgsizer->AddGrowableRow(2, 1);
+               fgsizer->AddGrowableRow(3, 1);
                fgsizer->AddGrowableCol(1, 1);
 
                hbox->Add(fgsizer, 1, wxALL | wxEXPAND, 15);
@@ -98,7 +122,6 @@ namespace bbtk
                Destroy();
 
                // Assign loaded values
-
                _txtAuthor->SetValue(crea::std2wx(_parent->getCurrentDiagramAuthor()));
                _txtCategory->SetValue(crea::std2wx(_parent->getCurrentDiagramCategory()));
                _txtDescription->SetValue(crea::std2wx(_parent->getCurrentDiagramDescription()));
@@ -115,6 +138,16 @@ namespace bbtk
                _parent->setCurrentDiagramAuthor(txtAuthor);
                _parent->setCurrentDiagramCategory(txtCategory);
                _parent->setCurrentDiagramDescription(txtDescription);
+
+               // SELECTION CONSTANTS
+               // 0 - Application
+               // 1 - Complex box
+               int selection = _diagramType->GetSelection();
+               if(selection == 0)
+                       _parent->disableComplexBox();
+               else if (selection == 1)
+                       _parent->enableComplexBox();
+
                Close(true);
        }
 
@@ -128,6 +161,11 @@ namespace bbtk
 
        //=========================================================================
 
+       void wxDiagramPropertiesEditionDialog::OnComboBoxSelected(wxCommandEvent& event)
+       {
+               // TODO Show info to edit complex boxes
+       }
+
        //=========================================================================