Merge branch 'integratedFileEditor' into develop

# Conflicts: # Libs/CMS_CORE_Library.dll # Step.Utils/languages/IT.xml # Step.Utils/languages/de.xml # Step.Utils/languages/en.xml # Step.Utils/languages/fr.xml # Step.Utils/languages/hr.xml # Step.Utils/languages/ro.xml
2019-08-28 14:29:51 +02:00
parent 5ad1f127cd 2b6ca98913
commit b379270a09
28 changed files with 1139 additions and 418 deletions
@@ -287,7 +287,7 @@ namespace Step.Config
                .Descendants(PROD_SFT_CONFIG_KEY)
                .Select(x => new SoftwareProdConfigModel()
                {
-                    Enabled = Convert.ToBoolean(x.Element("enabled").Value),
+                    Enabled = Convert.ToBoolean(x.Element("enabled").Value), 
                    Path = x.Element("path").Value
                }).FirstOrDefault();            

@@ -303,6 +303,7 @@ namespace Step.Config
                    EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value),
                    DatabaseAddress = x.Element("databaseAddress").Value,
                    AutoOpenCmsClient = Convert.ToBoolean(x.Element("autoOpenCmsClient").Value),
+                    TextEditorPath = x.Element("textEditorPath").Value, 
                    MTCFolderPath = x.Element("MTCFolderPath").Value,
                    MTCApplicationName = x.Element("MTCApplicationName").Value,
                    MaxAlarmsRows = Convert.ToInt32(x.Element("maxAlarmsRows").Value),