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

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index cdbb0e8644c7d96e041b7bd3b9fd9bb982a7f16f..b7fb989f9145d65c2075d126c8b34d9c5de0dd95 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -139,9 +139,14 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->AddTool(ID_BTNCOMPLEXBOX, _T("Complex box"), complexbox_xpm,
                        wxNullBitmap, wxITEM_NORMAL, _T("Complex box"), _T("Complex box"));
        toolbar->SetToggle(ID_BTNCOMPLEXBOX, true);
-       toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT, _T("Add input to Complex box"),
+
+       //toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT, _T("Add input to Complex box"),
+       //              bmp_complexinputport, wxNullBitmap, wxITEM_NORMAL,
+       //              _T("Add input to Complex box"), _T("Add input to Complex box"));
+       toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT, _T("Add external input (Complex box or console app)"),
                        bmp_complexinputport, wxNullBitmap, wxITEM_NORMAL,
-                       _T("Add input to Complex box"), _T("Add input to Complex box"));
+                       _T("Add external input (Complex box or console app)"), _T("Add external input (Complex box or console app)"));
+
        toolbar->AddTool(ID_ADDCOMPLEXBOXOUTPUT, _T("Add output to Complex box"),
                        bmp_complexoutputport, wxNullBitmap, wxITEM_NORMAL,
                        _T("Add output Complex box"), _T("Add output Complex box"));
@@ -151,7 +156,8 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->AddTool(ID_UNDO, _T("Undo"),bmp_undo, wxNullBitmap, wxITEM_NORMAL,     _T("Undo"), _T("Undo"));
        toolbar->AddTool(ID_REDO, _T("Redo"),bmp_redo, wxNullBitmap, wxITEM_NORMAL,     _T("Redo"), _T("Redo"));
        toolbar->AddSeparator();
-       toolbar->AddTool(ID_EDIT, _T("Edit diagram properties"),bmp_editProperties, wxNullBitmap, wxITEM_NORMAL,        _T("Edit diagram properties"), _T("Edit diagram properties"));
+       toolbar->AddTool(ID_EDITPROPERTIES, _T("Edit diagram properties"),bmp_editProperties, wxNullBitmap, wxITEM_NORMAL,      _T("Edit diagram properties"), _T("Edit diagram properties"));
+       toolbar->EnableTool(ID_EDITPROPERTIES, false);
        
        toolbar->EnableTool(ID_UNDO, false);
        toolbar->EnableTool(ID_REDO, false);
@@ -197,7 +203,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        Connect(ID_UNDO,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnUndo));
        Connect(ID_REDO,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnRedo));
        Connect(ID_CHANGENAME, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnChangeName));
-       Connect(ID_EDIT,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
+       Connect(ID_EDITPROPERTIES,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
 
 }
 //=========================================================================
@@ -791,6 +797,7 @@ void wxGUIEditorGraphicBBS::OnSaveAsActualDiagram(wxCommandEvent& event) {
 void wxGUIEditorGraphicBBS::refreshGUIControls() {
        std::string stundo;
        std::string stredo;
+       //RaC2012 2ndHackFest Next line seems weird ... To keep in mind for other devels
        wxToolBar* toolbar = GetToolBar();
        if (_tabsMgr->isActualDiagramComplexBox()) {
                toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
@@ -808,6 +815,9 @@ void wxGUIEditorGraphicBBS::refreshGUIControls() {
                GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS, true);
        }
 
+       //RaC2012 2ndHackFest
+       GetToolBar()->EnableTool(ID_EDITPROPERTIES,true);
+
        GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
        GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
        GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
@@ -909,11 +919,10 @@ void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event) {
        wxToolBar* toolbar = GetToolBar();
        bool temp = toolbar->GetToolState(ID_BTNCOMPLEXBOX);
        if (temp) {
-               _tabsMgr->setActualDiagramComplexBox(true);
+               enableComplexBox();
        } else {
-               _tabsMgr->setActualDiagramComplexBox(false);
+               disableComplexBox();
        }
-       refreshGUIControls();
 }
 
 //=========================================================================
@@ -1050,6 +1059,19 @@ void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) {
 
 //=========================================================================
 
+void wxGUIEditorGraphicBBS::enableComplexBox() {
+       _tabsMgr->setActualDiagramComplexBox(true);
+       refreshGUIControls();
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::disableComplexBox() {
+       _tabsMgr->setActualDiagramComplexBox(false);
+       refreshGUIControls();
+}
+
+//=========================================================================
 
 void wxGUIEditorGraphicBBS::setCurrentDiagramDescription(std::string description)
 {
@@ -1092,6 +1114,13 @@ std::string wxGUIEditorGraphicBBS::getCurrentDiagramCategory()
        return _tabsMgr->GetCategory();
 }
 
+//=========================================================================
+
+bool wxGUIEditorGraphicBBS::isCurrentDiagramComplexBox()
+{
+       return _tabsMgr->isActualDiagramComplexBox();
+}
+
 
 } // EO namespace bbtk