X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMPackageConfigurationDialog.cpp;h=2ab63a65245ff07bbf6795340de6980032ee9463;hb=c00657c295e6741fe89f541abf389f26bf0e7917;hp=af407bff3f371c00d61c5b3feaab8aa5a5c24e3d;hpb=71c071fbb1e2af618f6caa489351b966e1a54b1a;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageConfigurationDialog.cpp index af407bf..2ab63a6 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,16 +84,20 @@ 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); - includesPanelSizer->Add(Title1, 0, wxEXPAND | wxALL, 5); + includesPanelSizer->Add(Title1, 0, wxEXPAND); //inclusion data std::map inclusions = this->package->Get3rdPartyLibraries(); @@ -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,27 +126,33 @@ void wxCDMPackageConfigurationDialog::CreateControls() for (std::map::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->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(this, wxID_ANY, crea::std2wx(it->first)); + wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first)); includesGridSizer->Add(LNmIncl, 1, wxEXPAND); } includesGridSizer->AddGrowableCol(1,1); - includesPanelSizer->Add(includesGridSizer, 1, wxEXPAND, 0); + includesPanelSizer->Add(includesGridSizer, 1, wxEXPAND | wxLEFT, 5); //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); - includesPanelSizer->Add(Title2, 0, wxEXPAND | wxALL, 5); + includesPanelSizer->Add(Title2, 0, wxEXPAND); //inclusion data std::map inclusionsLibs = this->package->GetCustomLibraries(); @@ -150,7 +160,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 +168,7 @@ void wxCDMPackageConfigurationDialog::CreateControls() wxALIGN_CENTER ); wxStaticText* LNmTitle1 = new wxStaticText( - this, + includesPanel, wxID_ANY, wxT("Library Name"), wxDefaultPosition, @@ -171,22 +181,34 @@ void wxCDMPackageConfigurationDialog::CreateControls() for (std::map::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->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(this, wxID_ANY, crea::std2wx(it->first)); + wxStaticText* LNmIncl = new wxStaticText(includesPanel, wxID_ANY, crea::std2wx(it->first)); includesLibGridSizer->Add(LNmIncl, 1, wxEXPAND); } includesLibGridSizer->AddGrowableCol(1,1); - includesPanelSizer->Add(includesLibGridSizer, 1, wxEXPAND, 0); + includesPanelSizer->Add(includesLibGridSizer, 0, wxEXPAND | wxLEFT, 5); + + includesPanel->SetSizer(includesPanelSizer); - v_sizer1->Add(includesPanelSizer, 1, wxEXPAND); + v_sizer1->Add(includesPanel, 1, wxEXPAND | wxALL, 10); v_sizer1->Add(new wxButton(this, wxID_OK, wxT("Close")), 0, wxALIGN_CENTER | wxRIGHT | wxBOTTOM, 30); @@ -201,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()); }