From 3d3914cc4e201713632cfb012f51b8ddd749e852 Mon Sep 17 00:00:00 2001
From: Steve Williams <stevewilliamsuk@outlook.com>
Date: Sat, 4 May 2024 08:51:52 +0100
Subject: [PATCH] Release 4.18.1.

---
 4x/Move Mouse/Classes/Settings.cs        | 15 ---------------
 4x/Move Mouse/Properties/AssemblyInfo.cs |  4 ++--
 4x/Move Mouse/Views/MouseWindow.xaml     | 20 +-------------------
 4x/Move Mouse/Views/SettingsWindow.xaml  | 24 +-----------------------
 4 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/4x/Move Mouse/Classes/Settings.cs b/4x/Move Mouse/Classes/Settings.cs
index 64f385f..6ab7e59 100644
--- a/4x/Move Mouse/Classes/Settings.cs	
+++ b/4x/Move Mouse/Classes/Settings.cs	
@@ -48,7 +48,6 @@ public class Settings : INotifyPropertyChanged
         private bool? _disableButtonAnimation;
         //private bool? _hookKeyEnabled;
         //private Key _hookKey;
-        private bool? _standWithUkraine;
         private bool? _pauseOnBattery;
         private LogEventLevel? _logLevel;
         private bool? _showSystemTrayNotifications;
@@ -480,20 +479,6 @@ public bool DisableButtonAnimation
             }
         }
 
-        public bool StandWithUkraine
-        {
-            get
-            {
-                if (_standWithUkraine == null) _standWithUkraine = false;
-                return _standWithUkraine.Value;
-            }
-            set
-            {
-                _standWithUkraine = value;
-                OnPropertyChanged();
-            }
-        }
-
         public bool PauseOnBattery
         {
             get
diff --git a/4x/Move Mouse/Properties/AssemblyInfo.cs b/4x/Move Mouse/Properties/AssemblyInfo.cs
index efe1c01..4817cc9 100644
--- a/4x/Move Mouse/Properties/AssemblyInfo.cs	
+++ b/4x/Move Mouse/Properties/AssemblyInfo.cs	
@@ -51,5 +51,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("4.18.0.0")]
-[assembly: AssemblyFileVersion("4.18.0.0")]
+[assembly: AssemblyVersion("4.18.1.0")]
+[assembly: AssemblyFileVersion("4.18.1.0")]
diff --git a/4x/Move Mouse/Views/MouseWindow.xaml b/4x/Move Mouse/Views/MouseWindow.xaml
index ecfd50e..2586efd 100644
--- a/4x/Move Mouse/Views/MouseWindow.xaml	
+++ b/4x/Move Mouse/Views/MouseWindow.xaml	
@@ -120,25 +120,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="ProgressBar">
                         <Grid>
-                            <Ellipse>
-                                <Ellipse.Style>
-                                    <Style TargetType="Ellipse">
-                                        <Setter Property="Fill" Value="{StaticResource StandardWindowBackground}"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Path=SettingsVm.Settings.StandWithUkraine, NotifyOnTargetUpdated=True}" Value="True">
-                                                <Setter Property="Fill">
-                                                    <Setter.Value>
-                                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                            <GradientStop Color="#0057b7" Offset="0.5"/>
-                                                            <GradientStop Color="#ffd700" Offset="0.5"/>
-                                                        </LinearGradientBrush>
-                                                    </Setter.Value>
-                                                </Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Ellipse.Style>
-                            </Ellipse>
+                            <Ellipse Fill="{StaticResource StandardWindowBackground}"/>
                             <classes:Arc StrokeThickness="15">
                                 <classes:Arc.Style>
                                     <Style TargetType="classes:Arc">
diff --git a/4x/Move Mouse/Views/SettingsWindow.xaml b/4x/Move Mouse/Views/SettingsWindow.xaml
index 79549d8..537e74c 100644
--- a/4x/Move Mouse/Views/SettingsWindow.xaml	
+++ b/4x/Move Mouse/Views/SettingsWindow.xaml	
@@ -12,7 +12,7 @@
         xmlns:classes="clr-namespace:ellabi.Classes"
         xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
         mc:Ignorable="d"
-        Title="Move Mouse Settings" Height="442" Width="688" Icon="/Resources/Mouse.ico" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" WindowStyle="None" MouseDown="SettingsWindow_OnMouseDown" ShowActivated="True" Loaded="SettingsWindow_OnLoaded">
+        Title="Move Mouse Settings" Height="412" Width="688" Icon="/Resources/Mouse.ico" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" WindowStyle="None" MouseDown="SettingsWindow_OnMouseDown" ShowActivated="True" Loaded="SettingsWindow_OnLoaded">
     <Grid Background="{StaticResource StandardWindowBackground}">
         <Grid.Resources>
             <!--<converters:ObjectToTypeStringConverter x:Key="ObjectToTypeStringConverter"/>-->
@@ -2043,28 +2043,6 @@
                             <toggleSwitch:HorizontalToggleSwitch IsChecked="{Binding Path=Settings.DisableButtonAnimation, NotifyOnTargetUpdated=True, Mode=TwoWay}"/>
                             <TextBlock Margin="5,0,0,0" Text="Disable button animations" Style="{StaticResource LabelTextBlockStyle}"/>
                         </StackPanel>
-                        <StackPanel>
-                            <StackPanel.Style>
-                                <Style TargetType="StackPanel" BasedOn="{StaticResource OptionStackPanelStyle}">
-                                    <Setter Property="Visibility" Value="Visible"/>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Path=Settings.HideMainWindow, NotifyOnTargetUpdated=True}" Value="True">
-                                            <Setter Property="Visibility" Value="Collapsed"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </StackPanel.Style>
-                            <toggleSwitch:HorizontalToggleSwitch IsChecked="{Binding Path=Settings.StandWithUkraine, NotifyOnTargetUpdated=True, Mode=TwoWay}"/>
-                            <TextBlock Margin="5,0,0,0" Text="#StandWithUkraine" Style="{StaticResource LabelTextBlockStyle}"/>
-                            <Grid Margin="10,0,0,0" Height="15" Width="22">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <Rectangle Grid.Row="0" Fill="#0057b7"/>
-                                <Rectangle Grid.Row="1" Fill="#ffd700"/>
-                            </Grid>
-                        </StackPanel>
                         <!--<Grid Height="22">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>