X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMProjectActionsPanel.cpp;h=35a98be2edae555c1206e95872204c6e0dca11b9;hb=0cc6a7e002ad79de9453517108d7456fd44ddfdb;hp=9871519ac6df89f2dc55748e51706b44cbb5f1de;hpb=58f32bff34779e30ecef47a095f08c96aae6edba;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
index 9871519..35a98be 100755
--- a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
@@ -77,8 +77,10 @@ bool wxCDMProjectActionsPanel::Create(
   wxPanel::Create(parent,id,pos,size,style);
   wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
   this->SetSizer(sizer);
-
   CreateControls();
+  // this part makes the scrollbars show up
+  this->FitInside(); // ask the sizer about the needed size
+  this->SetScrollRate(5, 5);
 
   return TRUE;
 }
@@ -125,12 +127,12 @@ void wxCDMProjectActionsPanel::OnBtnConfigureBuild(wxCommandEvent& event)
 void wxCDMProjectActionsPanel::OnBtnBuildProject(wxCommandEvent& event)
 {
 #ifdef _WIN32
-	std::string* result;
-	if(!this->project->Build(result, ""))
-	{
-	  wxMessageBox(crea::std2wx(result->c_str()), wxT("Project Compilation - Error!"));
-	  return;
-	}
+  std::string* result;
+  if(!this->project->Build(result, ""))
+    {
+      wxMessageBox(crea::std2wx(result->c_str()), wxT("Project Compilation - Error!"));
+      return;
+    }
 #else
   //get author from user
   wxTextEntryDialog* buildDlg = new wxTextEntryDialog(
@@ -166,22 +168,31 @@ void wxCDMProjectActionsPanel::OnBtnBuildProject(wxCommandEvent& event)
 void wxCDMProjectActionsPanel::OnBtnConnectProject(wxCommandEvent& event)
 {
   std::string* result;
-  wxString file = wxDirSelector(
-    wxT("Please select the folder containing the bbtkPackage file you want to use. Usually it is where you built your project."),
-    crea::std2wx(this->project->GetBuildPath())
-  );
-
-  if(crea::wx2std(file) == "" || !this->project->Connect(result, crea::wx2std(file)))
+  int isDir = wxMessageBox(crea::std2wx("Is this the path of the project compilation to plug?:\n"+this->project->GetBuildPath()), wxT("Plug BBTK Packages"), wxYES_NO|wxCANCEL);
+  if(isDir != wxCANCEL)
     {
-      if (crea::wx2std(file) == "")
-        result = new std::string("Folder not specified.");
-      wxMessageBox(crea::std2wx(result->c_str()), wxT("Plug BBTK Packages - Error!"), wxICON_ERROR);
-      return;
+      wxString file = crea::std2wx(this->project->GetBuildPath());
+      if(isDir == wxNO)
+        {
+          file = wxDirSelector(
+              wxT("Please select the folder containing the bbtkPackage file you want to use. Usually it is where you built your project."),
+              crea::std2wx(this->project->GetBuildPath())
+          );
+        }
+
+      if(!file.IsEmpty())
+        {
+          if(!this->project->Connect(result, crea::wx2std(file)))
+            {
+              wxMessageBox(crea::std2wx(result->c_str()), wxT("Plug BBTK Packages - Error!"), wxICON_ERROR);
+              return;
+            }
+          else
+            {
+              wxMessageBox(crea::std2wx("The connection was executed successfully. Please check the console to see the compilation result.\n Also, don't forget to restart the BBTK Graphical Editor (if already opened) to see the plugged packages."), wxT("Plug Package"));
+            }
+
+        }
+
     }
-#ifdef _WIN32
-  wxMessageBox(crea::std2wx("The connection was executed successfully. Please check the console to see the compilation result."), wxT("Plug Package"));
-#else
-  wxMessageBox(crea::std2wx("The connection was executed successfully. Please check the \"plugging.log\" file located in the build folder to see the compilation result."), wxT("Plug Package"));
-#endif
-  
 }