X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMApplicationDescriptionPanel.cpp;h=acf54c0a984d473cbbf3b5a22e7d1fd7f3909dfd;hb=c385404aec170d7626492d5de54a8e40c1bfc903;hp=e37085611a6f569e8cfaf1fd20e211cde3d7446b;hpb=2f886b3dbdc87d142f8363272b2bd226209b8b06;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
index e370856..acf54c0 100644
--- a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
@@ -84,6 +84,9 @@ bool wxCDMApplicationDescriptionPanel::Create(
   wxPanel::Create(parent, id, pos, size, style);
   this->application = application;
   CreateControls();
+  // this part makes the scrollbars show up
+  this->FitInside(); // ask the sizer about the needed size
+  this->SetScrollRate(5, 5);
   return TRUE;
 }
 
@@ -148,7 +151,8 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
 
   //Includes
   wxStaticBoxSizer* includesBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("&Used Libraries"));
-  wxPanel* includesPanel = new wxPanel(this);
+  includesBox->SetMinSize(250,250);
+  wxScrolledWindow* includesPanel = new wxScrolledWindow(this);
   wxBoxSizer* includesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   //Third Party Libraries
@@ -156,7 +160,7 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
   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<std::string, bool> inclusions = this->application->Get3rdPartyLibraries();
@@ -198,14 +202,14 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
 
   includesGridSizer->AddGrowableCol(1,1);
 
-  includesPanelSizer->Add(includesGridSizer, 1, wxEXPAND, 0);
+  includesPanelSizer->Add(includesGridSizer, 0, wxEXPAND | wxLEFT, 5);
 
   //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<std::string, bool> inclusionsLibs = this->application->GetCustomLibraries();
@@ -247,10 +251,14 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
 
   includesLibGridSizer->AddGrowableCol(1,1);
 
-  includesPanelSizer->Add(includesLibGridSizer, 1, wxEXPAND, 0);
+  includesPanelSizer->Add(includesLibGridSizer, 0, wxEXPAND | wxLEFT, 5);
 
   includesPanel->SetSizer(includesPanelSizer);
   includesPanelSizer->Fit(includesPanel);
+
+  includesPanel->FitInside();
+  includesPanel->SetScrollRate(5,5);
+
   includesBox->Add(includesPanel, 1, wxEXPAND);
   sizer -> Add(includesBox, 0, wxALL | wxEXPAND, 10);
 
@@ -266,19 +274,19 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
   //actionsGrid Sizer
   wxFlexGridSizer* actionsGridSizer = new wxFlexGridSizer(3, 2, 9, 15);
 
-  wxButton* createClassbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_CLASS, _T("Create Class (Optional)"));
+  wxButton* createClassbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_CLASS, _T("Create Class"));
   createClassbt->SetToolTip(wxT("Create a new Class (.h and .cxx files)."));
-  wxButton* createFolderbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_FOLDER, _T("Create Folder (Optional)"));
+  wxButton* createFolderbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_FOLDER, _T("Create Folder"));
   createFolderbt->SetToolTip(wxT("Create a new Folder inside the application folder."));
   wxButton* openMainbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_CXX, _T("A. Open Main File"));
   openMainbt->SetToolTip(wxT("Open the main file in the application folder with the default code editor."));
   openMainbt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMApplicationDescriptionPanel::OnMainMouseEnter,NULL,this);
   openMainbt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMApplicationDescriptionPanel::OnMainMouseExit,NULL,this);
-  wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("C. Edit CMakeLists File"));
+  wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("Edit CMakeLists File"));
   editCMakebt->SetToolTip(wxT("Edit the CMakeLists.txt file inside this application."));
   editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMApplicationDescriptionPanel::OnCMakeMouseEnter,NULL,this);
   editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMApplicationDescriptionPanel::OnCMakeMouseExit,NULL,this);
-  wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("B. Open Application Folder"));
+  wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("Open Application Folder"));
   openFolderbt->SetToolTip(wxT("Open the application folder in the file explorer."));
 
 
@@ -353,7 +361,10 @@ void wxCDMApplicationDescriptionPanel::OnBtnSetExeName(wxCommandEvent& event)
 
 void wxCDMApplicationDescriptionPanel::On3rdLibraryChBChange(wxCommandEvent& event)
 {
-  this->application->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue());
+  if(this->application->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 wxCDMApplicationDescriptionPanel::OnLibraryChBChange(wxCommandEvent& event)