Skip to content

Commit 5e1f819

Browse files
sw3103sw3103
committed
Release 4.18.2.
1 parent 3d3914c commit 5e1f819

File tree

7 files changed

+98
-30
lines changed

7 files changed

+98
-30
lines changed

‎4x/Move Mouse/Classes/Settings.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class Settings : INotifyPropertyChanged
5252
private LogEventLevel? _logLevel;
5353
private bool? _showSystemTrayNotifications;
5454
//private bool? _reactivatePreviousWindow;
55+
private bool? _showTaskbarStatus;
5556

5657
public int LowerInterval
5758
{
@@ -535,6 +536,20 @@ public bool ShowSystemTrayNotifications
535536
// }
536537
//}
537538

539+
public bool ShowTaskbarStatus
540+
{
541+
get
542+
{
543+
if (_showTaskbarStatus == null) _showTaskbarStatus = true;
544+
return _showTaskbarStatus.Value;
545+
}
546+
set
547+
{
548+
_showTaskbarStatus = value;
549+
OnPropertyChanged();
550+
}
551+
}
552+
538553
[XmlArrayItem(Type = typeof(ActionBase)),
539554
XmlArrayItem(Type = typeof(MoveMouseCursorAction)),
540555
XmlArrayItem(Type = typeof(ClickMouseAction)),

‎4x/Move Mouse/Move Mouse.csproj‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,25 @@
7979
<Reference Include="Hardcodet.NotifyIcon.Wpf, Version=1.1.0.0, Culture=neutral, PublicKeyToken=682384a853a08aad, processorArchitecture=MSIL">
8080
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll</HintPath>
8181
</Reference>
82+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
84+
</Reference>
8285
<Reference Include="Microsoft.CSharp" />
8386
<Reference Include="Microsoft.Expression.Drawing, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8487
<HintPath>..\packages\Microsoft.Expression.Drawing.3.0.0\lib\net45\Microsoft.Expression.Drawing.dll</HintPath>
8588
</Reference>
86-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
89+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
90+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
91+
</Reference>
92+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
93+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
8894
</Reference>
8995
<Reference Include="Microsoft.VisualBasic" />
90-
<Reference Include="Quartz, Version=3.7.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Quartz.3.7.0\lib\net472\Quartz.dll</HintPath>
96+
<Reference Include="Quartz, Version=3.9.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Quartz.3.9.0\lib\net472\Quartz.dll</HintPath>
9298
</Reference>
9399
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Serilog.3.0.1\lib\net471\Serilog.dll</HintPath>
100+
<HintPath>..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
95101
</Reference>
96102
<Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
97103
<HintPath>..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
@@ -103,8 +109,8 @@
103109
<Reference Include="System.ComponentModel.Composition" />
104110
<Reference Include="System.Configuration" />
105111
<Reference Include="System.Data" />
106-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
107-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
112+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
113+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
108114
</Reference>
109115
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110116
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -211,6 +217,9 @@
211217
<Private>True</Private>
212218
<Private>True</Private>
213219
</Reference>
220+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
221+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
222+
</Reference>
214223
<Reference Include="System.Transactions" />
215224
<Reference Include="System.Windows.Forms" />
216225
<Reference Include="System.Xml" />
@@ -233,20 +242,20 @@
233242
<Reference Include="WindowsBase" />
234243
<Reference Include="PresentationCore" />
235244
<Reference Include="PresentationFramework" />
236-
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
237-
<HintPath>..\packages\Extended.Wpf.Toolkit.4.5.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
245+
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
246+
<HintPath>..\packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
238247
</Reference>
239-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
240-
<HintPath>..\packages\Extended.Wpf.Toolkit.4.5.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
248+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
249+
<HintPath>..\packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
241250
</Reference>
242-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
243-
<HintPath>..\packages\Extended.Wpf.Toolkit.4.5.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
251+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
252+
<HintPath>..\packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
244253
</Reference>
245-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
246-
<HintPath>..\packages\Extended.Wpf.Toolkit.4.5.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
254+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
255+
<HintPath>..\packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
247256
</Reference>
248-
<Reference Include="Xceed.Wpf.Toolkit, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
249-
<HintPath>..\packages\Extended.Wpf.Toolkit.4.5.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
257+
<Reference Include="Xceed.Wpf.Toolkit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
258+
<HintPath>..\packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
250259
</Reference>
251260
</ItemGroup>
252261
<ItemGroup>
@@ -607,9 +616,9 @@
607616
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
608617
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
609618
<Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
610-
<Error Condition="!Exists('..\packages\Fody.6.8.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.0\build\Fody.targets'))" />
619+
<Error Condition="!Exists('..\packages\Fody.6.8.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.1\build\Fody.targets'))" />
611620
</Target>
612621
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
613622
<Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
614-
<Import Project="..\packages\Fody.6.8.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.0\build\Fody.targets')" />
623+
<Import Project="..\packages\Fody.6.8.1\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.1\build\Fody.targets')" />
615624
</Project>

‎4x/Move Mouse/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("4.18.1.0")]
55-
[assembly: AssemblyFileVersion("4.18.1.0")]
54+
[assembly: AssemblyVersion("4.18.2.0")]
55+
[assembly: AssemblyFileVersion("4.18.2.0")]

‎4x/Move Mouse/Views/MouseWindow.xaml.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,30 @@ private void _vm_MouseStateChanged(object sender, MouseWindowViewModel.MouseStat
165165

166166
try
167167
{
168+
try
169+
{
170+
if (_vm.SettingsVm.Settings.ShowTaskbarStatus)
171+
{
172+
Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate
173+
{
174+
if (TaskbarItemInfo != null)
175+
{
176+
TaskbarItemInfo.ProgressState =
177+
state.Equals(MouseWindowViewModel.MouseState.Running) ? TaskbarItemProgressState.Normal :
178+
state.Equals(MouseWindowViewModel.MouseState.Executing) ? TaskbarItemProgressState.Error :
179+
state.Equals(MouseWindowViewModel.MouseState.Paused) ? TaskbarItemProgressState.Paused :
180+
state.Equals(MouseWindowViewModel.MouseState.Sleeping) ? TaskbarItemProgressState.Paused :
181+
state.Equals(MouseWindowViewModel.MouseState.OnBattery) ? TaskbarItemProgressState.Paused :
182+
TaskbarItemProgressState.None;
183+
}
184+
}));
185+
}
186+
}
187+
catch (Exception ex)
188+
{
189+
StaticCode.Logger?.Here().Error(ex.Message);
190+
}
191+
168192
//Debug.WriteLine($"state = {state}");
169193
var duration = _vm.ExecutionTime.Subtract(DateTime.Now);
170194
//Debug.WriteLine($"duration = {duration}");

‎4x/Move Mouse/Views/SettingsWindow.xaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
xmlns:classes="clr-namespace:ellabi.Classes"
1313
xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
1414
mc:Ignorable="d"
15-
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">
15+
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">
1616
<Grid Background="{StaticResource StandardWindowBackground}">
1717
<Grid.Resources>
1818
<!--<converters:ObjectToTypeStringConverter x:Key="ObjectToTypeStringConverter"/>-->
@@ -1914,6 +1914,23 @@
19141914
<TextBlock Margin="5,0,0,0" Text="Hide from taskbar" Style="{StaticResource LabelTextBlockStyle}"/>
19151915
</StackPanel>
19161916
<!--todo this should hide overrides for title and icon-->
1917+
<StackPanel>
1918+
<StackPanel.Style>
1919+
<Style TargetType="StackPanel" BasedOn="{StaticResource OptionStackPanelStyle}">
1920+
<Setter Property="Visibility" Value="Visible"/>
1921+
<Style.Triggers>
1922+
<DataTrigger Binding="{Binding Path=Settings.HideMainWindow, NotifyOnTargetUpdated=True}" Value="True">
1923+
<Setter Property="Visibility" Value="Collapsed"/>
1924+
</DataTrigger>
1925+
<DataTrigger Binding="{Binding Path=Settings.HideFromTaskbar, NotifyOnTargetUpdated=True}" Value="True">
1926+
<Setter Property="Visibility" Value="Collapsed"/>
1927+
</DataTrigger>
1928+
</Style.Triggers>
1929+
</Style>
1930+
</StackPanel.Style>
1931+
<toggleSwitch:HorizontalToggleSwitch IsChecked="{Binding Path=Settings.ShowTaskbarStatus, NotifyOnTargetUpdated=True, Mode=TwoWay}"/>
1932+
<TextBlock Margin="5,0,0,0" Text="Show status on taskbar" Style="{StaticResource LabelTextBlockStyle}"/>
1933+
</StackPanel>
19171934
<StackPanel>
19181935
<StackPanel.Style>
19191936
<Style TargetType="StackPanel" BasedOn="{StaticResource OptionStackPanelStyle}">

‎4x/Move Mouse/packages.config‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@
55
<package id="Common.Logging" version="3.4.1" targetFramework="net472" />
66
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net472" />
77
<package id="Costura.Fody" version="5.7.0" targetFramework="net472" developmentDependency="true" />
8-
<package id="Extended.Wpf.Toolkit" version="4.5.1" targetFramework="net472" />
9-
<package id="Fody" version="6.8.0" targetFramework="net472" developmentDependency="true" />
8+
<package id="Extended.Wpf.Toolkit" version="4.6.0" targetFramework="net472" />
9+
<package id="Fody" version="6.8.1" targetFramework="net472" developmentDependency="true" />
1010
<package id="Hardcodet.NotifyIcon.Wpf" version="1.1.0" targetFramework="net472" />
11+
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
1112
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
1213
<package id="Microsoft.Expression.Drawing" version="3.0.0" targetFramework="net472" />
13-
<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.1" targetFramework="net472" />
14+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net472" />
15+
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net472" />
1416
<package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net472" />
1517
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
16-
<package id="Quartz" version="3.7.0" targetFramework="net472" />
17-
<package id="Serilog" version="3.0.1" targetFramework="net472" />
18+
<package id="Quartz" version="3.9.0" targetFramework="net472" />
19+
<package id="Serilog" version="3.1.1" targetFramework="net472" />
1820
<package id="Serilog.Sinks.File" version="5.0.0" targetFramework="net472" />
1921
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
2022
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
2123
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
2224
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
23-
<package id="System.Diagnostics.DiagnosticSource" version="7.0.2" targetFramework="net472" />
25+
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
2426
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
2527
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
2628
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
@@ -52,6 +54,7 @@
5254
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net472" />
5355
<package id="System.Threading" version="4.3.0" targetFramework="net472" />
5456
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
57+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
5558
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
5659
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net472" />
5760
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />

‎Update_4x.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<Update>
2-
<LatestVersion>4.18.0</LatestVersion>
3-
<DownloadUrl>https://github.com/sw3103/movemouse/releases/tag/v4.18.0</DownloadUrl>
2+
<LatestVersion>4.18.2</LatestVersion>
3+
<DownloadUrl>https://github.com/sw3103/movemouse/releases/tag/v4.18.2</DownloadUrl>
44
</Update>

0 commit comments

Comments
 (0)