From dd81df5d0a29d435fd2f0a832b3666b6a416cb19 Mon Sep 17 00:00:00 2001 From: davila <> Date: Thu, 2 Feb 2012 00:58:35 +0000 Subject: [PATCH] no message --- data/icons/wxart_executablebox.xpm | 20 ++++++ .../bbsKernelEditorGraphic/GlobalConstants.h | 14 +++- .../bbtkwxGUIEditorGraphicBBS.cxx | 70 +++++++++++++++++-- .../bbtkwxGUIEditorGraphicBBS.h | 14 +++- 4 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 data/icons/wxart_executablebox.xpm diff --git a/data/icons/wxart_executablebox.xpm b/data/icons/wxart_executablebox.xpm new file mode 100644 index 0000000..c7ad92b --- /dev/null +++ b/data/icons/wxart_executablebox.xpm @@ -0,0 +1,20 @@ +/* XPM */ +static char * wxart_executablebox_xpm[] = { +"17 15 2 1", +" c None", +". c #000000", +" ", +" ..... ", +" ...... ", +" .. ", +" .. ", +" .. ", +" ....... ", +" .. .. . ", +" .. .. ", +" ........ .. ", +" ........ .... ", +" ", +" ", +" ", +" "}; diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h index 8cb03fa..a63a813 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h @@ -176,9 +176,17 @@ namespace bbtk const int ID_COPY_TO_COMPLEXDIAGRAM = 1012; const int ID_BTNBOX = 1013; const int ID_HELP_BBEDITOR = 1014; - - - const int wxID_NOTEBOOK = 1013; + const int ID_BTEXECUTABLEBOX = 1016; // EED + + const int wxID_NOTEBOOK = 1017; // EED updated + + const int ID_bbEditor_Tool_Menu_CreatePackage = 1018; // EED + const int ID_bbEditor_Tool_Menu_CreateBlackBox = 1019; // EED + const int ID_bbEditor_Tool_Menu_PlugPackage = 1020; // EED + const int ID_bbEditor_Tool_Menu_EditConfig = 1021; // EED + const int ID_bbEditor_Tool_Menu_ShowHTMLDoc = 1022; // EED + const int ID_bbEditor_Tool_Menu_CreateIndex = 1023; // EED + } // namespace bbtk #endif diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 1d144fe..02a6ecf 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -107,6 +107,7 @@ namespace bbtk wxBitmap bmp_delete(delete_xpm); wxBitmap bmp_centerview(centerview_xpm); wxBitmap bmp_box(box_xpm); + wxBitmap bmp_executablebox(executablebox_xpm); wxBitmap bmp_complexbox(complexbox_xpm); wxBitmap bmp_complexinputport(complexinputport_xpm); wxBitmap bmp_complexoutputport(complexoutputport_xpm); @@ -124,6 +125,8 @@ namespace bbtk toolbar->AddSeparator(); toolbar->AddTool(ID_BTNBOX,_T("New Box"),bmp_box, wxNullBitmap, wxITEM_NORMAL,_T("New Box"), _T("Nex Box")); toolbar->AddSeparator(); + toolbar->AddTool(ID_BTEXECUTABLEBOX,_T("Select as executable Box"),bmp_executablebox, wxNullBitmap, wxITEM_NORMAL,_T("Select as executable Box"), _T("Select as executable Box")); + toolbar->AddSeparator(); 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"),bmp_complexinputport, wxNullBitmap, wxITEM_NORMAL,_T("Add input to Complex box"), _T("Add input to Complex box")); @@ -144,6 +147,7 @@ namespace bbtk Connect(ID_DELETEALL,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnDeleteAllBoxesActualDiagram)); Connect(ID_CENTERVIEW,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCenterViewActualDiagram)); Connect(ID_BTNBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnBox)); + Connect(ID_BTEXECUTABLEBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnExecutableBox)); Connect(ID_BTNCOMPLEXBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnComplexBox)); Connect(ID_ADDCOMPLEXBOXINPUT,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxInput)); Connect(ID_ADDCOMPLEXBOXOUTPUT,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxOutput)); @@ -191,11 +195,28 @@ namespace bbtk helpMenu->Append(ID_HELP_BBEDITOR, _T("&Help..."), _T("Help")); Connect(ID_HELP_BBEDITOR,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnHelpBBeditor)); + // Create Tool menu + wxMenu *menuTools = new wxMenu; + menuTools->Append( ID_bbEditor_Tool_Menu_CreatePackage, _T("Create &package") ); + menuTools->Append( ID_bbEditor_Tool_Menu_CreateBlackBox, _T("Create &blackbox") ); + menuTools->Append( ID_bbEditor_Tool_Menu_PlugPackage, _T("Plug package") ); + menuTools->Append( ID_bbEditor_Tool_Menu_EditConfig, _T("&Edit bbtk config") ); + menuTools->Append( ID_bbEditor_Tool_Menu_ShowHTMLDoc, _T("Show &HTML documentation") ); + menuTools->Append( ID_bbEditor_Tool_Menu_CreateIndex, _T("&Generate index") ); + + Connect(ID_bbEditor_Tool_Menu_CreatePackage,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreatePackage)); + Connect(ID_bbEditor_Tool_Menu_CreateBlackBox,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateBlackBox)); + Connect(ID_bbEditor_Tool_Menu_PlugPackage,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnPlugPackage)); + Connect(ID_bbEditor_Tool_Menu_EditConfig,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditConfig)); + Connect(ID_bbEditor_Tool_Menu_ShowHTMLDoc,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnShowHTMLDoc)); + Connect(ID_bbEditor_Tool_Menu_CreateIndex,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateIndex)); + // Append the created menu to the menu bar wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(fileMenu, _T("&File")); - menuBar->Append(editMenu, _T("&Edit")); - menuBar->Append(helpMenu, _T("&Help")); + menuBar->Append( fileMenu, _T("&File") ); + menuBar->Append( editMenu, _T("&Edit") ); + menuBar->Append( menuTools, _T("&Tool") ); + menuBar->Append( helpMenu, _T("&Help") ); // Attach this menu bar to the frame SetMenuBar(menuBar); @@ -727,6 +748,12 @@ namespace bbtk //========================================================================= + void wxGUIEditorGraphicBBS::OnClickBtnExecutableBox(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnClickBtnExecutableBox .... not implemented ...\n"); + } + + //========================================================================= void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event) { @@ -785,10 +812,45 @@ namespace bbtk void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) { - printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ......\n"); + printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ....not implemented..\n"); } + //========================================================================= + void wxGUIEditorGraphicBBS::OnCreatePackage(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnCreatePackag ... not implemented ..\n"); + } + + + //========================================================================= + void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnCreateBlackBox ... not implemented ..\n"); + } + //========================================================================= + void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n"); + } + //========================================================================= + void wxGUIEditorGraphicBBS::OnEditConfig(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnEditConfig ... not implemented ..\n"); + } + //========================================================================= + void wxGUIEditorGraphicBBS::OnShowHTMLDoc(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnShowHTMLDoc ... not implemented ..\n"); + } + //========================================================================= + void wxGUIEditorGraphicBBS::OnCreateIndex(wxCommandEvent& event) + { + printf("EED wxGUIEditorGraphicBBS::OnCreateIndex ... not implemented ..\n"); + } + + + //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h index 2cbd7c9..d3cc7ed 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h @@ -57,6 +57,7 @@ #include "wxart_delete.xpm" #include "wxart_centerview.xpm" #include "wxart_box.xpm" +#include "wxart_executablebox.xpm" #include "wxart_complexbox.xpm" #include "wxart_complexinputport.xpm" #include "wxart_complexoutputport.xpm" @@ -143,6 +144,7 @@ namespace bbtk void OnSaveActualBBS(wxCommandEvent& event); void OnSaveActualComplexBox(wxCommandEvent& event); void OnExecuteActualDiagram(wxCommandEvent& event); + void OnClickBtnExecutableBox(wxCommandEvent& event); void OnDeleteAllBoxesActualDiagram(wxCommandEvent& event); void OnCenterViewActualDiagram(wxCommandEvent& event); void OnClickBtnBox(wxCommandEvent& event); @@ -155,7 +157,17 @@ namespace bbtk // Edit menu events void OnCopySelectedToComplexDiagram(wxCommandEvent& event); - + // Tool menu events + void OnCreatePackage(wxCommandEvent& event); + void OnCreateBlackBox(wxCommandEvent& event); + void OnPlugPackage(wxCommandEvent& event); + void OnEditConfig(wxCommandEvent& event); + void OnShowHTMLDoc(wxCommandEvent& event); + void OnCreateIndex(wxCommandEvent& event); + + + + private: //AuiManager for the wxWindow -- 2.45.0