wxPanel::Create(parent, id, pos, size, style);
this->library = library;
CreateControls();
wxPanel::Create(parent, id, pos, size, style);
this->library = library;
CreateControls();
- includesPanelSizer->Add(Title1, 0, wxEXPAND | wxALL, 5);
+ includesPanelSizer->Add(Title1, 0, wxEXPAND);
wxCheckBox* ChBIncl = new wxCheckBox(
includesPanel, ID_CHECK_INCLUDE_3RDLIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
);
wxCheckBox* ChBIncl = new wxCheckBox(
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 library including the following instruction\n"
+ "in the library's folder CMakeLists.txt file:\n"
+ "SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\n"
+ " ${" + it->first+ "_LIBRARIES}\n"
+ ")"));
ChBIncl->SetName(crea::std2wx(it->first));
ChBIncl->SetValue(it->second);
includesGridSizer->Add(ChBIncl, 1, wxEXPAND);
ChBIncl->SetName(crea::std2wx(it->first));
ChBIncl->SetValue(it->second);
includesGridSizer->Add(ChBIncl, 1, wxEXPAND);
- 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);
//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);
wxCheckBox* ChBIncl = new wxCheckBox(
includesPanel, ID_CHECK_INCLUDE_LIBRARY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT
);
wxCheckBox* ChBIncl = new wxCheckBox(
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 library including the following code in the\n"
+ "library's CMakeLists.txt file:\n"
+ "INCLUDE_DIRECTORIES (\n"
+ " ../"+ it->first + "\n"
+ ")\n"
+ "SET ( ${LIBRARY_NAME}_LINK_LIBRARIES\n"
+ " " + it->first+ "\n"
+ ")"));
ChBIncl->SetName(crea::std2wx(it->first));
ChBIncl->SetValue(it->second);
includesLibGridSizer->Add(ChBIncl, 1, wxEXPAND);
ChBIncl->SetName(crea::std2wx(it->first));
ChBIncl->SetValue(it->second);
includesLibGridSizer->Add(ChBIncl, 1, wxEXPAND);
- includesPanelSizer->Add(includesLibGridSizer, 1, wxEXPAND, 0);
+ includesPanelSizer->Add(includesLibGridSizer, 0, wxEXPAND | wxLEFT, 5);
includesBox->Add(includesPanel, 1, wxEXPAND);
sizer -> Add(includesBox, 0, wxALL | wxEXPAND, 10);
includesBox->Add(includesPanel, 1, wxEXPAND);
sizer -> Add(includesBox, 0, wxALL | wxEXPAND, 10);
wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("B. Open Library Folder"));
openFolderbt->SetToolTip(wxT("Open the library folder in the file explorer."));
actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5);
wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("B. Open Library Folder"));
openFolderbt->SetToolTip(wxT("Open the library folder in the file explorer."));
actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5);
- 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 of this library in the default text editor."));
editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseEnter,NULL,this);
editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseExit,NULL,this);
actionsGridSizer->Add(editCMakebt, 1, wxALL | wxEXPAND, 5);
editCMakebt->SetToolTip(wxT("Edit the CMakeLists.txt of this library in the default text editor."));
editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseEnter,NULL,this);
editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMLibraryDescriptionPanel::OnCMakeMouseExit,NULL,this);
actionsGridSizer->Add(editCMakebt, 1, wxALL | wxEXPAND, 5);
- 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 for this library."));
actionsGridSizer->Add(createFolderbt, 1, wxALL | wxEXPAND, 5);
createFolderbt->SetToolTip(wxT("Create a new folder for this library."));
actionsGridSizer->Add(createFolderbt, 1, wxALL | wxEXPAND, 5);
- this->library->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue());
+ if(this->library->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());
- this->library->SetCustomLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue());
+ if(this->library->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());