Skip to content

Commit

Permalink
Release 4.18.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sw3103
sw3103 committed May 4, 2024
1 parent 8c8fc11 commit 3d3914c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 59 deletions.
15 changes: 0 additions & 15 deletions 4x/Move Mouse/Classes/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 4x/Move Mouse/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
20 changes: 1 addition & 19 deletions 4x/Move Mouse/Views/MouseWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
24 changes: 1 addition & 23 deletions 4x/Move Mouse/Views/SettingsWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>-->
Expand Down Expand Up @@ -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"/>
Expand Down

0 comments on commit 3d3914c

Please sign in to comment.