X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMProjectActionsPanel.cpp;h=5b5cc09279986c0f70abb1e7ea993c82910a77eb;hb=752294dd30e2ee94f38be513d441f4716509ce13;hp=5c92a7965377ae8960c00136bece7cd22cb0aebb;hpb=cd4ae62285af30451b264ceb3202e1e912740fc7;p=crea.git diff --git a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp index 5c92a79..5b5cc09 100755 --- a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp @@ -33,6 +33,8 @@ #include "wxCDMProjectActionsPanel.h" +#include + #include "creaDevManagerIds.h" BEGIN_EVENT_TABLE(wxCDMProjectActionsPanel, wxPanel) @@ -79,7 +81,7 @@ bool wxCDMProjectActionsPanel::Create( void wxCDMProjectActionsPanel::CreateControls() { - wxButton* configurebt = new wxButton(this, ID_BUTTON_CONFIGURE_BUILD, _T("1. Configure Project")); + wxButton* configurebt = new wxButton(this, ID_BUTTON_CONFIGURE_BUILD, _T("1. Configure Project (CMake)")); configurebt->SetToolTip(wxT("This is the first step in order to execute the project. Make sure you have selected the desired Build location.")); wxButton* compilebt = new wxButton(this, ID_BUTTON_BUILD_PROJECT, _T("2. Compile Project")); compilebt->SetToolTip(wxT("This step should be done after configuring the project. This will create the executables.")); @@ -106,11 +108,15 @@ void wxCDMProjectActionsPanel::OnBtnConfigureBuild(wxCommandEvent& event) void wxCDMProjectActionsPanel::OnBtnBuildProject(wxCommandEvent& event) { std::string* result; + //wxProgressDialog* loadBar = new wxProgressDialog(wxT("Compiling"), wxT("Please wait while the compilation is executing..."), 100, this); + //loadBar->Pulse(); if(!this->project->Build(result)) { + //loadBar->Destroy(); wxMessageBox(crea::std2wx(result->c_str()), wxT("Project Compilation - Error!")); return; } + //loadBar->Destroy(); wxMessageBox(crea::std2wx("The compilation was executed successfully. Please check the \"building.log\" file located in the build folder to check the compilation result."), wxT("Project Compilation")); }