X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=ad37e22c023a6bc3f12de9fd1ab7163100d14836;hb=f4451b0dfa9bfa593ada3e9462570b6ca250f0d7;hp=07ea08094331cedf025105631a6c5643ff2327ff;hpb=43a86caa77956a7638494a69499c17cff2b79538;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 07ea080..ad37e22 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -31,9 +31,12 @@
 #include <iostream>
 
 #include <creaWx.h>
+#include "creaSystem.h"
 #include "wx/treectrl.h"
 #include "wx/treebase.h"
 #include "wx/tooltip.h"
+#include "wx/wxhtml.h"
+#include "wx/statline.h"
 #include "CDMUtilities.h"
 
 #include "creaDevManagerIds.h"
@@ -53,25 +56,15 @@
 #include "wxCDMProjectActionsPanel.h"
 #include "wxCDMNewProjectDialog.h"
 
-#include "wxCDMProjectHelpDialog.h"
 
 
 BEGIN_EVENT_TABLE(wxCDMMainFrame, wxFrame)
 EVT_MENU(ID_MENU_NEW_PROJECT, wxCDMMainFrame::OnMenuNewProject)
 EVT_MENU(ID_MENU_OPEN_PROJECT, wxCDMMainFrame::OnMenuOpenProject)
-EVT_MENU(ID_MENU_OPEN_RECENT, wxCDMMainFrame::OnMenuOpenRecent)
 EVT_MENU(ID_MENU_CLOSE_PROJECT, wxCDMMainFrame::OnMenuCloseProject)
-EVT_MENU(ID_MENU_CLOSE_ALL_PROJECTS, wxCDMMainFrame::OnMenuCloseAllProjects)
 EVT_MENU(ID_MENU_EXPORT_HIERARCHY, wxCDMMainFrame::OnMenuExportHierarchy)
 EVT_MENU(ID_MENU_EXIT, wxCDMMainFrame::OnMenuExit)
 EVT_MENU(ID_MENU_REFRESH_PROJECT, wxCDMMainFrame::OnMenuRefreshProject)
-EVT_MENU(ID_MENU_CUT, wxCDMMainFrame::OnMenuMenuCut)
-EVT_MENU(ID_MENU_COPY, wxCDMMainFrame::OnMenuMenuCopy)
-EVT_MENU(ID_MENU_PASTE, wxCDMMainFrame::OnMenuMenuPaste)
-EVT_MENU(ID_MENU_DELETE, wxCDMMainFrame::OnMenuMenuDelete)
-EVT_MENU(ID_MENU_SELECT_ALL, wxCDMMainFrame::OnMenuSelectAll)
-EVT_MENU(ID_MENU_SELECT_NONE, wxCDMMainFrame::OnMenuSelectNone)
-EVT_MENU(ID_MENU_EVENT_LOG, wxCDMMainFrame::OnMenuEventLog)
 EVT_MENU(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxCDMMainFrame::OnMenuBBTKGraphicalEditor)
 EVT_MENU(ID_MENU_MINITOOLS, wxCDMMainFrame::OnMenuMiniTools)
 EVT_MENU(ID_MENU_CODE_EDITOR, wxCDMMainFrame::OnMenuCodeEditor)
@@ -81,12 +74,17 @@ EVT_MENU(ID_MENU_HELP, wxCDMMainFrame::OnMenuHelp)
 EVT_MENU(ID_MENU_REPORT_BUG, wxCDMMainFrame::OnMenuReportBug)
 EVT_MENU(ID_MENU_ABOUT_CREADEVMANAGER, wxCDMMainFrame::OnMenuAboutCreaDevManager)
 EVT_MENU(ID_MENU_ABOUT_CREATIS, wxCDMMainFrame::OnMenuAboutCreatis)
+
 EVT_BUTTON(ID_BUTTON_NEWPROJECT, wxCDMMainFrame::OnMenuNewProject)
 EVT_BUTTON(ID_BUTTON_OPENPROJECT, wxCDMMainFrame::OnMenuOpenProject)
+
 EVT_TREE_SEL_CHANGED(ID_TREE_PROJECTS, wxCDMMainFrame::OnTreeSelectionChanged)
