Feature #1665 . RaC - Changes to display properties dialog in windows and a better...

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 3695c51df9740e03f766335372bfa999459ef199..08a1b0798e9e67d42771ace6f07e520f6f75d04e 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -110,6 +110,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        wxBitmap bmp_complexoutputport(complexoutputport_xpm);
        wxBitmap bmp_undo(undo_xpm);
        wxBitmap bmp_redo(redo_xpm);
+       wxBitmap bmp_editProperties(editProperties_xpm);
        wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
 
        //Adds a tool btn to the toolbar
@@ -138,17 +139,28 @@ 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"));
-       toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, false);
+
+       // toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, false); RaC2012 2nd HackFest
+       toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, true);
+
        toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, false);
        toolbar->AddSeparator();
        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_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);
@@ -194,6 +206,8 @@ 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_EDITPROPERTIES,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::initHelpHTMLBrowser() {
@@ -518,6 +532,8 @@ void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
        refreshGUIControls();
 }
 
+//=========================================================================
+
 void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
        unsigned short disable;
        std::string stundo;
@@ -537,6 +553,16 @@ void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
 
 void wxGUIEditorGraphicBBS::OnChangeName(wxCommandEvent& event){
 }
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::OnEditDiagramProperties(wxCommandEvent& event)
+{
+       wxDiagramPropertiesEditionDialog* dialog =
+                               new wxDiagramPropertiesEditionDialog(this);
+       dialog->Show();
+}
+
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) {
@@ -774,6 +800,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);
@@ -791,6 +818,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));
@@ -892,11 +922,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();
 }
 
 //=========================================================================
@@ -950,8 +979,7 @@ void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) {
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {
-       printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n");
-/* this is the right code but it's left to include the corresponding commented libraries
+       //DFGO2012 Plug Package functionnalities
        long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
        wxDirDialog* FD =
          new wxDirDialog( 0,
@@ -979,7 +1007,10 @@ void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {
 
                                DoRegeneratePackageDoc(pname);
                                DoRegenerateBoxesLists();
-                               wxMessageBox(_T("Package successfully plugged"),_T("Plug package"),wxOK | wxICON_INFORMATION);
+
+                               _pkgBrowser->RebuildList();
+
+                               wxMessageBox(_T("Package successfully plugged. Please restart bbEditor to see the new package in the package browser."),_T("Plug package"),wxOK | wxICON_INFORMATION);
                                userResponse = wxID_CANCEL;
                        }
                        else
@@ -991,12 +1022,13 @@ void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {
                                        #endif
                                #endif
 
-
-                               wxMessageBox(_T(err),_T("Plug package"),wxOK | wxICON_ERROR);
+                               wxMessageBox(crea::std2wx(err), _T("Plug package"),wxOK | wxICON_ERROR);
+                               // THE FOLLOWING LINE GIVES ERRORS BECAUSE IT IS NECESSARY TO USE std2wx
+                               //wxMessageBox( _T( err) , _T("Plug package"),wxOK | wxICON_ERROR);
                        }
                }
        }while(userResponse != wxID_CANCEL);
-*/
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnEditConfig(wxCommandEvent& event) {
@@ -1028,10 +1060,71 @@ void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) {
        Close(true);
 }
 
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::enableComplexBox() {
+       _tabsMgr->setActualDiagramComplexBox(true);
+       refreshGUIControls();
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::disableComplexBox() {
+       _tabsMgr->setActualDiagramComplexBox(false);
+       refreshGUIControls();
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramDescription(std::string description)
+{
+       _tabsMgr->SetDescription(description);
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramAuthor(std::string author)
+{
+       _tabsMgr->SetAuthor(author);
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramCategory(std::string category)
+{
+       _tabsMgr->SetCategory(category);
+}
+
+//=========================================================================
+
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramDescription()
+{
+       return _tabsMgr->GetDescription();
+}
+
+//=========================================================================
+
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramAuthor()
+{
+       return _tabsMgr->GetAuthor();
+}
+
+//=========================================================================
+
 
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramCategory()
+{
+       return _tabsMgr->GetCategory();
+}
 
 //=========================================================================
 
+bool wxGUIEditorGraphicBBS::isCurrentDiagramComplexBox()
+{
+       return _tabsMgr->isActualDiagramComplexBox();
+}
+
+
 } // EO namespace bbtk
 
 // EOF