diff --git a/FModel/App.config b/FModel/App.config index 96bb0aa6..175c75f5 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -82,6 +82,9 @@ True + + True + diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 01f61b50..6eebf3ec 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -233,10 +233,74 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244,7 +308,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/FModel/FModel_Main.xaml b/FModel/FModel_Main.xaml index e9ca9800..bfa2e831 100644 --- a/FModel/FModel_Main.xaml +++ b/FModel/FModel_Main.xaml @@ -43,7 +43,7 @@ - + diff --git a/FModel/FModel_Main.xaml.cs b/FModel/FModel_Main.xaml.cs index 5265afa2..f93a4468 100644 --- a/FModel/FModel_Main.xaml.cs +++ b/FModel/FModel_Main.xaml.cs @@ -39,12 +39,12 @@ namespace FModel AutoUpdater.Start("https://dl.dropbox.com/s/3kv2pukqu6tj1r0/FModel.xml?dl=0"); // Copy user settings from previous application version if necessary - /*if (FProp.Default.FUpdateSettings) + if (FProp.Default.FUpdateSettings) { FProp.Default.Upgrade(); FProp.Default.FUpdateSettings = false; FProp.Default.Save(); - }*/ + } await Task.Run(() => { diff --git a/FModel/Forms/FModel_Settings.xaml b/FModel/Forms/FModel_Settings.xaml index 45e025a4..ae202daf 100644 --- a/FModel/Forms/FModel_Settings.xaml +++ b/FModel/Forms/FModel_Settings.xaml @@ -20,7 +20,8 @@