Feature #1711

[crea.git] / lib / creaDevManagerLib / wxCDMMainFrame.cpp

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 1785342da270b2599f7663822a2c27c36bd88415..7c2bf5aab6e418596b447b2172133b183ecd6f44 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -279,6 +279,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
         {
           auiManager.DetachPane(this->panel_Properties);
           this->panel_Properties->Destroy();
+          this->panel_Properties = NULL;
         }
 
       this->panel_Properties = new wxCDMProjectDescriptionPanel(
@@ -294,6 +295,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
         {
           auiManager.DetachPane(this->panel_Properties);
           this->panel_ProjectActions->Destroy();
+          this->panel_ProjectActions = NULL;
         }
 
       panel_ProjectActions = new wxCDMProjectActionsPanel(
@@ -366,6 +368,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
         {
           auiManager.DetachPane(this->panel_Properties);
           this->panel_Properties->Destroy();
+          this->panel_Properties = NULL;
         }
 
       this->panel_Properties = new wxCDMProjectDescriptionPanel(
@@ -383,6 +386,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
         {
           auiManager.DetachPane(this->panel_ProjectActions);
           this->panel_ProjectActions->Destroy();
+          this->panel_ProjectActions = NULL;
         }
       panel_ProjectActions = new wxCDMProjectActionsPanel(
           this,
@@ -424,11 +428,13 @@ void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
     {
       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(
@@ -460,11 +466,13 @@ void wxCDMMainFrame::OnMenuCloseAllProjects(wxCommandEvent& event)
     {
       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(
@@ -490,7 +498,7 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
 {
   std::cout << "Closing CreaDevManager..." << std::endl;
   std::string* result;
-  if(!this->model->CloseProject(result))
+  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);
@@ -501,21 +509,16 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
     {
       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
-  );
   Close();
   event.Skip();
 }
@@ -615,14 +618,6 @@ void wxCDMMainFrame::OnMenuAboutCreatis(wxCommandEvent& event)
 
 void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 {
-  std::cout << "New Tree Selection" << std::endl;
-
-  if(event.GetId() != 0)
-    {
-      event.Skip();
-    }
-
-
   //get selected element
   wxTreeItemId elementId = event.GetItem();
 
@@ -834,8 +829,9 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
   //delete old view
   if(this->panel_Properties!= NULL)
     {
-      this->panel_Properties->Destroy();
       auiManager.DetachPane(this->panel_Properties);
+      this->panel_Properties->Destroy();
+      this->panel_Properties = NULL;
     }
   //set new view
 
@@ -849,18 +845,17 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
 void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
 {
-  std::cout << "inMainFrame id: " << event.GetId() << ", tree element: "<< event.GetInt() << std::endl;
   switch(event.GetId() != 0)
   {
   case 0:
     //select out old one to generate selection event
-    this->tree_Projects->SelectItem(event.GetInt(), false);
     this->tree_Projects->SelectItem(event.GetInt(), true);
     break;
   case 1:
     wxPanel* description = NULL;
     if(event.GetString() == wxT("manage_packages"))
       {
+        this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
         description = new wxCDMPackageManagerPanel(
             this,
             this->model->GetProject(),
@@ -873,13 +868,11 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
       }
     else if(event.GetString() == wxT("manage_libraries"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId(), false);
         this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId(), true);
         break;
       }
     else if(event.GetString() == wxT("manage_applications"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId(), false);
         this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId(), true);
         break;
       }
@@ -893,8 +886,9 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
     //delete old view
     if(this->panel_Properties!= NULL)
       {
-        this->panel_Properties->Destroy();
         auiManager.DetachPane(this->panel_Properties);
+        this->panel_Properties->Destroy();
+        this->panel_Properties = NULL;
       }
     //set new view