Merge branch 'development'

FelisDiligens · Jul 30, 2022 · f4f05b8 · f4f05b8
2 parents edab32f + 66a3cf8
commit f4f05b8
Show file tree

Hide file tree

Showing 26 changed files with 242 additions and 400 deletions.
diff --git a/Fo76ini/Fo76ini.csproj b/Fo76ini/Fo76ini.csproj
@@ -506,6 +506,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\Oswald.ttf" />
+    <None Include="Resources\RobotoCondensed-Bold.ttf" />
+    <None Include="Resources\RobotoCondensed.ttf" />
     <None Include="Resources\wrench-2-24.png" />
     <None Include="Resources\fallout76-logo-black.png" />
     <None Include="Resources\fallout76-logo-white.png" />

diff --git a/Fo76ini/Forms/FormMain/FormMain.Language.cs b/Fo76ini/Forms/FormMain/FormMain.Language.cs
@@ -1,4 +1,7 @@
-namespace Fo76ini
+using Fo76ini.Utilities;
+using System.Drawing;
+
+namespace Fo76ini
 {
     partial class FormMain
     {
@@ -14,6 +17,9 @@ public void OnLanguageChanged(object sender, TranslationEventArgs e)
             // TODO: UpdateUI?
             this.CheckVersion();
 
+            // Set font:
+            this.labelWelcome.Font = CustomFonts.GetHeaderFont();
+
             this.Refresh(); // Forces redraw
         }
         // TODO: FormMods needs OnLanguageChanged code.

diff --git a/Fo76ini/Forms/FormMain/FormMain.cs b/Fo76ini/Forms/FormMain/FormMain.cs
@@ -27,8 +27,6 @@ public partial class FormMain : Form
 
         private GameInstance game;
 
-        public readonly bool FirstStart;
-
         public FormMain()
         {
             InitializeComponent();
@@ -82,16 +80,14 @@ public FormMain()
             // Disable scroll wheel on UI elements to prevent the user from accidentally changing values:
             Utils.PreventChangeOnMouseWheelForAllElements(this);
 
-            this.labelWelcome.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
-
         }
 
         private void FormMain_Load(object sender, EventArgs e)
         {
             this.timerCheckFiles.Enabled = true;
 
             // Load translations
-            if (FirstStart)
+            if (Initialization.FirstStart)
                 Localization.DownloadLanguageFiles(); // Download language on first start! Might hang the program for a while, if the internet connection is bad, though...
             Localization.GenerateDefaultTemplate();
             Localization.LookupLanguages();

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlCustom.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlCustom.cs
@@ -65,10 +65,7 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             Translation translation = (Translation)sender;
 
-            if (translation.UsesNonLatinCharacters)
-                this.labelCustomTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelCustomTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelCustomTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         #region Event handler

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlGallery.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlGallery.cs
@@ -72,10 +72,7 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             Translation translation = (Translation)sender;
 
-            if (translation.UsesNonLatinCharacters)
-                this.labelGalleryTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelGalleryTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelGalleryTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void LinkControls()

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlNexusMods.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlNexusMods.cs
@@ -47,10 +47,7 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             Translation translation = (Translation)sender;
 
-            if (translation.UsesNonLatinCharacters)
-                this.labelNexusTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelNexusTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelNexusTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void UserControlNexusMods_Load(object sender, EventArgs e)

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlPipboy.Designer.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlPipboy.Designer.cs
diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlPipboy.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlPipboy.cs
@@ -39,10 +39,7 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             Translation translation = (Translation)sender;
 
-            if (translation.UsesNonLatinCharacters)
-                this.labelPipboyTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelPipboyTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelPipboyTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void LinkPipboyControls()

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlProfiles.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlProfiles.cs
@@ -61,16 +61,8 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             Translation translation = (Translation)sender;
 
-            if (translation.UsesNonLatinCharacters)
-            {
-                this.labelSelectTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-                this.labelEditTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            }
-            else
-            {
-                this.labelSelectTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
-                this.labelEditTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
-            }
+            this.labelSelectTitle.Font = CustomFonts.GetHeaderFont();
+            this.labelEditTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void OnProfileChanged(object sender, ProfileEventArgs e)

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlSettings.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlSettings.cs
@@ -78,10 +78,7 @@ public void OnLanguageChanged(object sender, TranslationEventArgs e)
             Translation translation = (Translation)sender;
             this.labelOutdatedLanguage.Visible = translation.IsOutdated();
 
-            if (translation.UsesNonLatinCharacters)
-                this.labelSettingsTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelSettingsTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelSettingsTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void buttonDownloadLanguages_Click(object sender, EventArgs e)

diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlTweaks.Designer.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlTweaks.Designer.cs
diff --git a/Fo76ini/Forms/FormMain/Tabs/UserControlTweaks.cs b/Fo76ini/Forms/FormMain/Tabs/UserControlTweaks.cs
@@ -242,11 +242,7 @@ private void Translation_LanguageChanged(object sender, TranslationEventArgs e)
         {
             LoadTextResources();
 
-            Translation translation = (Translation)sender;
-            if (translation.UsesNonLatinCharacters)
-                this.labelTweaksTitle.Font = new Font("Impact", 18, FontStyle.Regular);
-            else
-                this.labelTweaksTitle.Font = new Font(CustomFonts.Overseer, 20, FontStyle.Regular);
+            this.labelTweaksTitle.Font = CustomFonts.GetHeaderFont();
         }
 
         private void UserControlTweaks_Load(object sender, EventArgs e)