X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=ab6e16af43d0418e790435f5e525035e3f9e9f10;hb=refs%2Fheads%2Fvtk7itk4wx3-mingw64;hp=e8d28c522ca75ef4c83c79f96b1cfca297dc5da6;hpb=4790438d1d66a44ff16b2a8689882460bb85312c;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index e8d28c5..ab6e16a 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -52,6 +52,7 @@ #include "wxCDMPackageDescriptionPanel.h" #include "wxCDMBlackBoxDescriptionPanel.h" #include "wxCDMBBSFileDescriptionPanel.h" +#include "wxCDMBBGFileDescriptionPanel.h" #include "wxCDMCodeFileDescriptionPanel.h" #include "wxCDMCMakeListsDescriptionPanel.h" #include "wxCDMFolderDescriptionPanel.h" @@ -270,14 +271,25 @@ void wxCDMMainFrame::CreateControls() auiManager.SetManagedWindow(this); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 tree_Projects = new wxCDMProjectsTreeCtrl( this, ID_TREE_PROJECTS, wxDefaultPosition, wxSize(200,400), - wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS - ); + wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS ); + this->actualTreeItem.Unset(); +#else + tree_Projects = new wxCDMProjectsTreeCtrl( + this, + ID_TREE_PROJECTS, + wxDefaultPosition, + wxSize(200,400), + wxTR_HAS_BUTTONS ); this->actualTreeItem.Unset(); +#endif + panel_Properties = new wxCDMMainDescriptionPanel( this, @@ -411,7 +423,12 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) wxT("Project Actions Panel"), wxDefaultPosition, wxSize(800,200), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false)); @@ -513,7 +530,12 @@ void wxCDMMainFrame::OnMenuOpenRecent(wxCommandEvent& event) wxT("Project Actions Panel"), wxDefaultPosition, wxSize(800,200), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); panel_ProjectActions->SetMinSize(wxSize(500, 100)); @@ -605,7 +627,12 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event) wxT("Project Actions Panel"), wxDefaultPosition, wxSize(800,200), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); panel_ProjectActions->SetMinSize(wxSize(500, 100)); @@ -880,12 +907,15 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //appli modelCDMAppli* elementAppli = dynamic_cast(element); if(elementAppli != NULL) @@ -898,12 +928,15 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //application modelCDMApplication* elementApplication = dynamic_cast(element); if(elementApplication != NULL) @@ -916,11 +949,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //lib modelCDMLib* elementLib = dynamic_cast(element); if(elementLib != NULL) @@ -933,11 +969,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //library modelCDMLibrary* elementLibrary = dynamic_cast(element); if(elementLibrary != NULL) @@ -950,11 +989,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //package modelCDMPackage* elementPackage = dynamic_cast(element); if(elementPackage != NULL) @@ -966,12 +1008,17 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) ID_WINDOW_PROPERTIES, wxT("Description Panel"), wxDefaultPosition, - wxSize(600, 400), - 0 + wxSize(600, 100), +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + + + } else { //black box modelCDMBlackBox* elementBlackBox = dynamic_cast(element); if(elementBlackBox != NULL) @@ -984,11 +1031,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //CMakeLists modelCDMCMakeListsFile* elementCMakeLists = dynamic_cast(element); if(elementCMakeLists != NULL) @@ -1001,11 +1051,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //CodeFile modelCDMCodeFile* elementCodeFile = dynamic_cast(element); if(elementCodeFile != NULL) @@ -1018,11 +1071,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { + } else { //BBSFile modelCDMBBSFile* elementBBSFile = dynamic_cast(element); if(elementBBSFile != NULL) @@ -1035,56 +1091,90 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { - //folder - modelCDMFolder* elementFolder = dynamic_cast(element); - if(elementFolder != NULL) + } else { + //BBSFile + modelCDMBBGFile* elementBBGFile = dynamic_cast(element); + if(elementBBGFile != NULL) { //create element description - description = new wxCDMFolderDescriptionPanel( + description = new wxCDMBBGFileDescriptionPanel( this, - elementFolder, + elementBBGFile, ID_WINDOW_PROPERTIES, wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); - } - else - { - //file - modelCDMFile* elementFile = dynamic_cast(element); - if(elementFile != NULL) + } else { + //folder + modelCDMFolder* elementFolder = dynamic_cast(element); + if(elementFolder != NULL) { //create element description - description = new wxCDMFileDescriptionPanel( + description = new wxCDMFolderDescriptionPanel( this, - elementFile, + elementFolder, ID_WINDOW_PROPERTIES, wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 - ); - } - else - { - - //main if not any - //create element description - description = new wxCDMMainDescriptionPanel( - this, - ID_WINDOW_PROPERTIES, - wxT("Description Panel"), - wxDefaultPosition, - wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); + } else { + //file + modelCDMFile* elementFile = dynamic_cast(element); + if(elementFile != NULL) + { + //create element description + description = new wxCDMFileDescriptionPanel( + this, + elementFile, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif + ); + } else { + //main if not any + //create element description + description = new wxCDMMainDescriptionPanel( + this, + ID_WINDOW_PROPERTIES, + wxT("Description Panel"), + wxDefaultPosition, + wxSize(600, 400), +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif + ); + } } } } @@ -1111,9 +1201,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) this->panel_Properties = description; auiManager.Update(); - } - else - { + } else { event.Skip(); } @@ -1148,7 +1236,12 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) wxT("Description Panel"), wxDefaultPosition, wxSize(600, 400), - 0 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + 0 +#else + wxSHOW_SB_ALWAYS | wxVSCROLL +#endif ); } else if(event.GetString() == wxT("manage_libraries"))