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);
}
//=========================================================================
-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 + "'";
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();
}
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);
- GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
- GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
+ std::string name = _tabsMgr->GetNameTabPanel();
+ if(name[name.length() - 1] != '*')
+ name +="*";
+ _tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
+ 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();
}
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";
// 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";
// 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;
}
//=========================================================================
-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();
+ _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));
}
//=========================================================================
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 {
//=========================================================================
void wxGUIEditorGraphicBBS::refreshGUIControls() {
+ std::string stundo;
+ std::string stredo;
wxToolBar* toolbar = GetToolBar();
if (_tabsMgr->isActualDiagramComplexBox()) {
toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
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);
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;
assert(inputStream.good()); // fails
_tabsMgr->addNewTab(openFileDialog->GetFilename());
_tabsMgr->loadDiagram(inputStream, fName);
-
+ _tabsMgr->saveTempActualDiagram("load diagram");
+ GetToolBar()->EnableTool(ID_UNDO, false);
+ GetToolBar()->EnableTool(ID_UNDO, false);
inputStream.close();
}
refreshGUIControls();
wxGEditorTabPanel *pnl = this->_tabsMgr->getActualTabPanel();
- // save empty state!!
- /* if (_tabsMgr->getNumActualSelectedObjects() == 0)
- {
- SaveTempActualDiagram();
- }
- */
+
if (pnl != NULL) {
wxVtkSceneManager *scn = pnl->getSceneManager();
scn->createGBlackBox(50, 50, packageName, typeName);
scn->refresh();
}
- if (GetToolBar()->GetToolEnabled(ID_UNDO) == false)
- GetToolBar()->EnableTool(ID_UNDO,true);
- SaveTempActualDiagram();
+
+ SaveTempActualDiagram("New Box");
// if pnl
}// if bbDes
}