Fixes:

-Project help dialog: what is description panel
-Lib help dialog: "libraries' functions"
                  "Edit Lib's CMakeList File" button below
-Description Panel: past/folders'/links/and "/ actual folder"
-Library help dialog: If you use other libraries or create additional folders in your library you must include them in the library's "CMakeLists.txt" file.
-Package Manager help dialog: You should also include in this file those libraries used in the black boxes allocated in this package.
-All help dialog: Indicate where the libraries should be included in the package CMakeLists file.

Error Fixed: when a box is created, the description returnsto the description of the project.

diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
index 94f0d0037d0740ba622763237dda98cda0d30fbe..49904c2524caac65fe4655a846657c75d52f8111 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
@@ -97,11 +97,10 @@ void wxCDMAppliDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->appli->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMAppliHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMAppliHelpDialog.cpp
index ec93c10bbaa8dffb0f46eec7de0dbbe845b3a69a..860abfdd87d533b1c5ecf1a3619aa2cd289a475d 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMAppliHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMAppliHelpDialog.cpp
@@ -94,9 +94,10 @@ void wxCDMAppliHelpDialog::CreateControls()
           "applications are useful when showing the projects' \"out of the box\" functionalities.\n"
           "\n"
           "In the application manager you can view a list of the available applications in the current project, as well as create "
-          "new applications. Remember that any application you make must be included in the appli's folder CMakeLists file. You can do that "
-          "by clicking on the \"Edit Appli's CMakeLists File\" button bellow or in the Application Manager the \"Edit CMakeLists file\" "
-          "button and include the desired applications at the end of the file.\n"
+          "new applications. Remember that any application you make must be included in the appli's folder CMakeLists file by using the "
+          "\"ADD_SUBDIRECTORY([applicationName])\" command. You can do that by clicking on the \"Edit Appli's CMakeLists File\" button "
+          "below or in the Application Manager the \"Edit CMakeLists file\" button and include the desired applications at the end of "
+          "the file.\n"
           "For a better understanding of how to use the applications please check the \"myFierceAppli\" application (which is shipped by "
           "default in every new project) and take a look at how it's included in the project."),
           wxDefaultPosition,

diff --git a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
index cddc1af398327607a8a123f1be4ccaca25b6b525..26c6ce0f124d3c8b00b05c469047d97e0d914766 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
@@ -98,11 +98,9 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->application->GetName())), 0, wxALIGN_CENTER, 0);
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMApplicationHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMApplicationHelpDialog.cpp
index d4aa18d76f3c99d620d5027640eda28a04ceec09..df47d8a59f0b213cc2df95269ea228d99fdc7281 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMApplicationHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMApplicationHelpDialog.cpp
@@ -103,8 +103,12 @@ void wxCDMApplicationHelpDialog::CreateControls()
           "If you need to create separate classes in the application folder, or inside an specific folders you can do it by "
           "creating a new class with the \"Create Class\" button or by creating a folder with the \"Create Folder\" button.\n"
           "Then, in order to include your applications in the project correctly you must include them in the appli's folder "
-          "\"CMakeLists.txt\" file. Also, if you create additional folders in your library you should include them in the application's "
-          "\"CMakeLists.txt\" file.\n"
+          "\"CMakeLists.txt\" file using the command \"ADD_SUBDIRECTORY([applicationName])\". Also, if you create additional "
+          "folders in your application you should include them in the application's \"CMakeLists.txt\" file using the command "
+          "\"ADD_SUBDIRECTORY([folderName])\". If you use a third party library in your application you must include it by "
+          "uncommenting its inclusion in the application's \"CMakeLists.txt\" file. If you use a custom library in your "
+          "application you must include it by including the library path inside the \"INCLUDE_DIRECTORIES\" command, and its "
+          "name inside the \"SET ( ${EXE_NAME}_LINK_LIBRARIES...\"command.\n"
           "\n"
           "You can easily edit the CMakeLists files previously mentioned by clicking on the following buttons."),
           wxDefaultPosition,

diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
index c511afff2a4bb27babc9d6678dd6ed4e2b513e2e..959d27a4adab7a256faa41b838771dd35ecfdeff 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
@@ -97,11 +97,11 @@ void wxCDMBlackBoxDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->blackBox->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
index d8f0c9e57e5943b1a08fa60ea310ab6e1bf2904e..16f436df18fba6f1397f5606ae1bafdd9996d202 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
@@ -105,9 +105,12 @@ void wxCDMBlackBoxHelpDialog::CreateControls()
           "If you don't understand how this inputs and outputs are used, try looking at the sample black boxes available "
           "in the sample package, which is shipped with every new project.\n"
           "Also, don't forget to include the libraries your boxes use in the header and implementation files. They should "
-          "also be pointed and included in the package's directory CMakeLists.txt file and the project's directory "
-          "CMakeLists.txt file. Again, please take a look at the sample package and its boxes to see how to include libraries "
-          "in order to use them in the boxes.\n"
+          "also be pointed and included in the package's directory CMakeLists.txt file by uncommenting the \"SET\" commands "
+          "for third party libraries or by including the library name inside the \"SET(${BBTK_PACKAGE_NAME}_LIBS\"command "
+          "and its path inside the \"SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS\" command for custom libraries. You must also "
+          "include the package your black box is in by including the command \"ADD_SUBDIRECTORY([packageName])\" in the "
+          "project's directory CMakeLists.txt file. Again, please take a look at the sample package and its boxes to see "
+          "how to include libraries in order to use them in the boxes.\n"
           "\n"
           "You can easily edit the CMakeLists files previously mentioned by clicking on the following buttons."),
           wxDefaultPosition,

diff --git a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
index 9b61ae241ebf8633d66f55bbbab831fa77495074..07316246549510d940cad80819d97879080a7398 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
@@ -91,11 +91,11 @@ void wxCDMCMakeListsDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->cMakeLists->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
index 2c54eae074e9320e717f8376e6d14611a86d3849..fac03fa10c5474b077157443b2266f9b7a85dd33 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
@@ -93,11 +93,11 @@ void wxCDMFileDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->file->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
index 69a5146edec69b315169cf5c78c8802f084eec43..7acc023142a9a9f95da5fc01ebf7f7e53b08fb4b 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
@@ -94,11 +94,11 @@ void wxCDMFolderDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->folder->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
index abc0a8e2bd11328ff97c475c133a16c28ad3a281..d31dd06395c3b77557cd0b29570fa4ccb6137ee0 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
@@ -95,11 +95,11 @@ void wxCDMLibDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
          returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->lib->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMLibHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMLibHelpDialog.cpp
index 351406aa736dc101307c85fa59386ef9eeee2a08..e74d006c4228c982e398ab919e25f22d73e30dec 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibHelpDialog.cpp
@@ -92,12 +92,13 @@ void wxCDMLibHelpDialog::CreateControls()
           "Libraries contain the core classes of your project, these libraries should be used by black boxes and applications "
           "from this project to perform the main functions of the project. Functions implementing important tasks such as image "
           "processing algorithms or point cloud processing algorithms should be developed in the libraries of the project, while "
-          "the black boxes and applications serve as interfaces between the user or other platforms and the libraries functions.\n"
+          "the black boxes and applications serve as interfaces between the user or other platforms and the libraries' functions.\n"
           "\n"
           "In the library manager you can view a list of the available libraries in the current project, as well as create "
-          "new libraries. Remember that any library you make must be included in the lib's folder CMakeLists file. You can do that "
-          "by clicking on the \"Edit Lib's CMakeLists File\" button bellow or in the Library Manager the \"Edit CMakeLists file\" "
-          "button and include the desired libraries at the end of the file."),
+          "new libraries. Remember that any library you create must be included in the lib's folder CMakeLists file by using the "
+          "\"ADD_SUBDIRECTORY([libraryName])\" command. You can open this file by clicking on the \"Edit Lib's CMakeLists File\" "
+          "button below or in the Library Manager the \"Edit CMakeLists file\" button and include the desired libraries at the end "
+          "of the file."),
           wxDefaultPosition,
           wxDefaultSize,
           wxALIGN_LEFT

diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
index a892ad8a6dbb0eee3ce44916f34a9354712631aa..4892b64a8c6cc3f71ca9d8a269eee6cf71125268 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
@@ -97,11 +97,11 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
          returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->library->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMLibraryHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMLibraryHelpDialog.cpp
index 13a7038f1ec57b4b29fb8a74972afc7bd5ef7b3f..e027d60d9eecd5685a1e149e4f3278d0d3cb6479 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibraryHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibraryHelpDialog.cpp
@@ -103,8 +103,12 @@ void wxCDMLibraryHelpDialog::CreateControls()
           "functionalities of your project inside the created files.\n"
           "If you need to separate classes in folders you can do it by creating a folder with the \"Create Folder\" button.\n"
           "Then, in order to include your libraries in the project correctly you must include them in the lib's folder "
-          "\"CMakeLists.txt\" file. Also, if you create additional folders in your library you should include them in the library's "
-          "\"CMakeLists.txt\" file.\n"
+          "\"CMakeLists.txt\" file by using the \"ADD_SUBDIRECTORY([libraryName])\". Also, if you use third party libraries in your "
+          "library you must include them in the library's \"CMakeLists.txt\" file by uncommenting them in the "
+          "\"SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\" command; if you use custom libraries in your library you must also include them "
+          "in the library's \"CMakeLists.txt\" file by including them in the \"SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\" command. Or, "
+          "if you create additional folders in your library you must include them in the library's \"CMakeLists.txt\" file by using "
+          "the \"ADD_SUBDIRECTORY([folderName])\" command.\n"
           "\n"
           "You can easily edit the CMakeLists files previously mentioned by clicking on the following buttons."),
           wxDefaultPosition,

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 54b065d33e027704965c68f64210f97605593cd6..5aa7997b0b6314a14098558a9c3c5d5644c3efa8 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -894,7 +894,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
         //this->tree_Projects->Expand(this->model->GetProject()->GetId());
         //this->tree_Projects->Unselect();
         this->actualTreeItem.Unset();
-                 description = new wxCDMPackageManagerPanel(
+       description = new wxCDMPackageManagerPanel(
             this,
             this->model->GetProject(),
             ID_WINDOW_PROPERTIES,
@@ -919,7 +919,8 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
     else if(event.GetString() == wxT("blackbox"))
       {
         modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData();
-               this->actualTreeItem.Unset();
+        this->actualTreeItem.Unset();
+        this->tree_Projects->SelectItem(bb->GetHeaderFile()->GetId().GetWxId());
         description = new wxCDMBlackBoxDescriptionPanel(
             this,
             bb,
@@ -929,6 +930,7 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
             wxSize(600, 400),
             0
         );
+
                
       }
 

diff --git a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
index bed6dc5e8d878f3dabadafc453893d88c16f9a0f..e2e452c0ae82a126cf657d17c2bc697067d89ebe 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
@@ -105,11 +105,11 @@ void wxCDMPackageDescriptionPanel::CreateControls()
       returnLnk->SetWindowStyle(wxNO_BORDER);
          returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < (int)(parents.size())-1)
-        {
-          linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
-        }
+      linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
     }
+
+  linksSizer->Add(new wxStaticText(this, wxID_ANY, crea::std2wx(this->package->GetName())), 0, wxALIGN_CENTER, 0);
+
   sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
 
   //Header

diff --git a/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
index 07d653a839be08496ee58ae4bd61fe1f49ac42ad..83d7e1d4e428871f95e037491a3e9af2034d92b8 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
@@ -100,8 +100,12 @@ void wxCDMPackageHelpDialog::CreateControls()
           "If you want to check the files in the file explorer click the \"Open Package Folder\" "
           "button.\n"
           "\n"
-          "Don't forget to include the libraries your black boxes use in the Package directory CMakeLists.txt file\n"
-          "Also, make sure you include this package in the Project directory CMakeLists.txt file\n"
+          "Don't forget to include the libraries your black boxes use in the Package directory CMakeLists.txt file by "
+          "uncommenting the \"SET\" commands for third party libraries or by including the library name inside the "
+          "\"SET(${BBTK_PACKAGE_NAME}_LIBS\"command and its path inside the \"SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS\" "
+          "command for custom libraries.\n"
+          "Also, make sure you include this package in the Project directory's CMakeLists.txt file\n using the "
+          "ADD_SUBDIRECTORY([packageName]) command.\n"
           "You can open these files with the following buttons."),
           wxDefaultPosition,
           wxDefaultSize,

diff --git a/lib/creaDevManagerLib/wxCDMPackageManagerHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageManagerHelpDialog.cpp
index 6af683d1d26f4324859a5eb0f5dc272c6803cd22..24c4733ac0aee570b7359de1f972130b3e5cfb38 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageManagerHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageManagerHelpDialog.cpp
@@ -96,8 +96,7 @@ void wxCDMPackageManagerHelpDialog::CreateControls()
           "In the package manager you can view a list of the available packages in the current project, as well as create "
           "new packages. Remember that any package you make must be included in the CMakeLists file. You can do that by "
           "clicking on the \"Edit CMakeLists File\" button in the package manager section and include the desired packages "
-          "at the end of the file. You should also include in this file those libraries your black boxes located in this "
-          "package use."),
+          "at the end of the file using \"ADD_SUBDIRECTORY([packageName])\"."),
           wxDefaultPosition,
           wxDefaultSize,
           wxALIGN_LEFT

diff --git a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
index baf51a9065c012a58a232435df561d3a6ed463d6..9a3a0b5b9c4261d4252c997313cfda04cdbc91d4 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
@@ -97,11 +97,13 @@ void wxCDMProjectHelpDialog::CreateControls()
           "- Applications: Stand alone programs that use the functions available on your libraries.\n"
           "- Configuration file: Contains the information of what should or shouldn't be compiled from this project.\n"
           "\n"
+          "The Panel on the left is called \"Description Panel\" and show the details of the project item you are currently working on.\n"
           "To the right of the description panel you will find a tree with the project structure and it's actual content.\n"
-          "Bellow the description panel you will find a panel with the project's main actions when you're ready to compile "
-          "the project. you can hover on this buttons to see more information about what they do.\n"
+          "Below the description panel you will find a panel with the project's main actions when you're ready to compile "
+          "the project. you can hover on this buttons to see more information about what they do. They must be executed in the displayed "
+          "order.\n"
           "When you create a project it comes with a default package. If you need to work on it or if you want to create more "
-          "packages you can do it by clicking the \"Package Manager\" button bellow. You can also work with Libraries and "
+          "packages you can do it by clicking the \"Package Manager\" button below. You can also work with Libraries and "
           "Applications. Just click in the \"Library Manager\" button or \"Application manager\" button to start working "
           "with them.\n"),
           wxDefaultPosition,

diff --git a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.h b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.h
index 2e03c56ff071a499f9f0edaee8eb58cc808a0dd8..0087dd06946d6e6ba326a6560abde3cb80e2419b 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.h
+++ b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.h
@@ -64,7 +64,7 @@ public:
       wxWindowID id = wxID_ANY,
       const wxString& caption = wxT("Project Ready"),
       const wxPoint& position = wxDefaultPosition,
-      const wxSize& size = wxSize(350,700),
+      const wxSize& size = wxSize(350,730),
       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
   );
   /**
@@ -86,7 +86,7 @@ public:
       wxWindowID id = wxID_ANY,
       const wxString& caption = wxT("Project Ready"),
       const wxPoint& position = wxDefaultPosition,
-      const wxSize& size = wxSize(350,700),
+      const wxSize& size = wxSize(350,730),
       long style = wxDEFAULT_DIALOG_STYLE
   );