X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMLibraryDescriptionPanel.cpp;h=4892b64a8c6cc3f71ca9d8a269eee6cf71125268;hb=dfde248b7e6bb2c1706a6b1229a17ee2aa19ed9c;hp=a16483241b9bd10def9c4dd890709fded3619638;hpb=e75a80c4a8a5d67aeb1e941f0c980a11c09cc125;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
index a164832..4892b64 100644
--- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
@@ -91,16 +91,17 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->library->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(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() + "."));
+      wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+      returnLnk->SetWindowStyle(wxNO_BORDER);
+	  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);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->library->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header
@@ -154,14 +155,14 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
   wxButton* createClassbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_CLASS, _T("A. Create Class"));
   createClassbt->SetToolTip(wxT("Create a new class for this library."));
   actionsGridSizer->Add(createClassbt, 1, wxALL | wxEXPAND, 5);
-  wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("B. Edit CMakeLists File"));
+  wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("B. Open Library Folder"));
+  openFolderbt->SetToolTip(wxT("Open the library folder in the file explorer."));
+  actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5);
+  wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("C. Edit CMakeLists File"));
   editCMakebt->SetToolTip(wxT("Edit the CMakeLists.txt of this library in the default text editor."));
   editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseEnter,NULL,this);
   editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseExit,NULL,this);
   actionsGridSizer->Add(editCMakebt, 1, wxALL | wxEXPAND, 5);
-  wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("C. Open Library Folder"));
-  openFolderbt->SetToolTip(wxT("Open the library folder in the file explorer."));
-  actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5);
   wxButton* createFolderbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_FOLDER, _T("Create Folder (Optional)"));
   createFolderbt->SetToolTip(wxT("Create a new folder for this library."));
   actionsGridSizer->Add(createFolderbt, 1, wxALL | wxEXPAND, 5);
@@ -191,12 +192,12 @@ void wxCDMLibraryDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->library->GetParents();
     std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
     //std::cout << parentURL << std::endl;
-    for (int i = 0; i < parents.size(); i++)
+    for (int i = 0; i < (int)(parents.size()); i++)
       {
         if (parents[i]->GetPath() == parentURL)
           {
             wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-            newEvent->SetInt(parents[i]->GetId());
+            newEvent->SetClientData(parents[i]);
             newEvent->SetId(0);
             wxPostEvent(this->GetParent(), *newEvent);
           }
@@ -251,7 +252,7 @@ void wxCDMLibraryDescriptionPanel::OnBtnCreateClass(wxCommandEvent& event)
 
           wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
           newEvent->SetId(0);
-          newEvent->SetInt(this->library->GetId());
+          newEvent->SetClientData(this->library);
           wxPostEvent(this->GetParent(), *newEvent);
 
           wxMessageBox(crea::std2wx("The class has been created successfully."),_T("New Class - Success"),wxOK | wxICON_INFORMATION);
@@ -284,7 +285,7 @@ void wxCDMLibraryDescriptionPanel::OnBtnCreateFolder(wxCommandEvent& event)
         }
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(folderC->GetId());
+      newEvent->SetClientData(folderC);
       wxPostEvent(this->GetParent(), *newEvent);
       wxMessageBox(crea::std2wx("The folder was successfully created"),_T("Create Folder - Success"),wxOK | wxICON_INFORMATION);
     }
@@ -304,8 +305,7 @@ void wxCDMLibraryDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
   if(this->library->GetCMakeLists() != NULL)
     {
-      int CMId = this->library->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->library->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -326,8 +326,7 @@ void wxCDMLibraryDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
   if(this->library->GetCMakeLists() != NULL)
     {
-      int CMId = this->library->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->library->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -340,8 +339,7 @@ void wxCDMLibraryDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 
   if(this->library->GetCMakeLists() != NULL)
     {
-      int CMId = this->library->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->library->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }