Merge remote-tracking branch 'refs/remotes/origin/master' into creaDevManagerCMake

diff --combined lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 3b64a1e182cf118705ab70ef5c3ce968a04ccf56,8aca7ba1dfdb015fbe91597379c3511582f90077..761a4f98c2028b5fb6c59d4974e1036c745b3788
--- 1/lib/creaDevManagerLib/wxCDMMainFrame.cpp
--- 2/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@@ -40,6 -40,7 +40,7 @@@
  #include "wx/statline.h"
  #include "wx/config.h"
  #include "CDMUtilities.h"
+ #include "images/CIcon64.xpm"
  
  #include "creaDevManagerIds.h"
  #include "wxCDMMainDescriptionPanel.h"
@@@ -63,14 -64,8 +64,14 @@@
  
  
  BEGIN_EVENT_TABLE(wxCDMMainFrame, wxFrame)
 +EVT_MENU_OPEN(wxCDMMainFrame::OnMenuBarOpen)
  EVT_MENU(ID_MENU_NEW_PROJECT, wxCDMMainFrame::OnMenuNewProject)
  EVT_MENU(ID_MENU_OPEN_PROJECT, wxCDMMainFrame::OnMenuOpenProject)
 +EVT_MENU(ID_MENU_OPEN_RECENT1, wxCDMMainFrame::OnMenuOpenRecent)
 +EVT_MENU(ID_MENU_OPEN_RECENT2, wxCDMMainFrame::OnMenuOpenRecent)
 +EVT_MENU(ID_MENU_OPEN_RECENT3, wxCDMMainFrame::OnMenuOpenRecent)
 +EVT_MENU(ID_MENU_OPEN_RECENT4, wxCDMMainFrame::OnMenuOpenRecent)
 +EVT_MENU(ID_MENU_OPEN_RECENT5, wxCDMMainFrame::OnMenuOpenRecent)
  EVT_MENU(ID_MENU_CLOSE_PROJECT, wxCDMMainFrame::OnMenuCloseProject)
  EVT_MENU(ID_MENU_EXPORT_HIERARCHY, wxCDMMainFrame::OnMenuExportHierarchy)
  EVT_MENU(ID_MENU_EXIT, wxCDMMainFrame::OnMenuExit)
@@@ -145,6 -140,7 +146,7 @@@ bool wxCDMMainFrame::Create
  
    CreateMenus();
    CreateControls();
+   SetIcon(wxIcon(CIcon64));
    return TRUE;
  }
  
