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

New and improved os detection with a plugin.

Browse source
This commit is contained in:
larsbrubaker 2014-06-20 09:27:17 -07:00
parent 87fde9e21b
commit a282b0ce95
9 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
DataStorage/Datastore.cs
View file

@ -87,9 +87,9 @@ namespace MatterHackers.MatterControl.DataStorage
{
get
{
switch (OsInformation.GetOSType())
switch (OsInformation.OperatingSystem)
{
case OsInformation.OSType.Windows:
case OSType.Windows:
if (Directory.Exists("StaticData"))
{
return "StaticData";
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.DataStorage
return Path.Combine("..", "..", "StaticData");
}
case OsInformation.OSType.Mac:
case OSType.Mac:
if (Directory.Exists("StaticData"))
{
return "StaticData";
@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl.DataStorage
{
return Path.Combine("..", "..", "StaticData");
}
case OsInformation.OSType.X11:
case OSType.X11:
if (Directory.Exists("StaticData"))
{
return "StaticData";
@ -200,17 +200,17 @@ namespace MatterHackers.MatterControl.DataStorage
}
}
OsInformation.OSType osType = OsInformation.GetOSType();
OSType osType = OsInformation.OperatingSystem;
switch (osType)
{
case OsInformation.OSType.Windows:
case OSType.Windows:
dbSQLite = new SQLiteWin32.SQLiteConnection(datastoreLocation);
break;
case OsInformation.OSType.Mac:
case OSType.Mac:
dbSQLite = new SQLiteUnix.SQLiteConnection(datastoreLocation);
break;
case OsInformation.OSType.X11:
case OSType.X11:
dbSQLite = new SQLiteUnix.SQLiteConnection(datastoreLocation);
break;