Will Bolton's fixes

Foxlider · Apr 15, 2021 · 5ceb83f · 5ceb83f
1 parent 17d94b4
commit 5ceb83f
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 7 deletions.
diff --git a/FASTER/App.xaml b/FASTER/App.xaml
@@ -9,7 +9,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <!-- Accent and AppTheme setting -->
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Green.xaml" />
 
                 <!--Metro colors for Charts-->
                 <ResourceDictionary Source="pack://application:,,,/LiveCharts.Wpf;component/Themes/Colors/metro.xaml" />

diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj
@@ -7,7 +7,7 @@
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWPF>true</UseWPF>
-    <Version>1.7.2.103</Version>
+    <Version>1.7.2.104</Version>
     <Authors>Keelah Fox</Authors>
     <Company>FoxliCorp.</Company>
     <Description>Fox's Arma Server Tool Extended Rewrite</Description>

diff --git a/FASTER/MainWindow.xaml b/FASTER/MainWindow.xaml
@@ -14,19 +14,21 @@
     BorderThickness="0" 
     ResizeMode="CanResizeWithGrip"
 
-    Title="FASTER" 
+    Title="FASTER  Will Bolton Edition" 
     Height="700" Width="1100"
     MinHeight="700" MinWidth="1000"
 
     ShowTitleBar="True"
     ShowIconOnTitleBar="True"
     Icon="Resources\FASTER.ico"
     ShowMaxRestoreButton="True"
+
     Background="{StaticResource MahApps.Brushes.Menu.Background}"
 
     Initialized="MetroWindow_Initialized"
     Loaded="MetroWindow_Loaded"
-    Closing="MetroWindow_Closing">
+    Closing="MetroWindow_Closing" 
+    FontFamily="Comic Sans MS">
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands>
             <Button Content="{iconPacks:Modern Kind=Tools}" Click="ToolsButton_Click"/>

diff --git a/FASTER/Models/Functions.cs b/FASTER/Models/Functions.cs
@@ -95,7 +95,7 @@ internal static string GetVersion()
 #endif
             string version = $"{assembly.Major}."
                              + $"{assembly.Minor}"
-                             + $"{rev}";
+                             + $"{rev} WB EDITION";
             return version;
         }
     }

diff --git a/FASTER/Views/About.xaml b/FASTER/Views/About.xaml
@@ -6,6 +6,8 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
              d:DesignHeight="570" d:DesignWidth="800"
+             FontFamily="Comic Sans MS"
+
              Loaded="About_Loaded">
     <Grid>
         <Grid.RowDefinitions>

diff --git a/FASTER/Views/Profile.xaml b/FASTER/Views/Profile.xaml
@@ -10,6 +10,7 @@
              mc:Ignorable="d"
              Loaded="UserControl_Loaded"
              Unloaded="UserControl_Unloaded"
+             FontFamily="Comic Sans MS"
              d:DesignHeight="650" d:DesignWidth="880">
     <UserControl.DataContext>
         <viewModel:ProfileViewModel/>

diff --git a/FASTER/Views/ServerStatus.xaml b/FASTER/Views/ServerStatus.xaml
@@ -8,7 +8,8 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:views="clr-namespace:FASTER.Views"
              xmlns:wpf="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
+             FontFamily="Comic Sans MS"
              d:DesignHeight="570" d:DesignWidth="800">
     <Grid>
         <Grid.RowDefinitions>

diff --git a/FASTER/Views/Settings.xaml b/FASTER/Views/Settings.xaml
@@ -8,6 +8,7 @@
              xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
              mc:Ignorable="d" 
              d:DesignHeight="570" d:DesignWidth="800"
+             FontFamily="Comic Sans MS"
 
              Initialized="Settings_Initialized"
              MouseDown="IResetDialog_LostFocus">

diff --git a/FASTER/Views/SteamMods.xaml b/FASTER/Views/SteamMods.xaml
@@ -8,7 +8,8 @@
              xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
              mc:Ignorable="d" 
              d:DesignHeight="570" d:DesignWidth="800"
-
+             FontFamily="Comic Sans MS"
+
              Initialized="SteamMods_Initialized"
              Loaded="SteamMods_Loaded">
     <Grid Margin="5">

diff --git a/FASTER/Views/SteamUpdater.xaml b/FASTER/Views/SteamUpdater.xaml
@@ -8,6 +8,8 @@
              xmlns:simpleChildWindow="http://metro.mahapps.com/winfx/xaml/simplechildwindow"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
+             FontFamily="Comic Sans MS"
+
              Initialized="UserControl_Initialized"
              Loaded="UserControl_Loaded">
     <Grid VerticalAlignment="Stretch" Margin="5">