-EVT_COMMAND(wxID_ANY, wxEVT_DISPLAY_CHANGED, wxCDMMainFrame::OnCreationComplete)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxCDMMainFrame::OnElementSelected)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxCDMMainFrame::OnElementDeselected)
+
+EVT_COMMAND(wxID_ANY, wxEVT_DISPLAY_CHANGED, wxCDMMainFrame::OnChangeView)
+EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCDMMainFrame::OnElementSelected)
+EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCDMMainFrame::OnElementDeselected)
+
+
 EVT_CHECKBOX(ID_CHECKBOX_DISABLE_HELP, wxCDMMainFrame::OnDisableHelp)
 END_EVENT_TABLE()
 
@@ -99,6 +97,13 @@ wxCDMMainFrame::wxCDMMainFrame(
     long style
 )
 {
+  this->menu_File = NULL;
+  this->menu_Edit = NULL;
+  this->menu_Tools = NULL;
+  this->menu_Help = NULL;
+  this->panel_Properties = NULL;
+  this->panel_ProjectActions = NULL;
+  this->tree_Projects = NULL;
   Create(parent, id, caption, pos, size, style);
 }
 
@@ -129,6 +134,16 @@ modelCDMMain* wxCDMMainFrame::GetModel() const
   return this->model;
 }
 
+wxPanel* wxCDMMainFrame::GetPropertiesPanel() const
+{
+  return this->panel_Properties;
+}
+
+bool wxCDMMainFrame::isHelp() const
+{
+  return this->help;
+}
+
 void wxCDMMainFrame::RefreshProject()
 {
   std::string* result;
@@ -146,10 +161,8 @@ void wxCDMMainFrame::CreateMenus()
   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->Append(ID_MENU_OPEN_RECENT, wxT("Open &Recent"));
   menu_File->AppendSeparator();
   menu_File->Append(ID_MENU_CLOSE_PROJECT, wxT("&Close Project"));
-  menu_File->Append(ID_MENU_CLOSE_ALL_PROJECTS, wxT("C&lose All Projects"));
   menu_File->AppendSeparator();
   menu_File->Append(ID_MENU_EXPORT_HIERARCHY, wxT("&Export Project Hierarchy..."));
   menu_File->AppendSeparator();
@@ -160,20 +173,11 @@ void wxCDMMainFrame::CreateMenus()
   //EditMenu
   menu_Edit = new wxMenu();
   menu_Edit->Append(ID_MENU_REFRESH_PROJECT, wxT("&Refresh Project"));
-  menu_Edit->AppendSeparator();
-  menu_Edit->Append(ID_MENU_CUT, wxT("Cu&t"));
-  menu_Edit->Append(ID_MENU_COPY, wxT("&Copy"));
-  menu_Edit->Append(ID_MENU_PASTE, wxT("&Paste"));
-  menu_Edit->AppendSeparator();
-  menu_Edit->Append(ID_MENU_DELETE, wxT("&Delete"));
-  menu_Edit->Append(ID_MENU_SELECT_ALL, wxT("Select &All"));
-  menu_Edit->Append(ID_MENU_SELECT_NONE, wxT("Ca&ncel Selection"));
 
   menuBar->Append(menu_Edit, wxT("&Edit"));
 
   //ToolsMenu
   menu_Tools = new wxMenu();
-  menu_Tools->Append(ID_MENU_EVENT_LOG, wxT("Event &Log"));
   menu_Tools->Append(ID_MENU_BBTK_GRAPHICAL_EDITOR, wxT("BBTK &Graphical Editor"));
   menu_Tools->Append(ID_MENU_MINITOOLS, wxT("&MiniTools"));
   menu_Tools->Append(ID_MENU_CODE_EDITOR, wxT("&Code Editor"));
@@ -212,7 +216,7 @@ void wxCDMMainFrame::CreateControls()
       ID_TREE_PROJECTS,
       wxDefaultPosition,
       wxSize(200,400),
-      wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
+	  wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
   );
 
   panel_Properties = new wxCDMMainDescriptionPanel(
@@ -224,19 +228,10 @@ void wxCDMMainFrame::CreateControls()
       0
   );
 
-
-
-
-
-
-
   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));
-
-  wxString pers = auiManager.SavePerspective();
-
   auiManager.Update();
-  auiManager.LoadPerspective(pers,true);
+  //auiManager.LoadPerspective(pers,true);
   wxToolTip::Enable(true);
   wxToolTip::SetDelay(0);
 }
@@ -265,6 +260,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
             }
         }
 
+
       if(!this->model->CreateProject(
           crea::wx2std(dialog->GetProjectName()),
           crea::wx2std(dialog->GetProjectLocation()),
@@ -281,8 +277,8 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
 
       //populate tree control
       tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+      tree_Projects->Unselect();
+      tree_Projects->SelectItem(this->model->GetProject()->GetId());
 
 
       //show project actions panel
@@ -354,13 +350,13 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 
       std::cout << "building ui" << std::endl;
 
-
       //populate tree control
       tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
+      tree_Projects->Unselect();
       tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
 
 
+
       //change project's actions panel
       if(this->panel_ProjectActions!= NULL)
         {
@@ -384,16 +380,11 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 
       auiManager.Update();
 
-
     }
 
   event.Skip();
 }
-void wxCDMMainFrame::OnMenuOpenRecent(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuOpenRecent not implemented" << std::endl;
-  event.Skip();
-}
+
 void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
 {
   std::cout << "closing project" << std::endl;
@@ -433,44 +424,7 @@ void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
   auiManager.Update();
   event.Skip();
 }
-void wxCDMMainFrame::OnMenuCloseAllProjects(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuCloseAllProjects closing only one project" << std::endl;
-  std::string* result;
-  if(!this->model->CloseProject(result))
-    {
-      std::cout << "error closing project: " << *result << std::endl;
-      wxMessageBox( crea::std2wx(result->c_str()), wxT("Close Project - Error"), wxICON_ERROR);
-    }
-  tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-
-  if(this->panel_Properties != NULL)
-    {
-      auiManager.DetachPane(this->panel_Properties);
-      this->panel_Properties->Destroy();
-      this->panel_Properties = NULL;
-    }
-  if(this->panel_ProjectActions != NULL)
-    {
-      auiManager.DetachPane(this->panel_ProjectActions);
-      this->panel_ProjectActions->Destroy();
-      this->panel_ProjectActions = NULL;
-    }
 
-  this->panel_Properties = new wxCDMMainDescriptionPanel(
-      this,
-      ID_WINDOW_PROPERTIES,
-      wxT("Description Panel"),
-      wxDefaultPosition,
-      wxSize(600, 400),
-      0
-  );
-
-  auiManager.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400));
-
-  auiManager.Update();
-  event.Skip();
-}
 void wxCDMMainFrame::OnMenuExportHierarchy(wxCommandEvent& event)
 {
   std::cerr << "Event OnMenuExportHierarchy not implemented" << std::endl;
@@ -483,9 +437,7 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
   if(this->model->GetProject() != NULL && !this->model->CloseProject(result))
     {
       std::cout << "error closing project: " << *result << std::endl;
-      wxMessageBox( crea::std2wx(result->c_str()), wxT("Close Project - Error"), wxICON_ERROR);
     }
-  tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
 
   if(this->panel_Properties != NULL)
     {
@@ -493,6 +445,13 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
       this->panel_Properties->Destroy();
       this->panel_Properties = NULL;
     }
+  
+  if(this->tree_Projects != NULL)
+    {
+      auiManager.DetachPane(this->tree_Projects);
+      this->tree_Projects->Destroy();
+      this->tree_Projects = NULL;
+    }
 
   if(this->panel_ProjectActions != NULL)
     {
@@ -500,9 +459,8 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
       this->panel_ProjectActions->Destroy();
       this->panel_ProjectActions = NULL;
     }
-
+  
   Close();
-  event.Skip();
 }
 
 //Edit Menu
@@ -513,53 +471,17 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event)
     {
       wxMessageBox( crea::std2wx(result->c_str()), wxT("Refresh Project - Error"), wxICON_ERROR);
     }
-  this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-
-  this->auiManager.Update();
-
-  this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-  this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+  if(this->model->GetProject() != NULL)
+    {
+      this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+      this->auiManager.Update();
 
-  //TODO: Show possible problems in CMakeLists files
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuMenuCut(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuMenuCut not implemented" << std::endl;
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuMenuCopy(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuMenuCopy not implemented" << std::endl;
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuMenuPaste(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuMenuPaste not implemented" << std::endl;
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuMenuDelete(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuMenuDelete not implemented" << std::endl;
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuSelectAll(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuSelectAll not implemented" << std::endl;
-  event.Skip();
-}
-void wxCDMMainFrame::OnMenuSelectNone(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuSelectNone not implemented" << std::endl;
+      this->tree_Projects->Unselect();
+      this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+    }
   event.Skip();
 }
 
-//Tools Menu
-void wxCDMMainFrame::OnMenuEventLog(wxCommandEvent& event)
-{
-  std::cerr << "Event OnMenuEventLog not implemented" << std::endl;
-  event.Skip();
-}
 void wxCDMMainFrame::OnMenuBBTKGraphicalEditor(wxCommandEvent& event)
 {
   std::cerr << "Event OnMenuBBTKGraphicalEditor not implemented" << std::endl;
@@ -594,23 +516,80 @@ void wxCDMMainFrame::OnMenuCommandLine(wxCommandEvent& event)
 //Help Menu
 void wxCDMMainFrame::OnMenuHelp(wxCommandEvent& event)
 {
-  std::cerr << "Event OnMenuHelp not implemented" << std::endl;
-  event.Skip();
+  wxLaunchDefaultBrowser(_T("http://www.creatis.insa-lyon.fr/site/en/CreatoolsDocumentation"), 0);
 }
 void wxCDMMainFrame::OnMenuReportBug(wxCommandEvent& event)
 {
-  std::cerr << "Event OnMenuReportBug not implemented" << std::endl;
-  event.Skip();
+  wxLaunchDefaultBrowser(_T("http://vip.creatis.insa-lyon.fr:9002/projects/crea"), 0);
 }
 void wxCDMMainFrame::OnMenuAboutCreaDevManager(wxCommandEvent& event)
 {
-  std::cerr << "Event OnMenuAboutCreaDevManager not implemented" << std::endl;
-  event.Skip();
+  wxBoxSizer *topsizer;
+  wxHtmlWindow *html;
+  wxDialog dlg(this, wxID_ANY, wxString(_("About")));
+
+  topsizer = new wxBoxSizer(wxVERTICAL);
+
+  html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
+  html -> SetBorders(0);
+
+  std::string content = ""
+      "<html>"
+      "<body bgcolor=\"#3333CC\">"
+      "<table cellspacing=3 cellpadding=4 width=\"100%\">"
+      "  <tr>"
+      "    <td bgcolor=\"#3333CC\">"
+      "    <center>"
+      "    <font size=+2 color=\"#FFFFFF\"><b>CREA Development Manager</b>"
+      "    </font>"
+      "    </center>"
+      "    </td>"
+      "  </tr>"
+      "  <tr>"
+      "    <td bgcolor=\"#FFFFFF\">"
+      "    <p><b><font size=+1>Creatis 2012 - Lyon, France</font></b></p>"
+      "    <font size=-1>"
+      "      <table cellpadding=0 cellspacing=0 width=\"100%\">"
+      "        <tr>"
+      "          <td width=\"65%\">"
+      "            <p>Created by Daniel Gonz&aacute;lez - daniel.gonzalez@creatis.insa-lyon.fr</p>"
+      "          </td>"
+      "        </tr>"
+      "      </table>"
+      "      <font size=1>"
+      "        <p>This software is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software.</p>"
+      "      </font>"
+      "    </font>"
+      "    </td>"
+      "  </tr>"
+      "</table>"
+      "</body>"
+      "</html>"
+      ;
+
+  html -> SetPage(crea::std2wx(content));
+  html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(),
+      html -> GetInternalRepresentation() -> GetHeight());
+
+  topsizer -> Add(html, 1, wxALL, 10);
+
+#if wxUSE_STATLINE
+  topsizer -> Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+#endif // wxUSE_STATLINE
+
+  wxButton *bu1 = new wxButton(&dlg, wxID_OK, _("OK"));
+  bu1 -> SetDefault();
+
+  topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
+
+  dlg.SetSizer(topsizer);
+  topsizer -> Fit(&dlg);
+
+  dlg.ShowModal();
 }
 void wxCDMMainFrame::OnMenuAboutCreatis(wxCommandEvent& event)
 {
-  std::cerr << "Event OnMenuAboutCreatis not implemented" << std::endl;
-  event.Skip();
+  wxLaunchDefaultBrowser(_T("http://www.creatis.insa-lyon.fr/site/en"), 0);
 }
 
 void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
@@ -623,13 +602,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
       std::cout << "Tree Selection id: " << elementId << std::endl;
       //get element from model
       modelCDMIProjectTreeNode* element = this->model->GetModelElements()[elementId];
+	  if (element == NULL)
+		  return;
       std::cout << "Tree Selection: " << element->GetName() << std::endl;
-
+		
       //TODO get element type
       //project
       modelCDMProject* elementProject = dynamic_cast<modelCDMProject*>(element);
       wxPanel* description;
-      wxDialog* helpDialog = NULL;
       if(elementProject != NULL)
         {
           //create element description
@@ -643,10 +623,6 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
               0
           );
 
-          if(this->help)
-            {
-              helpDialog = new wxCDMProjectHelpDialog(this, wxID_ANY);
-            }
         }
       else
         {
@@ -664,6 +640,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                   wxSize(600, 400),
                   0
               );
+
             }
           else
             {
@@ -825,27 +802,18 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
             }
         }
 
-      if(this->panel_Properties!= NULL)
-        this->panel_Properties->Hide();
-
-      auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
-      auiManager.Update();
-
       //delete old view
       if(this->panel_Properties!= NULL)
         {
+          this->panel_Properties->Hide();
           auiManager.DetachPane(this->panel_Properties);
           this->panel_Properties->Destroy();
           this->panel_Properties = NULL;
         }
       //set new view
-
+      auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
       this->panel_Properties = description;
-      if(this->help && helpDialog != NULL)
-        {
-          helpDialog->Show(true);
-        }
-      //auiManager.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("Properties")).BestSize(600,400).CloseButton(false));
+
       auiManager.Update();
       event.Skip();
     }
