Merge pull request #5 from H1emu/New-GUI---ALL-CODE-IS-THE-SAME

New-GUI

H1DepotDownloader/ContentDownloader.cs

@@ -32,7 +32,7 @@ static class ContentDownloader
         private static Steam3Session.Credentials steam3Credentials;
         private static CDNClientPool cdnPool;
 
-        private static string DEFAULT_DOWNLOAD_DIR = "depots";
+        public static string DEFAULT_DOWNLOAD_DIR = "depots";
         private static string CONFIG_DIR = "DepotDownloader";
         private static string STAGING_DIR = Path.Combine(CONFIG_DIR, "staging");
 

H1DepotDownloader/H1DepotDownloader.csproj

@@ -41,6 +41,9 @@
     <Reference Include="Costura, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.5.3.0\lib\netstandard1.0\Costura.dll</HintPath>
     </Reference>
+    <Reference Include="MaterialSkin, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialSkin.2.2.1.4\lib\net461\MaterialSkin.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>

H1DepotDownloader/MainForm.cs

@@ -1,10 +1,13 @@
-using System;
+using MaterialSkin;
+using MaterialSkin.Controls;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -13,26 +16,33 @@
 
 namespace H1DepotDownloader
 {
-    public partial class MainForm : Form
+    public partial class MainForm : MaterialForm
     {
 
         TextWriter _writer = null;
 
         public MainForm()
         {
             InitializeComponent();
+            var materialSkinManager = MaterialSkinManager.Instance;
+            materialSkinManager.Theme = MaterialSkinManager.Themes.DARK;
+            materialSkinManager.ColorScheme = new ColorScheme(Primary.Grey800, Primary.Grey900, Primary.BlueGrey500, Accent.Red100, TextShade.WHITE);
+            materialSkinManager.AddFormToManage(this);
+
             _writer = new TextBoxStreamWriter(consoleLogs);
             Console.SetOut(_writer);
         }
 
-        private void startDownloadBtn_Click(object sender, EventArgs e)
+        private void startDownloadBtn_Click_1(object sender, EventArgs e)
         {
+            if (usernameText.Text == "" || passwordText.Text == "") { MessageBox.Show("Please fill in Username AND Password fields", "H1Emu - DepotDownloader", MessageBoxButtons.OK, MessageBoxIcon.Error); return; }
+
+            directory.Text = ContentDownloader.DEFAULT_DOWNLOAD_DIR;
             startDownloadBtn_ClickAsync();
         }
 
         private async Task startDownloadBtn_ClickAsync()
         {
-
             string [] args = argsText.Text.Split(' ');
 
             try { 
@@ -111,7 +121,7 @@ private async Task startDownloadBtn_ClickAsync()
                 }
             }
 
-            ContentDownloader.Config.InstallDirectory = GetParameter<string>(args, "-dir");
+            ContentDownloader.Config.InstallDirectory = GetParameter<string> (args, "-dir");
 
             ContentDownloader.Config.VerifyAll = HasParameter(args, "-verify-all") || HasParameter(args, "-verify_all") || HasParameter(args, "-validate");
             ContentDownloader.Config.MaxServers = GetParameter<int>(args, "-max-servers", 20);
@@ -363,7 +373,13 @@ static List<T> GetParameterList<T>(string[] args, string param)
             return list;
         }
 
-    }
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+            string localVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString().TrimEnd('0').TrimEnd('.');
+            this.Text = $"H1Emu - DepotDownloader - v{localVersion}";
 
+            outputLabel.Font = new Font("Roboto", 14);
+        }
+    }
 }
 #endregion

H1DepotDownloader/MainForm.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

H1DepotDownloader/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // 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.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyFileVersion("1.0.3")]