//Links to return
wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
- for (int i = 0; i < parents.size(); i++)
+ for (int i = 0; i < (int)(parents.size()); i++)
{
- wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
+ wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+ 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 < parents.size()-1)
+ if (i < (int)(parents.size())-1)
{
linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
}
wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
- for (int i = 0; i < applications.size(); i++)
+ for (int i = 0; i < (int)(applications.size()); i++)
{
- wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()));
- pApplicationlk->SetWindowStyle(wxALIGN_LEFT);
+ wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+ pApplicationlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
std::string tt = "Name: " + applications[i]->GetName() + "\n";
tt += "Location: " + applications[i]->GetPath();
pApplicationlk->SetToolTip(crea::std2wx(tt.c_str()));
void wxCDMAppliDescriptionPanel::OnBtnCreateApplication(wxCommandEvent& event)
{
//get name
- wxString applicationName = wxGetTextFromUser(
- _T("Enter the new application name"),
- _T("New Application - creaDevManager"),
- _T("")
- );
- //check name
- if(applicationName.Len() > 0)
- {
- std::string* result;
- //create library
- modelCDMIProjectTreeNode* application = this->appli->CreateApplication(crea::wx2std(applicationName),result);
- //check library created
- if(application == NULL)
- {
- wxMessageBox(crea::std2wx(*result),_T("New Application - Error!"),wxOK | wxICON_ERROR);
- event.Skip();
- return;
- }
- wxMessageBox(crea::std2wx("Application successfully created."),_T("New Application - Success!"),wxOK | wxICON_INFORMATION);
-
- //refreshing tree and description
- //send event instead of calling parent to avoid crashing
-
- ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
-
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
- newEvent->SetInt(application->GetId());
- wxPostEvent(this->GetParent(), *newEvent);
- event.Skip();
- }
+ wxTextEntryDialog* appDlg = new wxTextEntryDialog(
+ this,
+ wxT("Enter the new application name (NO white spaces)"),
+ wxT("New Application - creaDevManager"),
+ wxT(""),
+ wxOK | wxCANCEL
+ );
+
+ if (appDlg->ShowModal() == wxID_OK)
+ {
+ std::string applicationName = crea::wx2std(appDlg->GetValue());
+ //check name
+ if(applicationName.size() > 0)
+ {
+ wxArrayString types;
+ types.Add(wxT("Console Application"));
+ types.Add(wxT("GUI Application (wxWidgets)"));
+ int applicationType = wxGetSingleChoiceIndex(
+ wxT("Select the application type"),
+ wxT("New Application - creaDevManager"),
+ types
+ );
+
+ if (applicationType != -1)
+ {
+ std::string* result;
+ //create library
+ modelCDMIProjectTreeNode* application = this->appli->CreateApplication(applicationName, applicationType ,result);
+ //check library created
+ if(application == NULL)
+ {
+ wxMessageBox(crea::std2wx(*result),_T("New Application - Error!"),wxOK | wxICON_ERROR);
+ event.Skip();
+ return;
+ }
+ wxMessageBox(crea::std2wx("Application successfully created."),_T("New Application - Success!"),wxOK | wxICON_INFORMATION);
+
+ //refreshing tree and description
+ //send event instead of calling parent to avoid crashing
+
+ ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
+
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
+ newEvent->SetClientData(application);
+ wxPostEvent(this->GetParent(), *newEvent);
+ event.Skip();
+ }
+ }
+ else
+ {
+ wxMessageBox(crea::std2wx("Invalid application name, please try again with a valid name."),_T("New Application - Error!"),wxOK | wxICON_INFORMATION);
+ }
+ }
}
void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
if(!this->appli->OpenCMakeListsFile(result))
wxMessageBox(crea::std2wx(*result),_T("Open CMakeLists File - Error!"),wxOK | wxICON_ERROR);
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
if(this->appli->GetCMakeLists() != NULL)
{
- int CMId = this->appli->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->appli->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
void wxCDMAppliDescriptionPanel::OnLnkApplicationSelect(wxHyperlinkEvent& event)
{
- int applicationId = 0;
+ modelCDMApplication* applicationFound = NULL;
std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
- for (int i = 0; i < applications.size(); i++)
+ for (int i = 0; i < (int)(applications.size()); i++)
{
if(applications[i]->GetName() == crea::wx2std(event.GetURL()))
{
- applicationId = applications[i]->GetId();
+ applicationFound = applications[i];
break;
}
}
- wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
- newEvent1->SetInt(applicationId);
+ wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+ newEvent1->SetClientData(applicationFound);
newEvent1->SetId(0);
wxPostEvent(this->GetParent(), *newEvent1);
wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
- newEvent->SetInt(applicationId);
+ newEvent->SetClientData(applicationFound);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
//std::cout << parentURL << std::endl;
- for (int i = 0; i < parents.size(); i++)
+ for (int i = 0; i < (int)(parents.size()); i++)
{
if (parents[i]->GetPath() == parentURL)
{
wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
- newEvent->SetInt(parents[i]->GetId());
+ newEvent->SetClientData(parents[i]);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
- int appId = 0;
+ modelCDMApplication* theApp = NULL;
std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
- for (int i = 0; i < applications.size(); i++)
+ for (int i = 0; i < (int)(applications.size()); i++)
{
if(applications[i]->GetName() == AppName)
{
- appId = applications[i]->GetId();
+ theApp = applications[i];
break;
}
}
- newEvent->SetInt(appId);
+ newEvent->SetClientData(theApp);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
event.Skip();
void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
- int appId = 0;
+ modelCDMApplication* theApp = NULL;
std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
- for (int i = 0; i < applications.size(); i++)
+ for (int i = 0; i < (int)(applications.size()); i++)
{
if(applications[i]->GetName() == AppName)
{
- appId = applications[i]->GetId();
+ theApp = applications[i];
break;
}
}
- newEvent->SetInt(appId);
+ newEvent->SetClientData(theApp);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
event.Skip();
void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
if(this->appli->GetCMakeLists() != NULL)
{
- int CMId = this->appli->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->appli->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
void wxCDMAppliDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
if(this->appli->GetCMakeLists() != NULL)
{
- int CMId = this->appli->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->appli->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
git://git.creatis.insa-lyon.fr / crea.git / blobdiff