nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial StaticData platform abstraction

Browse source
This commit is contained in:
John Lewin 2014-11-25 07:47:03 -08:00
parent 62730c186d
commit eba756966b
23 changed files with 113 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

9
SettingsManagement/OemSettings.cs
View file

@ -4,7 +4,11 @@ using System.Linq;
using System.Text;
using System.IO;
using MatterHackers.MatterControl.DataStorage;
<<<<<<< HEAD
using Newtonsoft.Json;
=======
using MatterHackers.Agg.PlatformAbstract;
>>>>>>> Initial StaticData platform abstraction
namespace MatterHackers.MatterControl.SettingsManagement
{
@ -20,9 +24,8 @@ namespace MatterHackers.MatterControl.SettingsManagement
{
//instance = new OemSettings();
//return instance;
string pathToOemSettings = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "Settings.json");
string oemSettings = File.ReadAllText(pathToOemSettings);
instance = (OemSettings)JsonConvert.DeserializeObject<OemSettings>(oemSettings);
string oemSettings = StaticData.Instance.ReadAllText(Path.Combine("OEMSettings", "Settings.json"));
instance = (OemSettings)Newtonsoft.Json.JsonConvert.DeserializeObject<OemSettings>(oemSettings);
}
return instance;