X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMCMakeListsDescriptionPanel.cpp;h=6fd19d595ef2b794a001d5f954ac71961125daec;hb=5ff0bb2664c3cd508c1dd438666a71b8a96459c3;hp=565a861b867e1aa8c88aad45977512c6fab9bb63;hpb=7a33a157d7372e4d507cd4a8ec0ae9a1f92d986e;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp index 565a861..6fd19d5 100644 --- a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp @@ -40,7 +40,7 @@ #include "images/CMIcon64.xpm" BEGIN_EVENT_TABLE(wxCDMCMakeListsDescriptionPanel, wxPanel) -EVT_BUTTON(ID_BUTTON_PREV, wxCDMCMakeListsDescriptionPanel::OnBtnReturn) +EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMCMakeListsDescriptionPanel::OnBtnReturn) EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMCMakeListsDescriptionPanel::OnBtnOpenInEditor) EVT_BUTTON(ID_BUTTON_OPEN_FOLDER, wxCDMCMakeListsDescriptionPanel::OnBtnOpenFolder) END_EVENT_TABLE() @@ -82,10 +82,21 @@ void wxCDMCMakeListsDescriptionPanel::CreateControls() { wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - //Link to return - wxButton* returnbt = new wxButton(this, ID_BUTTON_PREV, wxT("Return to project")); - returnbt->SetToolTip(wxT("Return to the active project description.")); - sizer->Add(returnbt, 0, wxALIGN_CENTER | wxALL, 5); + //Links to return + wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL); + std::vector parents = this->cMakeLists->GetParents(); + for (int i = 0; i < parents.size(); i++) + { + wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath())); + returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + ".")); + linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + if (i < parents.size()-1) + { + linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0); + } + } + sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5); + //Header wxBoxSizer* headerSizer = new wxBoxSizer(wxHORIZONTAL); { @@ -128,12 +139,21 @@ void wxCDMCMakeListsDescriptionPanel::CreateControls() sizer->SetSizeHints(this); } -void wxCDMCMakeListsDescriptionPanel::OnBtnReturn(wxCommandEvent& event) +void wxCDMCMakeListsDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event) { - wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); - newEvent->SetInt(((wxCDMMainFrame*)this->GetParent())->GetModel()->GetProject()->GetId()); - newEvent->SetId(0); - wxPostEvent(this->GetParent(), *newEvent); + std::vector parents = this->cMakeLists->GetParents(); + std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL()); + //std::cout << parentURL << std::endl; + for (int i = 0; i < parents.size(); i++) + { + if (parents[i]->GetPath() == parentURL) + { + wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED); + newEvent->SetClientData(parents[i]); + newEvent->SetId(0); + wxPostEvent(this->GetParent(), *newEvent); + } + } } void wxCDMCMakeListsDescriptionPanel::OnBtnOpenInEditor(wxCommandEvent& event)