Fix language loading, add basic glyph.

Codeusa · Mar 31, 2018 · 6c98899 · 6c98899
1 parent fca6c87
commit 6c98899
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 169 deletions.
diff --git a/BorderlessGaming.Logic/Models/Language.cs b/BorderlessGaming.Logic/Models/Language.cs
@@ -1,8 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
 using BorderlessGaming.Logic.Core;
 
 namespace BorderlessGaming.Logic.Models
@@ -22,6 +25,7 @@ public void Set()
 
         internal string Data(string key)
         {
+
             return LanguageData.ContainsKey(key) ? LanguageData[key] : null;
         }
 

diff --git a/BorderlessGaming/BorderlessGaming.csproj b/BorderlessGaming/BorderlessGaming.csproj
@@ -218,6 +218,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="BorderlessGaming_new.ico" />
+    <EmbeddedResource Include="Resources\master-glyph.png" />
+    <None Include="Resources\RainwayLogo.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="PostBuildMacros">

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
@@ -1225,5 +1225,10 @@ private void muteInBackgroundToolStripMenuItem_Click(object sender, EventArgs e)
             }
             RefreshFavoritesList(fav);
         }
+
+        private void checkOutRainwayToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Tools.GotoSite("https://rainway.io/?ref=borderlessgaming3");
+        }
     }
 }
diff --git a/BorderlessGaming/Forms/MainWindow.en-US.resx b/BorderlessGaming/Forms/MainWindow.en-US.resx
@@ -724,9 +724,6 @@
   <data name="toolStripRunOnStartup.Size" type="System.Drawing.Size, System.Drawing">
     <value>316, 22</value>
   </data>
-  <data name="toolStripLanguages.Text" xml:space="preserve">
-    <value>Language</value>
-  </data>
   <data name="toolStripCheckForUpdates.Size" type="System.Drawing.Size, System.Drawing">
     <value>316, 22</value>
   </data>
@@ -793,7 +790,31 @@
   <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 27</value>
   </data>
-  <data name="toolStripRainway.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripUsageGuide.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 22</value>
+  </data>
+  <data name="toolStripRegexReference.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 22</value>
+  </data>
+  <data name="toolStripMenuItem13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>157, 6</value>
+  </data>
+  <data name="toolStripReportBug.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 22</value>
+  </data>
+  <data name="toolStripSupportUs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 22</value>
+  </data>
+  <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>157, 6</value>
+  </data>
+  <data name="toolStripAbout.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 22</value>
+  </data>
+  <data name="toolStripInfo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>44, 27</value>
+  </data>
+  <data name="rainwayStrip.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAIQAAACWCAYAAAAfWiA3AAAABGdBTUEAALGPC/xhBQAAEwRJREFUeF7t
         nQuQHMV5x0WU2NhxiB0nIbGTWOXIpMKBAsaS7m7ndYY4ED+wU1wSP3iYGJy4wEGJ/CjAZGNLdzvds3c2
@@ -880,32 +901,11 @@
         fxxJPk72nkr8AAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="toolStripRainway.Text" xml:space="preserve">
-    <value>Rainway</value>
-  </data>
-  <data name="toolStripUsageGuide.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 22</value>
-  </data>
-  <data name="toolStripRegexReference.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 22</value>
-  </data>
-  <data name="toolStripMenuItem13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>157, 6</value>
-  </data>
-  <data name="toolStripReportBug.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 22</value>
-  </data>
-  <data name="toolStripSupportUs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 22</value>
-  </data>
-  <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>157, 6</value>
-  </data>
-  <data name="toolStripAbout.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 22</value>
+  <data name="rainwayStrip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>131, 27</value>
   </data>
-  <data name="toolStripInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 27</value>
+  <data name="rainwayStrip.Text" xml:space="preserve">
+    <value>Check Out Raiway</value>
   </data>
   <data name="mnuMain.MinimumSize" type="System.Drawing.Size, System.Drawing">
     <value>0, 31</value>