diff --git a/Luna/App.config b/Luna/App.config index f6b08d1..d58c0ec 100644 --- a/Luna/App.config +++ b/Luna/App.config @@ -1,45 +1,8 @@  - -
- - - - - False - - - False - - - False - - - False - - - - - - - - - 7 - - - 0 - - - 7 - - - 0 - - - \ No newline at end of file diff --git a/Luna/Properties/AssemblyInfo.cs b/Luna/Properties/AssemblyInfo.cs index 1f34770..23f319f 100644 --- a/Luna/Properties/AssemblyInfo.cs +++ b/Luna/Properties/AssemblyInfo.cs @@ -49,6 +49,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.6.0")] -[assembly: AssemblyFileVersion("1.1.6.0")] +[assembly: AssemblyVersion("1.1.6.1")] +[assembly: AssemblyFileVersion("1.1.6.1")] [assembly: Guid("7FDBD0F5-0E11-4048-8C62-A5F64BB878AF")] diff --git a/Luna/Properties/Settings.Designer.cs b/Luna/Properties/Settings.Designer.cs index 698adb0..f520018 100644 --- a/Luna/Properties/Settings.Designer.cs +++ b/Luna/Properties/Settings.Designer.cs @@ -22,125 +22,5 @@ public static Settings Default { return defaultInstance; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool Enabled { - get { - return ((bool)(this["Enabled"])); - } - set { - this["Enabled"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ChangeAppTheme { - get { - return ((bool)(this["ChangeAppTheme"])); - } - set { - this["ChangeAppTheme"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ChangeSystemTheme { - get { - return ((bool)(this["ChangeSystemTheme"])); - } - set { - this["ChangeSystemTheme"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ChangeWallpaper { - get { - return ((bool)(this["ChangeWallpaper"])); - } - set { - this["ChangeWallpaper"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string LightWallpaperPath { - get { - return ((string)(this["LightWallpaperPath"])); - } - set { - this["LightWallpaperPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string DarkWallpaperPath { - get { - return ((string)(this["DarkWallpaperPath"])); - } - set { - this["DarkWallpaperPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("7")] - public ushort LightThemeHour { - get { - return ((ushort)(this["LightThemeHour"])); - } - set { - this["LightThemeHour"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public ushort LightThemeMinute { - get { - return ((ushort)(this["LightThemeMinute"])); - } - set { - this["LightThemeMinute"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("7")] - public ushort DarkThemeHour { - get { - return ((ushort)(this["DarkThemeHour"])); - } - set { - this["DarkThemeHour"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public ushort DarkThemeMinute { - get { - return ((ushort)(this["DarkThemeMinute"])); - } - set { - this["DarkThemeMinute"] = value; - } - } } } diff --git a/Luna/Properties/Settings.settings b/Luna/Properties/Settings.settings index 77a509c..2bd17f0 100644 --- a/Luna/Properties/Settings.settings +++ b/Luna/Properties/Settings.settings @@ -1,36 +1,5 @@  - + - - - False - - - False - - - False - - - False - - - - - - - - - 7 - - - 0 - - - 7 - - - 0 - - + \ No newline at end of file diff --git a/Luna/Windows/SettingsWindow.xaml.cs b/Luna/Windows/SettingsWindow.xaml.cs index bb52b3d..aa612a7 100644 --- a/Luna/Windows/SettingsWindow.xaml.cs +++ b/Luna/Windows/SettingsWindow.xaml.cs @@ -35,34 +35,6 @@ public SettingsWindow() DataContext = _autoFileSaver.Model; _ = _autoUpdater.CheckForUpdates(false); - - MigrateSettingsModel(); - } - - private void MigrateSettingsModel() - { - if (!_autoFileSaver.FoundOnDisk) - { - Logger.Warning("Running settings migration..."); - - Settings.Default.Upgrade(); - Settings.Default.Save(); - - Logger.Warning("Settings upgrade done"); - - _autoFileSaver.Model.Enabled = Settings.Default.Enabled; - _autoFileSaver.Model.ChangeSystemTheme = Settings.Default.ChangeSystemTheme; - _autoFileSaver.Model.ChangeAppTheme = Settings.Default.ChangeAppTheme; - _autoFileSaver.Model.ChangeWallpaper = Settings.Default.ChangeWallpaper; - _autoFileSaver.Model.LightWallpaperPath = Settings.Default.LightWallpaperPath; - _autoFileSaver.Model.DarkWallpaperPath = Settings.Default.DarkWallpaperPath; - _autoFileSaver.Model.ChangeType = SettingsChangeType.Custom; - - _autoFileSaver.Model.LightThemeTime = new DateTime(1, 1, 1, Settings.Default.LightThemeHour, Settings.Default.LightThemeMinute, 0); - _autoFileSaver.Model.DarkThemeTime = new DateTime(1, 1, 1, Settings.Default.DarkThemeHour + 12, Settings.Default.DarkThemeMinute, 0); - - Logger.Warning("Settings migration done"); - } } private bool SettingsModel_ShouldChangeProperty(object sender, PropertyChangedEventArgs e)