From 1b9b0d1c8e9e9557d45142c197aca2836a82bad4 Mon Sep 17 00:00:00 2001
From: Daniel Winter <d.kreide@gmail.com>
Date: Mon, 11 Jun 2018 19:47:44 +0200
Subject: [PATCH] Fixed #5, thanks to @kumitom and @gmgru1204 Refactored Form1
 into MainScreen

---
 PraiseTheSave/App.config                      |  8 ++--
 ...rm1.Designer.cs => MainScreen.Designer.cs} | 10 ++---
 PraiseTheSave/{Form1.cs => MainScreen.cs}     | 20 +++++++--
 PraiseTheSave/{Form1.resx => MainScreen.resx} |  0
 PraiseTheSave/PraiseTheSave.csproj            | 21 +++++----
 PraiseTheSave/Program.cs                      |  2 +-
 PraiseTheSave/Properties/Settings.Designer.cs | 44 ++++++++++++-------
 PraiseTheSave/Properties/Settings.settings    |  6 +--
 PraiseTheSave/packages.config                 |  3 +-
 9 files changed, 71 insertions(+), 43 deletions(-)
 rename PraiseTheSave/{Form1.Designer.cs => MainScreen.Designer.cs} (99%)
 rename PraiseTheSave/{Form1.cs => MainScreen.cs} (94%)
 rename PraiseTheSave/{Form1.resx => MainScreen.resx} (100%)

diff --git a/PraiseTheSave/App.config b/PraiseTheSave/App.config
index 1e01681..ac6e251 100644
--- a/PraiseTheSave/App.config
+++ b/PraiseTheSave/App.config
@@ -25,15 +25,15 @@
             <setting name="dirDS1" serializeAs="String">
                 <value>ds1</value>
             </setting>
+            <setting name="dirDSR" serializeAs="String">
+              <value>ds1_remastered</value>
+            </setting>
             <setting name="dirDS2" serializeAs="String">
-                <value>ds3</value>
+              <value>ds2</value>
             </setting>
             <setting name="dirDS3" serializeAs="String">
                 <value>ds3</value>
             </setting>
-            <setting name="dirDSR" serializeAs="String">
-                <value>ds1_remastered</value>
-            </setting>
         </PraiseTheSave.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/PraiseTheSave/Form1.Designer.cs b/PraiseTheSave/MainScreen.Designer.cs
similarity index 99%
rename from PraiseTheSave/Form1.Designer.cs
rename to PraiseTheSave/MainScreen.Designer.cs
index a7ffc6c..a5e79d7 100644
--- a/PraiseTheSave/Form1.Designer.cs
+++ b/PraiseTheSave/MainScreen.Designer.cs
@@ -1,6 +1,6 @@
 namespace PraiseTheSave
 {
-    partial class Form1
+    partial class MainScreen
     {
         /// <summary>
         /// Required designer variable.
@@ -29,7 +29,7 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainScreen));
             this.label1 = new System.Windows.Forms.Label();
             this.ds3link = new System.Windows.Forms.Label();
             this.ds3_found_folder = new System.Windows.Forms.Label();
@@ -372,7 +372,7 @@ private void InitializeComponent()
             this.ds1Rlink.Text = "Dark Souls I Remastered";
             this.ds1Rlink.Click += new System.EventHandler(this.Ds1Rlink_Click);
             // 
-            // Form1
+            // MainScreen
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -408,9 +408,9 @@ private void InitializeComponent()
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "Form1";
+            this.Name = "MainScreen";
             this.Text = "Praise The Save";
-            this.Load += new System.EventHandler(this.Form1_Load);
+            this.Load += new System.EventHandler(this.MainScreen_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.saveAmountInput)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.saveIntervalInput)).EndInit();
diff --git a/PraiseTheSave/Form1.cs b/PraiseTheSave/MainScreen.cs
similarity index 94%
rename from PraiseTheSave/Form1.cs
rename to PraiseTheSave/MainScreen.cs
index 75f6344..6306947 100644
--- a/PraiseTheSave/Form1.cs
+++ b/PraiseTheSave/MainScreen.cs
@@ -9,10 +9,11 @@
 using System.Windows.Forms;
 using System.IO;
 using Ionic.Zip;
+using AutoUpdaterDotNET;
 
 namespace PraiseTheSave
 {
-    public partial class Form1 : Form
+    public partial class MainScreen : Form
     {
         private class Game
         {
@@ -101,7 +102,7 @@ public void Backup()
 
         private readonly Dictionary<string, Game> games;
 
-        public Form1()
+        public MainScreen()
         {
             backupTimer = new Timer();
             backupTimer.Tick += new EventHandler(DoBackup);
@@ -190,9 +191,20 @@ private static FileInfo GetOldestFileInDir(DirectoryInfo dir, bool checkSubdirs)
                 (current, next) => next.LastWriteTime < current.LastWriteTime ? next : current);
         }
 
-        private void Form1_Load(object sender, EventArgs e)
+        private void MainScreen_Load(object sender, EventArgs e)
         {
-            
+            AutoUpdater.Start("https://lucidlemon.github.io/PraiseTheSave/AutoUpdater.xml");
+
+            System.Timers.Timer timer = new System.Timers.Timer
+            {
+                Interval = 2 * 60 * 1000,
+                SynchronizingObject = this
+            };
+            timer.Elapsed += delegate
+            {
+                AutoUpdater.Start("https://lucidlemon.github.io/PraiseTheSave/AutoUpdater.xml");
+            };
+            timer.Start();
         }
 
         public void RefreshInfo()
diff --git a/PraiseTheSave/Form1.resx b/PraiseTheSave/MainScreen.resx
similarity index 100%
rename from PraiseTheSave/Form1.resx
rename to PraiseTheSave/MainScreen.resx
diff --git a/PraiseTheSave/PraiseTheSave.csproj b/PraiseTheSave/PraiseTheSave.csproj
index 411026d..1bd0267 100644
--- a/PraiseTheSave/PraiseTheSave.csproj
+++ b/PraiseTheSave/PraiseTheSave.csproj
@@ -76,6 +76,9 @@
     <ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoUpdater.NET, Version=1.4.10.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autoupdater.NET.Official.1.4.10\lib\net452\AutoUpdater.NET.dll</HintPath>
+    </Reference>
     <Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
     </Reference>
@@ -95,11 +98,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
+    <Compile Include="MainScreen.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="MainScreen.Designer.cs">
+      <DependentUpon>MainScreen.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -108,8 +111,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resource1.resx</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="MainScreen.resx">
+      <DependentUpon>MainScreen.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -138,7 +141,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
@@ -157,15 +162,15 @@
     <Content Include="sunbro_logo.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.3.0.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.4\build\Fody.targets'))" />
   </Target>
   <Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" />
+  <Import Project="..\packages\Fody.3.0.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.4\build\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PraiseTheSave/Program.cs b/PraiseTheSave/Program.cs
index d47e4f3..2685eaf 100644
--- a/PraiseTheSave/Program.cs
+++ b/PraiseTheSave/Program.cs
@@ -16,7 +16,7 @@ static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new MainScreen());
         }
     }
 }
diff --git a/PraiseTheSave/Properties/Settings.Designer.cs b/PraiseTheSave/Properties/Settings.Designer.cs
index 2399afd..36f89e3 100644
--- a/PraiseTheSave/Properties/Settings.Designer.cs
+++ b/PraiseTheSave/Properties/Settings.Designer.cs
@@ -82,19 +82,37 @@ public string dirDS1 {
                 this["dirDS1"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ds3")]
-        public string dirDS2 {
-            get {
+        [global::System.Configuration.DefaultSettingValueAttribute("ds1_remastered")]
+        public string dirDSR
+        {
+            get
+            {
+                return ((string)(this["dirDSR"]));
+            }
+            set
+            {
+                this["dirDSR"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("ds2")]
+        public string dirDS2
+        {
+            get
+            {
                 return ((string)(this["dirDS2"]));
             }
-            set {
+            set
+            {
                 this["dirDS2"] = value;
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("ds3")]
@@ -107,16 +125,8 @@ public string dirDS3 {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ds1_remastered")]
-        public string dirDSR {
-            get {
-                return ((string)(this["dirDSR"]));
-            }
-            set {
-                this["dirDSR"] = value;
-            }
-        }
+        
+        
+        
     }
 }
diff --git a/PraiseTheSave/Properties/Settings.settings b/PraiseTheSave/Properties/Settings.settings
index fef037c..0dd15eb 100644
--- a/PraiseTheSave/Properties/Settings.settings
+++ b/PraiseTheSave/Properties/Settings.settings
@@ -17,14 +17,14 @@
     <Setting Name="dirDS1" Type="System.String" Scope="User">
       <Value Profile="(Default)">ds1</Value>
     </Setting>
-    <Setting Name="dirDS2" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ds3</Value>
-    </Setting>
     <Setting Name="dirDS3" Type="System.String" Scope="User">
       <Value Profile="(Default)">ds3</Value>
     </Setting>
     <Setting Name="dirDSR" Type="System.String" Scope="User">
       <Value Profile="(Default)">ds1_remastered</Value>
     </Setting>
+    <Setting Name="dirDS2" Type="System.String" Scope="User">
+      <Value Profile="(Default)">ds2</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/PraiseTheSave/packages.config b/PraiseTheSave/packages.config
index 5f77859..a37dff9 100644
--- a/PraiseTheSave/packages.config
+++ b/PraiseTheSave/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Autoupdater.NET.Official" version="1.4.10" targetFramework="net452" />
   <package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
   <package id="DotNetZip" version="1.11.0" targetFramework="net452" />
-  <package id="Fody" version="3.0.3" targetFramework="net452" developmentDependency="true" />
+  <package id="Fody" version="3.0.4" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file