From a6c59f416006c9847760773452b842dc263296f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Thu, 20 Aug 2015 15:48:37 +0200
Subject: [PATCH] (#384) Fixed Script tree in the new project tree

---
 ApplicationCode/ProjectDataModel/RimProject.cpp        | 5 ++++-
 ApplicationCode/ProjectDataModel/RimScriptCollection.h | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index b94db5c1e9..748eda072a 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -71,6 +71,7 @@ RimProject::RimProject(void)
     oilFields.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&scriptCollection, "ScriptCollection", "Scripts", ":/Default.png", "", "");
+    scriptCollection.uiCapability()->setUiHidden(true);
     CAF_PDM_InitFieldNoDefault(&treeViewState, "TreeViewState", "",  "", "", "");
     treeViewState.uiCapability()->setUiHidden(true);
 
@@ -97,6 +98,8 @@ RimProject::RimProject(void)
 
     scriptCollection = new RimScriptCollection();
     scriptCollection->directory.uiCapability()->setUiHidden(true);
+    scriptCollection->uiCapability()->setUiName("Scripts");
+    scriptCollection->uiCapability()->setUiIcon(QIcon(":/Default.png"));
 
     // For now, create a default first oilfield that contains the rest of the project
     oilFields.push_back(new RimOilField);
@@ -790,7 +793,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
         if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
     }
 
-    uiTreeOrdering.add(&scriptCollection);
+    uiTreeOrdering.add(scriptCollection());
 
     uiTreeOrdering.setForgetRemainingFields(true);
 }
diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.h b/ApplicationCode/ProjectDataModel/RimScriptCollection.h
index 3f83fcec81..094d89abff 100644
--- a/ApplicationCode/ProjectDataModel/RimScriptCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.h
@@ -44,7 +44,7 @@ public:
     virtual ~RimScriptCollection();
 
 public: // Pdm Fields
-    caf::PdmField<QString>                      directory;
+    caf::PdmField<QString>                        directory;
     caf::PdmChildArrayField<RimCalcScript*>       calcScripts;
 
     caf::PdmChildArrayField<RimScriptCollection*> subDirectories;