X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FwxCDMPackageManagerPanel.cpp;h=543ac596fc53364f088baf6d3161d0649b21c828;hb=e308b316bca88bedb8fb0aa3f4fabc33bc070b78;hp=3cd317bd7c65556430fcb5f9d3c63cdff2e06e97;hpb=7a33a157d7372e4d507cd4a8ec0ae9a1f92d986e;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
index 3cd317b..543ac59 100644
--- a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
@@ -43,7 +43,7 @@
 #include "images/PkIcon64.xpm"
 
 BEGIN_EVENT_TABLE(wxCDMPackageManagerPanel, wxPanel)
-EVT_BUTTON(ID_BUTTON_PREV, wxCDMPackageManagerPanel::OnBtnReturn)
+EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMPackageManagerPanel::OnBtnReturn)
 EVT_HYPERLINK(ID_LINK_SELECT_PACKAGE, wxCDMPackageManagerPanel::OnLnkPackageSelect)
 EVT_BUTTON(ID_BUTTON_CREATE_PACKAGE, wxCDMPackageManagerPanel::OnBtnCreatePackage)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCDMPackageManagerPanel::OnBtnCreatePackage)
@@ -89,9 +89,10 @@ void wxCDMPackageManagerPanel::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);
+  wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(this->project->GetName()), crea::std2wx(this->project->GetPath()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+  returnLnk->SetWindowStyle(wxNO_BORDER);
+  returnLnk->SetToolTip(wxT("Return to the active project description."));
+  sizer->Add(returnLnk, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header
   wxBoxSizer* headerSizer = new wxBoxSizer(wxHORIZONTAL);
@@ -113,19 +114,20 @@ void wxCDMPackageManagerPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
-      wxHyperlinkCtrl* pPackagelk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_PACKAGE, crea::std2wx(packages[i]->GetName().c_str()), crea::std2wx(packages[i]->GetName().c_str()));
+		wxHyperlinkCtrl* pPackagelk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_PACKAGE, crea::std2wx(packages[i]->GetName().c_str()), crea::std2wx(packages[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+		pPackagelk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
       std::string tt = "Author: " + packages[i]->GetAuthors() + "\nDescription: " + packages[i]->GetDescription();
       pPackagelk->SetToolTip(crea::std2wx(tt));
-      propertiesPanelSizer -> Add(pPackagelk, 0, wxALIGN_LEFT | wxALL, 5);
+      propertiesPanelSizer -> Add(pPackagelk, 0, wxEXPAND | wxALL, 5);
       pPackagelk->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageManagerPanel::OnMouseEnter,NULL,this);
       pPackagelk->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageManagerPanel::OnMouseExit,NULL,this);
     }
 
   propertiesPanel->SetSizer(propertiesPanelSizer);
   propertiesPanelSizer->Fit(propertiesPanel);
-  propertiesBox->Add(propertiesPanel, 0, wxALL, 5);
+  propertiesBox->Add(propertiesPanel, 1, wxALL | wxEXPAND, 5);
 
   sizer -> Add(propertiesBox, 0, wxEXPAND | wxALL, 10);
 
@@ -171,34 +173,34 @@ modelCDMProject* wxCDMPackageManagerPanel::GetProject() const
   return this->project;
 }
 
-void wxCDMPackageManagerPanel::OnBtnReturn(wxCommandEvent& event)
+void wxCDMPackageManagerPanel::OnBtnReturn(wxHyperlinkEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(project->GetId());
+  newEvent->SetClientData(project);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 }
 
 void wxCDMPackageManagerPanel::OnLnkPackageSelect(wxHyperlinkEvent& event)
 {
-  int packageId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          packageId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
 
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(packageId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 
-  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-  newEvent1->SetInt(packageId);
+  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+  newEvent1->SetClientData(thePackage);
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
@@ -236,7 +238,7 @@ void wxCDMPackageManagerPanel::OnBtnCreatePackage(wxCommandEvent& event)
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(package->GetId());
+      newEvent->SetClientData(package);
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
       event.Skip();
@@ -251,12 +253,11 @@ void wxCDMPackageManagerPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
   if(!this->project->OpenCMakeListsFile(result))
     wxMessageBox(crea::std2wx(*result),_T("Open CMakeLists File - Error!"),wxOK | wxICON_ERROR);
 
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -264,19 +265,19 @@ void wxCDMPackageManagerPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
 void wxCDMPackageManagerPanel::OnMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string PkgName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int pkgId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {
-          pkgId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
-  newEvent->SetInt(pkgId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -284,20 +285,20 @@ void wxCDMPackageManagerPanel::OnMouseEnter(wxMouseEvent& event)
 
 void wxCDMPackageManagerPanel::OnMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string PkgName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int pkgId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
   project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {
-          pkgId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
-  newEvent->SetInt(pkgId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -305,12 +306,11 @@ void wxCDMPackageManagerPanel::OnMouseExit(wxMouseEvent& event)
 
 void wxCDMPackageManagerPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -319,12 +319,11 @@ void wxCDMPackageManagerPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
 void wxCDMPackageManagerPanel::OnCMakeMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }