Sync latest changes

Codeusa · Mar 28, 2018 · 159f7fe · 159f7fe
1 parent 05f053a
commit 159f7fe
Show file tree

Hide file tree

Showing 24 changed files with 44,198 additions and 775 deletions.
diff --git a/BorderlessGaming.Logic/BorderlessGaming.Logic.csproj b/BorderlessGaming.Logic/BorderlessGaming.Logic.csproj
@@ -33,7 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\BGKey.pfx</AssemblyOriginatorKeyFile>

diff --git a/BorderlessGaming.Logic/Core/LanguageManager.cs b/BorderlessGaming.Logic/Core/LanguageManager.cs
@@ -141,9 +141,17 @@ private static bool LanguageSelected(ToolStripItemCollection dropDownItems)
 
         private static bool IsDefault(string displayName)
         {
-            var defaultCulture = Config.Instance.AppSettings.DefaultCulture;
-            var langauge = Languages.Values.FirstOrDefault(lang => lang.DisplayName.Equals(displayName));
-            return langauge != null && langauge.Culture.Equals(defaultCulture);
+            try
+            {
+                var defaultCulture = Config.Instance.AppSettings.DefaultCulture;
+                var langauge = Languages.Values.FirstOrDefault(lang => lang.DisplayName.Equals(displayName));
+                return langauge != null && langauge.Culture.Equals(defaultCulture);
+            }
+            catch
+            {
+
+                return false;
+            }
         }
 
         private static void SetDefaultLanguage(string tsiText)

diff --git a/BorderlessGaming.Logic/Models/AppSettings.cs b/BorderlessGaming.Logic/Models/AppSettings.cs
@@ -43,5 +43,10 @@ public class AppSettings
         [ProtoMember(12)]
         [DefaultValue("en-US")]
         public string DefaultCulture { get; set; } = "en-US";
+
+        [ProtoMember(13)]
+        [DefaultValue(true)]
+        public bool ShowAdOnStart { get; set; } = true;
+
     }
 }
diff --git a/BorderlessGaming/BorderlessGaming.csproj b/BorderlessGaming/BorderlessGaming.csproj
@@ -47,7 +47,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\BGKey.pfx</AssemblyOriginatorKeyFile>
@@ -97,6 +97,12 @@
     <Compile Include="Forms\MainWindow.Designer.cs">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Rainway.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\Rainway.Designer.cs">
+      <DependentUpon>Rainway.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Forms\AboutForm.de.resx">
@@ -137,6 +143,9 @@
     <EmbeddedResource Include="Forms\MainWindow.zh-CN.resx">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\Rainway.resx">
+      <DependentUpon>Rainway.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>

diff --git a/BorderlessGaming/Forms/MainWindow.Designer.cs b/BorderlessGaming/Forms/MainWindow.Designer.cs
diff --git a/BorderlessGaming/Forms/MainWindow.cs b/BorderlessGaming/Forms/MainWindow.cs
@@ -23,6 +23,13 @@ public MainWindow()
             _watcher = new ProcessWatcher(this);
             InitializeComponent();
             LanguageManager.Setup(toolStripLanguages);
+            if (Config.Instance.AppSettings.ShowAdOnStart)
+            {
+                var rainway = new Rainway { StartPosition = this.StartPosition, TopMost = true};
+                rainway.ShowDialog(this);
+                rainway.BringToFront();
+            }
+
         }
 
         public void AddFavoriteToList(Favorite fav)
@@ -229,6 +236,10 @@ private async Task RefreshProcesses()
             lstProcesses.Items.Clear();
             await _watcher.Refresh();
         }
+        private void rainwayToolStrip_Click(object sender, EventArgs e)
+        {
+            Tools.GotoSite("https://rainway.io/?ref=borderlessgaming");
+        }
 
         private void usageGuideToolStripMenuItem_Click(object sender, EventArgs e)
         {

diff --git a/BorderlessGaming/Forms/Rainway.Designer.cs b/BorderlessGaming/Forms/Rainway.Designer.cs
diff --git a/BorderlessGaming/Forms/Rainway.cs b/BorderlessGaming/Forms/Rainway.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using BorderlessGaming.Logic.Models;
+using BorderlessGaming.Logic.System;
+
+namespace BorderlessGaming.Forms
+{
+    public partial class Rainway : Form
+    {
+        public Rainway()
+        {
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            InitializeComponent();
+        }
+
+        private void Rainway_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Rainway_Click(object sender, EventArgs e)
+        {
+            Tools.GotoSite("https://rainway.io/?ref=borderlessgaming2");
+            this.Close();
+        }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e)
+        {
+            var checkbox = (CheckBox) sender;
+            Config.Instance.AppSettings.ShowAdOnStart = checkbox.Checked != true;
+        }
+
+        private void Rainway_MouseEnter(object sender, EventArgs e)
+        {
+           Cursor = Cursors.Hand;
+        }
+    }
+}