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

Remove DataStorage qualifier, add using statements

Browse source
This commit is contained in:
John Lewin 2016-02-24 10:52:28 -08:00
parent c16fca5359
commit eea7dd9fe4
11 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AboutPage/AboutWidget.cs
View file

@ -122,9 +122,9 @@ namespace MatterHackers.MatterControl
// start cleaning out unused data
// MatterControl\data\gcode
RemoveDirectory(DataStorage.ApplicationDataStorage.Instance.GCodeOutputPath);
RemoveDirectory(ApplicationDataStorage.Instance.GCodeOutputPath);
string userDataPath = DataStorage.ApplicationDataStorage.ApplicationUserDataPath;
string userDataPath = ApplicationDataStorage.ApplicationUserDataPath;
RemoveDirectory(Path.Combine(userDataPath, "updates"));
HashSet<string> referencedPrintItemsFilePaths = new HashSet<string>();

9
AboutPage/UpdateControlData.cs
View file

@ -31,6 +31,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SettingsManagement;
using MatterHackers.MatterControl.VersionManagement;
using System;
@ -73,9 +74,9 @@ namespace MatterHackers.MatterControl
public RootedObjectEventHandler UpdateStatusChanged = new RootedObjectEventHandler();
#if __ANDROID__
static string updateFileLocation = Path.Combine(DataStorage.ApplicationDataStorage.Instance.PublicDataStoragePath, "updates");
static string updateFileLocation = Path.Combine(ApplicationDataStorage.Instance.PublicDataStoragePath, "updates");
#else
private static string applicationDataPath = DataStorage.ApplicationDataStorage.ApplicationUserDataPath;
private static string applicationDataPath = ApplicationDataStorage.ApplicationUserDataPath;
private static string updateFileLocation = Path.Combine(applicationDataPath, "updates");
#endif
@ -368,8 +369,8 @@ namespace MatterHackers.MatterControl
}
else
{
DataStorage.ApplicationSession firstSession;
firstSession = DataStorage.Datastore.Instance.dbSQLite.Table<DataStorage.ApplicationSession>().OrderBy(v => v.SessionStart).Take(1).FirstOrDefault();
ApplicationSession firstSession;
firstSession = Datastore.Instance.dbSQLite.Table<ApplicationSession>().OrderBy(v => v.SessionStart).Take(1).FirstOrDefault();
if (firstSession != null
&& DateTime.Compare(firstSession.SessionStart.AddDays(7), DateTime.Now) < 0)
{