admin/bodyshop-uploader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release for 1.0.15 to fix mutex + black out.

Browse Source
This commit is contained in:
Patrick Fic
2021-04-21 11:39:50 -07:00
parent 574c9f7823
commit fc70a94d5f
9 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BodyshopUploader/Views/Main.xaml
View File

@@ -56,11 +56,12 @@
<tb:TaskbarIcon DockPanel.Dock="Top"
IconSource="../favicon.ico"
DoubleClickCommand="{StaticResource OpenMainWindowCommand}"
DoubleClickCommand="{Binding OpenMainWindowCommand}"
DoubleClickCommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
PopupActivation="LeftClick"
MenuActivation="RightClick"
ToolTipText="Bodyshop Uploader">
<tb:TaskbarIcon.TrayPopup>
>
<!--<tb:TaskbarIcon.TrayPopup>
<Border Background="{DynamicResource MaterialDesignPaper}"
BorderBrush="Black"
BorderThickness="2">
@@ -95,9 +96,12 @@
</ItemsControl>
</DockPanel>
</Border>
</tb:TaskbarIcon.TrayPopup>
</tb:TaskbarIcon.TrayPopup>-->
<tb:TaskbarIcon.ContextMenu>
<ContextMenu>
<MenuItem Header="{x:Static p:Resources.Label_Show}"
Command="{Binding OpenMainWindowCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
<MenuItem Header="{x:Static p:Resources.Label_Restart}"
Command="{Binding StartFolderMonitorsCommand}" />
<MenuItem Header="{x:Static p:Resources.Label_StopAllMonitors}"
@@ -131,9 +135,9 @@
Content="{x:Static p:Resources.Label_AutoStartMonitor}" />
<CheckBox IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}"
Margin="8"
Content="{x:Static p:Resources.Label_StartWithWindows}"
Content="{x:Static p:Resources.Label_StartWithWindows}"
Command="{Binding StartWithWindowsCommand}"
CommandParameter="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}"/>
CommandParameter="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}" />
<Button Command="{Binding AddMonitoringPathCommand, UpdateSourceTrigger=PropertyChanged}"
Margin="8"

8
BodyshopUploader/Views/Main.xaml.cs
View File

@@ -32,10 +32,10 @@ namespace BodyshopPartner.Views
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
//e.Cancel = true ;
//this.Hide();
Utils.HTTPServer.tokenSource.Cancel();
Application.Current.Shutdown();
e.Cancel = true;
this.Hide();
//Utils.HTTPServer.tokenSource.Cancel();
//Application.Current.Shutdown();
}
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)