X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=ad37e22c023a6bc3f12de9fd1ab7163100d14836;hb=f4451b0dfa9bfa593ada3e9462570b6ca250f0d7;hp=a5b1315fd05814df8c2c0494190141a88e33cedb;hpb=921c85646eb457d9e8cfc1a9031481df176970ce;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp index a5b1315..ad37e22 100755 --- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp +++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp @@ -277,8 +277,8 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event) //populate tree control tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject()); - tree_Projects->SelectItem(this->model->GetProject()->GetId(), false); - tree_Projects->SelectItem(this->model->GetProject()->GetId(), true); + tree_Projects->Unselect(); + tree_Projects->SelectItem(this->model->GetProject()->GetId()); //show project actions panel @@ -352,7 +352,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event) //populate tree control tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject()); - tree_Projects->SelectItem(this->model->GetProject()->GetId(), false); + tree_Projects->Unselect(); tree_Projects->SelectItem(this->model->GetProject()->GetId(), true); @@ -438,7 +438,7 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event) { std::cout << "error closing project: " << *result << std::endl; } - tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject()); + if(this->panel_Properties != NULL) { auiManager.DetachPane(this->panel_Properties); @@ -446,6 +446,13 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event) this->panel_Properties = NULL; } + if(this->tree_Projects != NULL) + { + auiManager.DetachPane(this->tree_Projects); + this->tree_Projects->Destroy(); + this->tree_Projects = NULL; + } + if(this->panel_ProjectActions != NULL) { auiManager.DetachPane(this->panel_ProjectActions); @@ -469,7 +476,7 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event) this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject()); this->auiManager.Update(); - this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false); + this->tree_Projects->Unselect(); this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true); } event.Skip(); @@ -525,7 +532,42 @@ void wxCDMMainFrame::OnMenuAboutCreaDevManager(wxCommandEvent& event) html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER); html -> SetBorders(0); - html -> LoadPage(wxT("about.html")); + + std::string content = "" + "" + "" + "" + " " + " " + " " + " " + " " + " " + "

" + " " + " CREA Development Manager" + " " + " " + "

" + "

Creatis 2012 - Lyon, France

" + " " + " " + " " + " " + " " + "

" + "

Created by Daniel González - daniel.gonzalez@creatis.insa-lyon.fr

" + "

" + " " + "

This software is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software.

" + " " + " " + "

" + "" + "" + ; + + html -> SetPage(crea::std2wx(content)); html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(), html -> GetInternalRepresentation() -> GetHeight()); @@ -760,24 +802,18 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event) } } - if(this->panel_Properties!= NULL) - this->panel_Properties->Hide(); - - auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false)); - auiManager.Update(); - //delete old view if(this->panel_Properties!= NULL) { + this->panel_Properties->Hide(); auiManager.DetachPane(this->panel_Properties); this->panel_Properties->Destroy(); this->panel_Properties = NULL; } //set new view - + auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false)); this->panel_Properties = description; - //auiManager.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("Properties")).BestSize(600,400).CloseButton(false)); auiManager.Update(); event.Skip(); } @@ -794,7 +830,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) case 0: myItem = ((modelCDMIProjectTreeNode*)event.GetClientData()); //select out old one to generate selection event - this->tree_Projects->SelectItem(myItem->GetId(), false); + this->tree_Projects->Unselect(); this->tree_Projects->SelectItem(myItem->GetId(), true); this->tree_Projects->Expand(myItem->GetId()); break; @@ -802,8 +838,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) wxPanel* description = NULL; if(event.GetString() == wxT("manage_packages")) { - this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false); - this->tree_Projects->Expand(this->model->GetProject()->GetId()); + //this->tree_Projects->Expand(this->model->GetProject()->GetId()); + //this->tree_Projects->Unselect(); description = new wxCDMPackageManagerPanel( this, this->model->GetProject(), @@ -828,7 +864,6 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) } else if(event.GetString() == wxT("blackbox")) { - this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false); modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData(); description = new wxCDMBlackBoxDescriptionPanel( this, @@ -841,23 +876,19 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event) ); } - if(this->panel_Properties!= NULL) - this->panel_Properties->Hide(); - - auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false)); - auiManager.Update(); - //delete old view if(this->panel_Properties!= NULL) { + this->panel_Properties->Hide(); auiManager.DetachPane(this->panel_Properties); this->panel_Properties->Destroy(); this->panel_Properties = NULL; } //set new view - + auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false)); this->panel_Properties = description; auiManager.Update(); + break; } event.Skip();