Skip to content
This repository has been archived by the owner on Aug 29, 2020. It is now read-only.

Commit

Permalink
v1.1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrianmteo
adrianmteo committed Apr 26, 2020
2 parents c5b5475 + 9734869 commit f4cac54
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 220 deletions.
37 changes: 0 additions & 37 deletions Luna/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Luna.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<Luna.Properties.Settings>
<setting name="Enabled" serializeAs="String">
<value>False</value>
</setting>
<setting name="ChangeAppTheme" serializeAs="String">
<value>False</value>
</setting>
<setting name="ChangeSystemTheme" serializeAs="String">
<value>False</value>
</setting>
<setting name="ChangeWallpaper" serializeAs="String">
<value>False</value>
</setting>
<setting name="LightWallpaperPath" serializeAs="String">
<value />
</setting>
<setting name="DarkWallpaperPath" serializeAs="String">
<value />
</setting>
<setting name="LightThemeHour" serializeAs="String">
<value>7</value>
</setting>
<setting name="LightThemeMinute" serializeAs="String">
<value>0</value>
</setting>
<setting name="DarkThemeHour" serializeAs="String">
<value>7</value>
</setting>
<setting name="DarkThemeMinute" serializeAs="String">
<value>0</value>
</setting>
</Luna.Properties.Settings>
</userSettings>
</configuration>
4 changes: 2 additions & 2 deletions Luna/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
120 changes: 0 additions & 120 deletions Luna/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 2 additions & 33 deletions Luna/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Luna.Properties" GeneratedClassName="Settings">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles />
<Settings>
<Setting Name="Enabled" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ChangeAppTheme" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ChangeSystemTheme" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ChangeWallpaper" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="LightWallpaperPath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="DarkWallpaperPath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="LightThemeHour" Type="System.UInt16" Scope="User">
<Value Profile="(Default)">7</Value>
</Setting>
<Setting Name="LightThemeMinute" Type="System.UInt16" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="DarkThemeHour" Type="System.UInt16" Scope="User">
<Value Profile="(Default)">7</Value>
</Setting>
<Setting Name="DarkThemeMinute" Type="System.UInt16" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
</Settings>
<Settings />
</SettingsFile>
28 changes: 0 additions & 28 deletions Luna/Windows/SettingsWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f4cac54

Please sign in to comment.