1496 : Bug

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 9f68cef04367407fe1f72d64ecfc9a647ca45233..7a0ae4c6b0dfac3ee3c1d1f30acc30aef9356c1d 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -147,6 +147,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        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->EnableTool(ID_UNDO, false);
        toolbar->EnableTool(ID_REDO, false);
        toolbar->SetMargins(2, 2);
@@ -289,27 +290,28 @@ void wxGUIEditorGraphicBBS::initMenu() {
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::initTabPanelsManager() {
+void wxGUIEditorGraphicBBS::initTabPanelsManager() 
+{
        _notebook = new wxAuiNotebook(this, wxID_NOTEBOOK, wxDefaultPosition,
                        wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_MOVE
                                        | wxAUI_NB_CLOSE_ON_ACTIVE_TAB | wxAUI_NB_TAB_FIXED_WIDTH
                                        | wxAUI_NB_WINDOWLIST_BUTTON);
        _tabsMgr = new wxTabPanelsManager(this);
        _frameAUIMgr->AddPane(_notebook, wxAuiPaneInfo().CenterPane());
-
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::initPackageBrowser() {
+void wxGUIEditorGraphicBBS::initPackageBrowser() 
+{
        _pkgBrowser = new WxGUIPackageBrowser2(this);
        _pkgBrowser->IncludeAll();
-       _frameAUIMgr->AddPane(_pkgBrowser,
-                       wxAuiPaneInfo().Left().MinSize(200, 200).CloseButton(false));
+       _frameAUIMgr->AddPane(_pkgBrowser, wxAuiPaneInfo().Left().MinSize(30, 500).BestSize(750,500).CloseButton(false));
 }
 
 //================================================================
 
-void wxGUIEditorGraphicBBS::DoRegeneratePackageDoc(const std::string& pack) {
+void wxGUIEditorGraphicBBS::DoRegeneratePackageDoc(const std::string& pack) 
+{
        std::string mess("Regenerating doc for package '");
        if (pack != "-a") {
                mess += pack + "'";
@@ -492,8 +494,11 @@ void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event) {
 
 void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
        unsigned short disable;
+       std::string stundo;
+       std::string stredo;
+
        _tabsMgr->loadTempDiagram(0);
-       disable = _tabsMgr->getUndoState();
+       disable = _tabsMgr->getUndoState(stundo);
        if(disable == 0)
        {
                std::string name = _tabsMgr->GetNameTabPanel();
@@ -505,19 +510,26 @@ void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
        }
 
        GetToolBar()->EnableTool(ID_UNDO,disable);
-       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
+       GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+       GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
        refreshGUIControls();
 }
 
 void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
        unsigned short disable;
+       std::string stundo;
+       std::string stredo;
+
        _tabsMgr->loadTempDiagram(1);
        std::string name = _tabsMgr->GetNameTabPanel();
        if(name[name.length() - 1] != '*')
                name +="*";
        _tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
-       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
-       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
+       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
+       GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+       GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
        refreshGUIControls();
 }
 
@@ -566,7 +578,7 @@ void wxGUIEditorGraphicBBS::SaveActualBBS(std::string filename) {
        std::string content = "";
        // writing file header
        content += "# ----------------------------------\n";
-       content += "# - BBTKGEditor v 1.2 BBS BlackBox Script\n";
+       content += "# - BBTKGEditor v 1.3 BBS BlackBox Script\n";
        content += "# - ";
        content += filename;
        content += "\n";
@@ -626,7 +638,7 @@ void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename) {
 
        // writing file header
        content += "# ----------------------------------\n";
-       content += "# - BBTKGEditor v 1.2 BBS BlackBox Script (Complex Box)\n";
+       content += "# - BBTKGEditor v 1.3 BBS BlackBox Script (Complex Box)\n";
        content += "# - ";
        content += filename;
        content += "\n";
@@ -661,7 +673,7 @@ void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) {
 
        // writing file header
        content += "# ----------------------------------\n";
-       content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n";
+       content += "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file\n";
        content += "# - ";
 
        content += filename;
@@ -677,15 +689,19 @@ void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) {
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::SaveTempActualDiagram() 
+void wxGUIEditorGraphicBBS::SaveTempActualDiagram(const std::string &action) 
 {
+       std::string stundo;
+       std::string stredo;
        std::string name = _tabsMgr->GetNameTabPanel();
        if(name[name.length() - 1] != '*')
                name +="*";
        _tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
-       _tabsMgr->saveTempActualDiagram();
-       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
-       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
+       _tabsMgr->saveTempActualDiagram(action);
+       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
+       GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+       GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
 }
 
 //=========================================================================
@@ -731,6 +747,12 @@ void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event) {
                pathfilenamebbs[pathfilenamebbs.length() - 1] = 's';
                
                if (_tabsMgr->isActualDiagramComplexBox() == false) {
+                       std::string name = _tabsMgr->GetNameTabPanel();
+                       if(name[name.length() - 1] == '*')
+                       {
+                               name =name.substr(0,name.length()-1);
+                       }
+                       _tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
                        SaveActualDiagram(pathfilename);
                        SaveActualBBS(pathfilenamebbs);
                } else {
@@ -748,6 +770,8 @@ void wxGUIEditorGraphicBBS::OnSaveAsActualDiagram(wxCommandEvent& event) {
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::refreshGUIControls() {
+       std::string stundo;
+       std::string stredo;
        wxToolBar* toolbar = GetToolBar();
        if (_tabsMgr->isActualDiagramComplexBox()) {
                toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
@@ -765,8 +789,10 @@ void wxGUIEditorGraphicBBS::refreshGUIControls() {
                GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS, true);
        }
 
-       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
-       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
+       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
+       GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+       GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+       GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
 
        if (_tabsMgr->getNumActualSelectedObjects() > 0) {
                GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM, true);
@@ -800,6 +826,7 @@ void wxGUIEditorGraphicBBS::OnCenterViewActualDiagram(wxCommandEvent& event) {
 void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
        wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open diagram"),
                        wxEmptyString, wxT(""), wxT("*.bbg"), wxOPEN | wxFILE_MUST_EXIST);
+       printf("SCP: wxGUIEditorGraphicBBS::OnOpenDiagram  \n");
        if (openFileDialog->ShowModal() == wxID_OK) {
                wxString fileName = openFileDialog->GetPath();
                ifstream inputStream;
@@ -809,7 +836,7 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
                assert(inputStream.good()); // fails
                _tabsMgr->addNewTab(openFileDialog->GetFilename());
                _tabsMgr->loadDiagram(inputStream, fName);
-               _tabsMgr->saveTempActualDiagram();
+               _tabsMgr->saveTempActualDiagram("load diagram");
                GetToolBar()->EnableTool(ID_UNDO, false);
                GetToolBar()->EnableTool(ID_UNDO, false);
                inputStream.close();
@@ -835,7 +862,7 @@ void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) {
                        scn->refresh();
                }
 
-               SaveTempActualDiagram();
+               SaveTempActualDiagram("New Box");
                // if pnl
        }// if bbDes
 }
@@ -912,12 +939,12 @@ void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) {
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreatePackage(wxCommandEvent& event) {
 
-       //bbtkSystemTools::CreatePackage();
+       bbtkSystemTools::CreatePackage();
 }
 
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) {
-       //bbtkSystemTools::CreateBlackBox();
+       bbtkSystemTools::CreateBlackBox();
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {