BEGIN_EVENT_TABLE(wxCDMPackageDescriptionPanel, wxPanel)
-EVT_BUTTON(ID_BUTTON_PREV, wxCDMPackageDescriptionPanel::OnBtnReturn)
+EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMPackageDescriptionPanel::OnBtnReturn)
EVT_BUTTON(ID_BUTTON_SET_AUTHOR, wxCDMPackageDescriptionPanel::OnBtnSetAuthor)
EVT_BUTTON(ID_BUTTON_SET_VERSION, wxCDMPackageDescriptionPanel::OnBtnSetVersion)
EVT_BUTTON(ID_BUTTON_SET_DESCRIPTION, wxCDMPackageDescriptionPanel::OnBtnSetDescription)
{
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- //Link to return
- wxButton* returnbt = new wxButton(this, ID_BUTTON_PREV, wxT("Return to project"));
- returnbt->SetToolTip(wxT("Return to the active project description."));
- sizer->Add(returnbt, 0, wxALIGN_CENTER | wxALL, 5);
-
- //Title
- sizer->Add(new wxStaticText(this, -1, _("Package")),0, wxALIGN_CENTER, 0);
-
- //Image
- sizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PkIcon64)),0, wxALIGN_CENTER, 0);
-
- //Package Name
- sizer->Add(new wxStaticText(this, -1, crea::std2wx(this->package->GetNamePackage())),0, wxALIGN_CENTER, 0);
+ //Links to return
+ wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
+ std::vector<modelCDMIProjectTreeNode*> parents = this->package->GetParents();
+ 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()), 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 < (int)(parents.size())-1)
+ {
+ linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
+ }
+ }
+ sizer->Add(linksSizer, 0, wxALIGN_CENTER | wxALL, 5);
+
+ //Header
+ wxBoxSizer* headerSizer = new wxBoxSizer(wxHORIZONTAL);
+ {
+ //Image
+ headerSizer->Add(new wxStaticBitmap(this, -1, wxBitmap(PkIcon64)),0, wxALIGN_CENTER, 0);
+ wxBoxSizer* textSizer = new wxBoxSizer(wxVERTICAL);
+ //Title
+ textSizer->Add(new wxStaticText(this, -1, _("Package")),0, wxALIGN_LEFT, 0);
+ //Package Name
+ textSizer->Add(new wxStaticText(this, -1, crea::std2wx(this->package->GetNamePackage())),0, wxALIGN_LEFT, 0);
+ headerSizer->Add(textSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+ }
+ sizer->Add(headerSizer, 0, wxALIGN_CENTER);
//Package Properties
wxStaticBoxSizer* propertiesBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("&Properties"));
std::vector<modelCDMBlackBox*> blackBoxes = this->package->GetSrc()->GetBlackBoxes();
- for (int i = 0; i < blackBoxes.size(); i++)
+ for (int i = 0; i < (int)(blackBoxes.size()); i++)
{
if(blackBoxes[i] != NULL)
{
- wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()));
+ wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+ pBBlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
std::string tt = "Author: " + blackBoxes[i]->GetAuthors() + "\nDescription: " + blackBoxes[i]->GetDescription() + "\nCategories: " + blackBoxes[i]->GetCategories();
pBBlk->SetToolTip(crea::std2wx(tt));
pBBlk->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnMouseEnter,NULL,this);
pBBlk->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnMouseExit,NULL,this);
- BBPanelSizer -> Add(pBBlk, 0, wxALIGN_LEFT | wxALL, 5);
+ BBPanelSizer -> Add(pBBlk, 0, wxEXPAND | wxALL, 5);
}
}
BBPanel->SetSizer(BBPanelSizer);
BBPanelSizer->Fit(BBPanel);
- BBBox->Add(BBPanel, 0, wxALL, 5);
-
+ BBBox->Add(BBPanel, 1, wxEXPAND | wxALL, 5);
sizer -> Add(BBBox, 0, wxEXPAND | wxALL, 10);
//Actions
wxStaticBoxSizer* actionsBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("&Actions"));
wxPanel* actionsPanel = new wxPanel(this);
wxBoxSizer* actionsPanelSizer = new wxBoxSizer(wxHORIZONTAL);
+ //actionsGrid Sizer
+ wxFlexGridSizer* actionsGridSizer = new wxFlexGridSizer(2, 2, 9, 15);
- wxButton* createBBbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_BLACKBOX, _T("Create Black Box"));
+ wxButton* createBBbt = new wxButton(actionsPanel, ID_BUTTON_CREATE_BLACKBOX, _T("A. Create Black Box"));
createBBbt->SetToolTip(wxT("Create a new black box for the active project inside this package."));
- actionsPanelSizer->Add(createBBbt, 0, wxALL, 5);
- wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("Edit CMakeLists File"));
+ actionsGridSizer->Add(createBBbt, 1, wxALL | wxEXPAND, 5);
+ wxButton* editCMakebt = new wxButton(actionsPanel, ID_BUTTON_EDIT_CMAKELISTSFILE, _T("B. Edit CMakeLists File"));
editCMakebt->SetToolTip(wxT("Open the system default text editor to edit the package's CMakeLists.txt file."));
editCMakebt->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnCMakeMouseEnter,NULL,this);
editCMakebt->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnCMakeMouseExit,NULL,this);
- actionsPanelSizer->Add(editCMakebt, 0, wxALL, 5);
- wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("Open Package Folder"));
+ actionsGridSizer->Add(editCMakebt, 1, wxALL | wxEXPAND, 5);
+ wxButton* openFolderbt = new wxButton(actionsPanel, ID_BUTTON_OPEN_FOLDER, _T("C. Open Package Folder"));
openFolderbt->SetToolTip(wxT("Open the package folder in the file explorer."));
- actionsPanelSizer->Add(openFolderbt, 0, wxALL, 5);
+ actionsGridSizer->Add(openFolderbt, 1, wxALL | wxEXPAND, 5);
+
+ actionsGridSizer->AddGrowableCol(0,1);
+ actionsGridSizer->AddGrowableCol(1,1);
+ actionsPanelSizer->Add(actionsGridSizer, 1, wxEXPAND, 0);
actionsPanel->SetSizer(actionsPanelSizer);
actionsPanelSizer->Fit(actionsPanel);
- actionsBox->Add(actionsPanel, 0, wxEXPAND);
+ actionsBox->Add(actionsPanel, 1, wxEXPAND);
sizer -> Add(actionsBox, 0, wxEXPAND | wxALL, 10);
//Assign sizer
if (((wxCDMMainFrame*)this->GetParent())->isHelp())
{
- std::vector<modelCDMCMakeListsFile*> files;
- wxCDMPackageHelpDialog* helpDialog = new wxCDMPackageHelpDialog(this->GetParent(), files, wxID_ANY);
+ wxCDMPackageHelpDialog* helpDialog = new wxCDMPackageHelpDialog(this->GetParent(), this->package, wxID_ANY);
helpDialog->Show(true);
}
}
-void wxCDMPackageDescriptionPanel::OnBtnReturn(wxCommandEvent& event)
+void wxCDMPackageDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
- newEvent->SetInt(((wxCDMMainFrame*)this->GetParent())->GetModel()->GetProject()->GetId());
- newEvent->SetId(0);
- wxPostEvent(this->GetParent(), *newEvent);
+ std::vector<modelCDMIProjectTreeNode*> parents = this->package->GetParents();
+ std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
+ //std::cout << parentURL << std::endl;
+ for (int i = 0; i < (int)(parents.size()); i++)
+ {
+ if (parents[i]->GetPath() == parentURL)
+ {
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
+ newEvent->SetClientData(parents[i]);
+ newEvent->SetId(0);
+ wxPostEvent(this->GetParent(), *newEvent);
+ }
+ }
}
void wxCDMPackageDescriptionPanel::OnBtnSetAuthor(wxCommandEvent& event)
void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
{
- int bbId = 0;
modelCDMBlackBox* bb;
std::vector<modelCDMBlackBox*> bbs = this->package->GetSrc()->GetBlackBoxes();
- for (int i = 0; i < bbs.size(); i++)
+ for (int i = 0; i < (int)(bbs.size()); i++)
{
if(bbs[i]->GetName() == crea::wx2std(event.GetURL()))
{
- bbId = bbs[i]->GetHeaderFile()->GetId();
bb = bbs[i];
break;
}
newEvent->SetString(wxT("blackbox"));
wxPostEvent(this->GetParent(), *newEvent);
- wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
- newEvent1->SetInt(bbId);
+ wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+ newEvent1->SetClientData(bb->GetHeaderFile());
newEvent1->SetId(0);
wxPostEvent(this->GetParent(), *newEvent1);
wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
newEvent->SetId(1);
- newEvent->SetInt(blackBox->GetId());
+ newEvent->SetClientData(blackBox);
newEvent->SetString(wxT("blackbox"));
newEvent->SetClientData(blackBox);
wxPostEvent(this->GetParent(), *newEvent);
if(!this->package->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->package->GetCMakeLists() != NULL)
{
- int CMId = this->package->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->package->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
void wxCDMPackageDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
- int bbId = 0;
+ modelCDMFile* bbHeader = NULL;
std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
- for (int i = 0; i < boxes.size(); i++)
+ for (int i = 0; i < (int)(boxes.size()); i++)
{
if(boxes[i]->GetName() == BBName)
{
- bbId = boxes[i]->GetHeaderFile()->GetId();
+ bbHeader = boxes[i]->GetHeaderFile();
break;
}
}
- newEvent->SetInt(bbId);
+ newEvent->SetClientData(bbHeader);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
event.Skip();
void wxCDMPackageDescriptionPanel::OnMouseExit(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
- int bbId = 0;
+ modelCDMFile* bbHeader = NULL;
std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
- for (int i = 0; i < boxes.size(); i++)
+ for (int i = 0; i < (int)(boxes.size()); i++)
{
if(boxes[i]->GetName() == BBName)
{
- bbId = boxes[i]->GetHeaderFile()->GetId();
+ bbHeader = boxes[i]->GetHeaderFile();
break;
}
}
- newEvent->SetInt(bbId);
+ newEvent->SetClientData(bbHeader);
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
event.Skip();
void wxCDMPackageDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
if(this->package->GetCMakeLists() != NULL)
{
- int CMId = this->package->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->package->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}
void wxCDMPackageDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
{
- wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+ wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
if(this->package->GetCMakeLists() != NULL)
{
- int CMId = this->package->GetCMakeLists()->GetId();
- newEvent->SetInt(CMId);
+ newEvent->SetClientData(this->package->GetCMakeLists());
newEvent->SetId(0);
wxPostEvent(this->GetParent(), *newEvent);
}