X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=3b6641effcea4a1e27d372e08e8f952c36781e2e;hb=567028f33d052a54225024906cce14dc1558162f;hp=3695c51df9740e03f766335372bfa999459ef199;hpb=903d81ba963c29711c61943671df8ebbcd7385c8;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 3695c51..3b6641e 100644
--- 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
@@ -149,6 +150,8 @@ 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->AddSeparator();
+	toolbar->AddTool(ID_EDIT, _T("Edit diagram properties"),bmp_editProperties, wxNullBitmap, wxITEM_NORMAL,	_T("Edit diagram properties"), _T("Edit diagram properties"));
 	
 	toolbar->EnableTool(ID_UNDO, false);
 	toolbar->EnableTool(ID_REDO, false);
@@ -194,6 +197,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_EDIT,wxEVT_COMMAND_TOOL_CLICKED,	wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::initHelpHTMLBrowser() {
@@ -518,6 +523,8 @@ void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
 	refreshGUIControls();
 }
 
+//=========================================================================
+
 void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
 	unsigned short disable;
 	std::string stundo;
@@ -537,6 +544,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) {
@@ -950,8 +967,8 @@ 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
+	//printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n");
+	//this is the right code but it's left to include the corresponding commented libraries
 	long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
 	wxDirDialog* FD =
 	  new wxDirDialog( 0,
@@ -979,7 +996,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
@@ -996,7 +1016,7 @@ void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {
 			}
 		}
 	}while(userResponse != wxID_CANCEL);
-*/
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnEditConfig(wxCommandEvent& event) {
@@ -1028,10 +1048,51 @@ void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) {
 	Close(true);
 }
 
+//=========================================================================
 
 
+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();
+}
+
+
 } // EO namespace bbtk
 
 // EOF