X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMPackageConfigurationDialog.cpp;h=2ab63a65245ff07bbf6795340de6980032ee9463;hb=f5cd0d2ab363ef8d6fd89d547ace70ca31d2bf3e;hp=7c9c3aaef956af43cbe2057c25fee210072d8c18;hpb=5a17d994576296f2a5a85f3a01ad5631786a0c56;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
index 7c9c3aa..2ab63a6 100644
--- a/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
@@ -128,10 +128,16 @@ void wxCDMPackageConfigurationDialog::CreateControls()
       wxCheckBox* ChBIncl = new wxCheckBox(
           includesPanel, ID_CHECK_INCLUDE_3RDLIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
         );
-      ChBIncl->SetToolTip(crea::std2wx("When this box is checked the " + it->first + " library is included in the project configuration for this library."));
+      ChBIncl->SetToolTip(crea::std2wx(
+          "When this box is checked the " + it->first + " library\n"
+          "is included in the project configuration for\n"
+          "this package including the following instruction\n"
+          "in the package's folder CMakeLists.txt file:\n"
+          "SET(${BBTK_PACKAGE_NAME}_USE_" + it->first+ "  ON)\n"
+          ));
       ChBIncl->SetName(crea::std2wx(it->first));
       ChBIncl->SetValue(it->second);
-      includesGridSizer->Add(ChBIncl, 1, wxEXPAND);
+      includesGridSizer->Add(ChBIncl, 0, wxEXPAND);
 
       wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first));
       includesGridSizer->Add(LNmIncl, 1, wxEXPAND);
@@ -177,10 +183,20 @@ void wxCDMPackageConfigurationDialog::CreateControls()
       wxCheckBox* ChBIncl = new wxCheckBox(
           includesPanel, ID_CHECK_INCLUDE_LIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
         );
-      ChBIncl->SetToolTip(crea::std2wx("When this box is checked the " + it->first + " custom library is included in the project configuration for this library."));
+      ChBIncl->SetToolTip(crea::std2wx(
+          "When this box is checked the " + it->first + " custom\n"
+          "library is included in the project configuration for\n"
+          "this packages including the following code in the\n"
+          "package's folder CMakeLists.txt file:\n"
+          "SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS\n"
+          "  ../lib/"+ it->first + "\n"
+          ")\n"
+          "SET(${BBTK_PACKAGE_NAME}_LIBS\n"
+          "  " + it->first+ "\n"
+          ")"));
       ChBIncl->SetName(crea::std2wx(it->first));
       ChBIncl->SetValue(it->second);
-      includesLibGridSizer->Add(ChBIncl, 1, wxEXPAND);
+      includesLibGridSizer->Add(ChBIncl, 0, wxEXPAND);
 
       wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first));
       includesLibGridSizer->Add(LNmIncl, 1, wxEXPAND);
@@ -207,17 +223,17 @@ void wxCDMPackageConfigurationDialog::OnFinish(wxCommandEvent& event)
 void wxCDMPackageConfigurationDialog::On3rdLibraryIncludeChange(
     wxCommandEvent& event)
 {
-  this->package->Set3rdPartyLibrary(
-    crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()),
-    ((wxCheckBox*)event.GetEventObject())->GetValue()
-  );
+  if(this->package->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue()))
+    ((wxCheckBox*)event.GetEventObject())->SetValue(((wxCheckBox*)event.GetEventObject())->GetValue());
+  else
+    ((wxCheckBox*)event.GetEventObject())->SetValue(!((wxCheckBox*)event.GetEventObject())->GetValue());
 }
 
 void wxCDMPackageConfigurationDialog::OnCustomLibraryIncludeChange(
     wxCommandEvent& event)
 {
-  this->package->SetCustomLibrary(
-    crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()),
-    ((wxCheckBox*)event.GetEventObject())->GetValue()
-  );
+  if(this->package->SetCustomLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue()))
+      ((wxCheckBox*)event.GetEventObject())->SetValue(((wxCheckBox*)event.GetEventObject())->GetValue());
+    else
+      ((wxCheckBox*)event.GetEventObject())->SetValue(!((wxCheckBox*)event.GetEventObject())->GetValue());
 }