@@ -854,21 +822,24 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
 }
 
-void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
+void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
 {
-  switch(event.GetId() != 0)
+  modelCDMIProjectTreeNode* myItem = NULL;
+  switch(event.GetId())
   {
   case 0:
+    myItem = ((modelCDMIProjectTreeNode*)event.GetClientData());
     //select out old one to generate selection event
-    this->tree_Projects->SelectItem(event.GetInt(), true);
-    this->tree_Projects->Expand(event.GetInt());
+    this->tree_Projects->Unselect();
+    this->tree_Projects->SelectItem(myItem->GetId(), true);
+    this->tree_Projects->Expand(myItem->GetId());
     break;
   case 1:
     wxPanel* description = NULL;
     if(event.GetString() == wxT("manage_packages"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-        this->tree_Projects->Expand(this->model->GetProject()->GetId());
+        //this->tree_Projects->Expand(this->model->GetProject()->GetId());
+        //this->tree_Projects->Unselect();
         description = new wxCDMPackageManagerPanel(
             this,
             this->model->GetProject(),
@@ -893,7 +864,6 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
       }
     else if(event.GetString() == wxT("blackbox"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
         modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData();
         description = new wxCDMBlackBoxDescriptionPanel(
             this,
@@ -906,23 +876,19 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
         );
       }
 
-    if(this->panel_Properties!= NULL)
-      this->panel_Properties->Hide();
-
-    auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
-    auiManager.Update();
-
     //delete old view
     if(this->panel_Properties!= NULL)
       {
+        this->panel_Properties->Hide();
         auiManager.DetachPane(this->panel_Properties);
         this->panel_Properties->Destroy();
         this->panel_Properties = NULL;
       }
     //set new view
-
+    auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
     this->panel_Properties = description;
     auiManager.Update();
+
     break;
   }
   event.Skip();
@@ -931,17 +897,21 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
 void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
 {
   //std::cout << "element " << event.GetInt() << std::endl;
-  this->tree_Projects->EnsureVisible(event.GetInt());
-  this->tree_Projects->SetItemBold(event.GetInt(), true);
-  this->tree_Projects->SetItemTextColour(event.GetInt(), wxColour(0,0,255));
+  modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
+  this->tree_Projects->EnsureVisible(item->GetId());
+  this->tree_Projects->SetItemBold(item->GetId(), true);
+  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,255));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(230,230,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }
 
 void wxCDMMainFrame::OnElementDeselected(wxCommandEvent& event)
 {
-  this->tree_Projects->SetItemBold(event.GetInt(), false);
-  this->tree_Projects->SetItemTextColour(event.GetInt(), wxColour(0,0,0));
+  modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
+  this->tree_Projects->SetItemBold(item->GetId(), false);
+  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,0));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(255,255,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }