X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMPackageConfigurationDialog.cpp;h=07a1525b50fb2eed499a3468c3d43860445e807d;hb=35dd4d1ddf73a91d308cc49fc394104169936055;hp=af407bff3f371c00d61c5b3feaab8aa5a5c24e3d;hpb=71c071fbb1e2af618f6caa489351b966e1a54b1a;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
index af407bf..07a1525 100644
--- a/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp
@@ -53,8 +53,8 @@ wxCDMPackageConfigurationDialog::wxCDMPackageConfigurationDialog(
     long style
 )
 {
-  wxCDMPackageConfigurationDialog::Create(parent, id, caption, position, size, style);
   this->package = package;
+  wxCDMPackageConfigurationDialog::Create(parent, id, caption, position, size, style);
 }
 
 wxCDMPackageConfigurationDialog::~wxCDMPackageConfigurationDialog()
@@ -84,12 +84,16 @@ void wxCDMPackageConfigurationDialog::CreateControls()
 
 
   wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Please select the libraries that are used in this package."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL, 5);
+  v_sizer1->Add(title, 0, wxEXPAND | wxALIGN_LEFT | wxALL, 5);
+
+  wxScrolledWindow* includesPanel = new wxScrolledWindow(this);
+  includesPanel->FitInside();
+  includesPanel->SetScrollRate(5,5);
 
   wxBoxSizer* includesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
     //Third Party Libraries
-    wxStaticText* Title1 = new wxStaticText(this, wxID_ANY, wxT("Third Party Libraries:"));
+    wxStaticText* Title1 = new wxStaticText(includesPanel, wxID_ANY, wxT("Third Party Libraries:"));
     wxFont font = Title1->GetFont();
     font.SetWeight(wxFONTWEIGHT_BOLD);
     Title1->SetFont(font);
@@ -101,7 +105,7 @@ void wxCDMPackageConfigurationDialog::CreateControls()
     wxFlexGridSizer* includesGridSizer = new wxFlexGridSizer(inclusions.size()+1, 2, 0, 5);
 
     wxStaticText* ChBTitle = new wxStaticText(
-        this,
+        includesPanel,
         wxID_ANY,
         wxT("Included"),
         wxDefaultPosition,
@@ -109,7 +113,7 @@ void wxCDMPackageConfigurationDialog::CreateControls()
         wxALIGN_CENTER
       );
     wxStaticText* LNmTitle = new wxStaticText(
-        this,
+        includesPanel,
         wxID_ANY,
         wxT("Library Name"),
         wxDefaultPosition,
@@ -122,14 +126,14 @@ void wxCDMPackageConfigurationDialog::CreateControls()
 
     for (std::map<std::string, bool>::iterator it = inclusions.begin(); it != inclusions.end(); ++it) {
       wxCheckBox* ChBIncl = new wxCheckBox(
-          this, ID_CHECK_INCLUDE_3RDLIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
+          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->SetName(crea::std2wx(it->first));
       ChBIncl->SetValue(it->second);
       includesGridSizer->Add(ChBIncl, 1, wxEXPAND);
 
-      wxStaticText* LNmIncl = new wxStaticText(this, wxID_ANY, crea::std2wx(it->first));
+      wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first));
       includesGridSizer->Add(LNmIncl, 1, wxEXPAND);
     }
 
@@ -138,7 +142,7 @@ void wxCDMPackageConfigurationDialog::CreateControls()
     includesPanelSizer->Add(includesGridSizer, 1, wxEXPAND, 0);
 
     //Custom Libraries
-    wxStaticText* Title2 = new wxStaticText(this, wxID_ANY, wxT("Custom Libraries:"));
+    wxStaticText* Title2 = new wxStaticText(includesPanel, wxID_ANY, wxT("Custom Libraries:"));
     font = Title2->GetFont();
     font.SetWeight(wxFONTWEIGHT_BOLD);
     Title2->SetFont(font);
@@ -150,7 +154,7 @@ void wxCDMPackageConfigurationDialog::CreateControls()
     wxFlexGridSizer* includesLibGridSizer = new wxFlexGridSizer(inclusionsLibs.size()+1, 2, 0, 5);
 
     wxStaticText* ChBTitle1 = new wxStaticText(
-        this,
+        includesPanel,
         wxID_ANY,
         wxT("Included"),
         wxDefaultPosition,
@@ -158,7 +162,7 @@ void wxCDMPackageConfigurationDialog::CreateControls()
         wxALIGN_CENTER
       );
     wxStaticText* LNmTitle1 = new wxStaticText(
-        this,
+        includesPanel,
         wxID_ANY,
         wxT("Library Name"),
         wxDefaultPosition,
@@ -171,14 +175,14 @@ void wxCDMPackageConfigurationDialog::CreateControls()
 
     for (std::map<std::string, bool>::iterator it = inclusionsLibs.begin(); it != inclusionsLibs.end(); ++it) {
       wxCheckBox* ChBIncl = new wxCheckBox(
-          this, ID_CHECK_INCLUDE_LIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
+          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->SetName(crea::std2wx(it->first));
       ChBIncl->SetValue(it->second);
       includesLibGridSizer->Add(ChBIncl, 1, wxEXPAND);
 
-      wxStaticText* LNmIncl = new wxStaticText(this, wxID_ANY, crea::std2wx(it->first));
+      wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first));
       includesLibGridSizer->Add(LNmIncl, 1, wxEXPAND);
     }
 
@@ -186,7 +190,9 @@ void wxCDMPackageConfigurationDialog::CreateControls()
 
     includesPanelSizer->Add(includesLibGridSizer, 1, wxEXPAND, 0);
 
-    v_sizer1->Add(includesPanelSizer, 1, wxEXPAND);
+    includesPanel->SetSizer(includesPanelSizer);
+
+    v_sizer1->Add(includesPanel, 1, wxEXPAND);
 
   v_sizer1->Add(new wxButton(this, wxID_OK, wxT("Close")), 0, wxALIGN_CENTER | wxRIGHT | wxBOTTOM, 30);