@@@ -178,40 -174,10 +180,40 @@@ void wxCDMMainFrame::CreateMenus(
  {
    wxMenuBar* menuBar = new wxMenuBar;
  
 +  //Recently opened projects
 +  menu_Recent = new wxMenu();
 +  wxConfigBase* pConfig = wxConfigBase::Get();
 +  std::string rp = crea::wx2std(pConfig->Read(wxT("RECENT1"), wxT("")));
 +  if(rp != "")
 +    {
 +      menu_Recent->Append(ID_MENU_OPEN_RECENT1, crea::std2wx(rp));
 +      rp = crea::wx2std(pConfig->Read(wxT("RECENT2"), wxT("")));
 +      if(rp != "")
 +        {
 +          menu_Recent->Append(ID_MENU_OPEN_RECENT2, crea::std2wx(rp));
 +          rp = crea::wx2std(pConfig->Read(wxT("RECENT3"), wxT("")));
 +          if(rp != "")
 +            {
 +              menu_Recent->Append(ID_MENU_OPEN_RECENT3, crea::std2wx(rp));
 +              rp = crea::wx2std(pConfig->Read(wxT("RECENT4"), wxT("")));
 +              if(rp != "")
 +                {
 +                  menu_Recent->Append(ID_MENU_OPEN_RECENT4, crea::std2wx(rp));
 +                  rp = crea::wx2std(pConfig->Read(wxT("RECENT5"), wxT("")));
 +                  if(rp != "")
 +                    {
 +                      menu_Recent->Append(ID_MENU_OPEN_RECENT5, crea::std2wx(rp));
 +                    }
 +                }
 +            }
 +        }
 +    }
 +
    //FileMenu
    menu_File = new wxMenu();
    menu_File->Append(ID_MENU_NEW_PROJECT, wxT("&New Project..."));
    menu_File->Append(ID_MENU_OPEN_PROJECT, wxT("&Open Project..."));
 +  menu_File->AppendSubMenu(menu_Recent,wxT("Open &Recent"),wxT("Open a recently opened project."));
    menu_File->AppendSeparator();
    menu_File->Append(ID_MENU_CLOSE_PROJECT, wxT("&Close Project"));
    menu_File->AppendSeparator();
@@@ -282,7 -248,7 +284,7 @@@ void wxCDMMainFrame::CreateControls(
    );
  
    auiManager.AddPane(panel_Properties, wxAuiPaneInfo().BestSize(600,400).CenterPane().Name(wxT("panel_Properties")).Caption(wxT("")).CloseButton(false));
 -  auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Right().MinSize(300,300).BestSize(300,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false));
 +  auiManager.AddPane(tree_Projects, wxAuiPaneInfo().Left().MinSize(250,300).BestSize(250,400).CloseButton(false).Name(wxT("tree_Projects")).Caption(wxT("Project Tree")).CloseButton(false));
    auiManager.Update();
    //auiManager.LoadPerspective(pers,true);
    wxToolTip::Enable(true);
@@@ -290,43 -256,6 +292,43 @@@
  }
  
  //Event Handlers
 +
 +void wxCDMMainFrame::OnMenuBarOpen(wxMenuEvent& event)
 +{
 +  //clean recent menu
 +  int tam = menu_Recent->GetMenuItemCount();
 +  for (int i = 0; i < tam; ++i) {
 +    menu_Recent->Delete(menu_Recent->FindItemByPosition(0));
 +  }
 +  //populate recent menu
 +  wxConfigBase* pConfig = wxConfigBase::Get();
 +  std::string rp = crea::wx2std(pConfig->Read(wxT("RECENT1"), wxT("")));
 +  if(rp != "")
 +    {
 +      menu_Recent->Append(ID_MENU_OPEN_RECENT1, crea::std2wx(rp));
 +      rp = crea::wx2std(pConfig->Read(wxT("RECENT2"), wxT("")));
 +      if(rp != "")
 +        {
 +          menu_Recent->Append(ID_MENU_OPEN_RECENT2, crea::std2wx(rp));
 +          rp = crea::wx2std(pConfig->Read(wxT("RECENT3"), wxT("")));
 +          if(rp != "")
 +            {
 +              menu_Recent->Append(ID_MENU_OPEN_RECENT3, crea::std2wx(rp));
 +              rp = crea::wx2std(pConfig->Read(wxT("RECENT4"), wxT("")));
 +              if(rp != "")
 +                {
 +                  menu_Recent->Append(ID_MENU_OPEN_RECENT4, crea::std2wx(rp));
 +                  rp = crea::wx2std(pConfig->Read(wxT("RECENT5"), wxT("")));
 +                  if(rp != "")
 +                    {
 +                      menu_Recent->Append(ID_MENU_OPEN_RECENT5, crea::std2wx(rp));
 +                    }
 +                }
 +            }
 +        }
 +    }
 +}
 +
  //File menu
  void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
  {
@@@ -338,7 -267,7 +340,7 @@@
  
    if(userResponse == wxID_FORWARD)
      {
 -      //create project
 +      //close open project
        if(this->model->GetProject() != NULL)
          {
            if(!this->model->CloseProject(result))
@@@ -348,7 -277,6 +350,7 @@@
                event.Skip();
                return;
              }
 +
            if(this->panel_Properties != NULL)
              {
                auiManager.DetachPane(this->panel_Properties);
@@@ -362,7 -290,7 +364,7 @@@
  
          }
  
 -
 +      //create project
        if(!this->model->CreateProject(
            crea::wx2std(dialog->GetProjectName()),
            crea::wx2std(dialog->GetProjectLocation()),
@@@ -377,18 -305,6 +379,18 @@@
            return;
          }
        
 +      //update recently open projects
 +      wxConfigBase* pConfig = wxConfigBase::Get();
 +      if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath()))
 +        {
 +          pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT("")));
 +          pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT("")));
 +          pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT("")));
 +          pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT("")));
 +          pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath()));
 +        }
 +
 +
        //show project actions panel
        if(this->panel_ProjectActions != NULL)
          {
@@@ -418,104 -334,6 +420,104 @@@
          //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
      }
  }
 +void wxCDMMainFrame::OnMenuOpenRecent(wxCommandEvent& event)
 +{
 +  std::string* result;
 +
 +  //((wxMenuItem*)(event.GetEventObject()))->GetItemLabel();
 +
 +  std::string path = "";
 +  wxConfigBase* pConfig = wxConfigBase::Get();
 +  if(event.GetId() == ID_MENU_OPEN_RECENT1)
 +    path = crea::wx2std (pConfig->Read(wxT("RECENT1"),wxT("")));
 +  else if(event.GetId() == ID_MENU_OPEN_RECENT2)
 +    path = crea::wx2std (pConfig->Read(wxT("RECENT2"),wxT("")));
 +  else if(event.GetId() == ID_MENU_OPEN_RECENT3)
 +    path = crea::wx2std (pConfig->Read(wxT("RECENT3"),wxT("")));
 +  else if(event.GetId() == ID_MENU_OPEN_RECENT4)
 +    path = crea::wx2std (pConfig->Read(wxT("RECENT4"),wxT("")));
 +  else if(event.GetId() == ID_MENU_OPEN_RECENT5)
 +    path = crea::wx2std (pConfig->Read(wxT("RECENT5"),wxT("")));
 +
 +  std::cout << "Selection to open: " << path << std::endl;
 +  std::cout.flush();
 +
 +
 +  //populate model
 +  if(this->model->GetProject() != NULL)
 +    {
 +      std::cout << "Project not null, closing it" << std::endl;
 +      if(!this->model->CloseProject(result))
 +        {
 +          std::cout << "error closing project: " << *result << std::endl;
 +          wxMessageBox(crea::std2wx(result->c_str()),_T("New Project - Error!"),wxOK | wxICON_ERROR);
 +          event.Skip();
 +          return;
 +        }
 +
 +      if(this->panel_Properties != NULL)
 +        {
 +          auiManager.DetachPane(this->panel_Properties);
 +          this->panel_Properties->Hide();
 +        }
 +      if(this->panel_ProjectActions != NULL)
 +        {
 +          auiManager.DetachPane(this->panel_ProjectActions);
 +          this->panel_ProjectActions->Hide();
 +        }
 +    }
 +
 +  if (!this->model->OpenProject(path, result))
 +    {
 +      std::cout << "error opening project: " << *result << std::endl;
 +      wxMessageBox( crea::std2wx(result->c_str()), wxT("Open Project - Error"), wxICON_ERROR);
 +      event.Skip();
 +      return;
 +    };
 +
 +  //update recently open projects
 +  if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath()))
 +    {
 +      pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT("")));
 +      pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT("")));
 +      pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT("")));
 +      pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT("")));
 +      pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath()));
 +    }
 +
 +  std::cout << "building ui" << std::endl;
 +
 +  //populate tree control
 +  tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
 +  tree_Projects->Unselect();
 +  this->actualTreeItem.Unset();
 +      tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 +
 +
 +  //change project's actions panel
 +  if(this->panel_ProjectActions!= NULL)
 +    {
 +      auiManager.DetachPane(this->panel_ProjectActions);
 +      this->panel_ProjectActions->Destroy();
 +      this->panel_ProjectActions = NULL;
 +    }
 +  panel_ProjectActions = new wxCDMProjectActionsPanel(
 +      this,
 +      this->model->GetProject(),
 +      ID_WINDOW_PROJ_ACTIONS,
 +      wxT("Project Actions Panel"),
 +      wxDefaultPosition,
 +      wxSize(800,200),
 +      0
 +  );
 +  panel_ProjectActions->SetMinSize(wxSize(500, 100));
 +
 +
 +  auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false));
 +
 +  auiManager.Update();
 +
 +}
  void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
  {
    std::string* result;
@@@ -543,7 -361,6 +545,7 @@@
                event.Skip();
                return;
              }
 +
            if(this->panel_Properties != NULL)
              {
                auiManager.DetachPane(this->panel_Properties);
@@@ -564,17 -381,6 +566,17 @@@
            return;
          };
  
 +      //update recently open projects
 +      wxConfigBase* pConfig = wxConfigBase::Get();
 +      if(pConfig->Read(wxT("RECENT1"),wxT("")) != crea::std2wx(this->model->GetProject()->GetPath()))
 +        {
 +          pConfig->Write(wxT("RECENT5"), pConfig->Read(wxT("RECENT4"),wxT("")));
 +          pConfig->Write(wxT("RECENT4"), pConfig->Read(wxT("RECENT3"),wxT("")));
 +          pConfig->Write(wxT("RECENT3"), pConfig->Read(wxT("RECENT2"),wxT("")));
 +          pConfig->Write(wxT("RECENT2"), pConfig->Read(wxT("RECENT1"),wxT("")));
 +          pConfig->Write(wxT("RECENT1"), crea::std2wx(this->model->GetProject()->GetPath()));
 +        }
 +
        std::cout << "building ui" << std::endl;
  
        //populate tree control