Remove tray functionality from Partner App.

This commit is contained in:
Patrick Fic
2020-12-03 14:51:23 -08:00
parent 2acc8faa5b
commit 27960e9418
7 changed files with 56 additions and 51 deletions

View File

@@ -4,7 +4,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:p="clr-namespace:BodyshopPartner.Properties"
xmlns:properties="clr-namespace:BodyshopPartner.Properties"
xmlns:util="clr-namespace:BodyshopPartner.Utils"
@@ -21,7 +20,8 @@
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}"
Loaded="Window_Loaded"
Closing="Window_Closing">
Closing="Window_Closing"
>
<Window.DataContext>
<vm:MainViewModel />
</Window.DataContext>
@@ -54,7 +54,7 @@
IsIndeterminate="{Binding IndeterminateLoading}"
Height="8" />
<tb:TaskbarIcon DockPanel.Dock="Top"
<!--<tb:TaskbarIcon DockPanel.Dock="Top"
IconSource="../favicon.ico"
DoubleClickCommand="{StaticResource OpenMainWindowCommand}"
PopupActivation="LeftClick"
@@ -106,7 +106,7 @@
Command="{Binding QuitCommand}" />
</ContextMenu>
</tb:TaskbarIcon.ContextMenu>
</tb:TaskbarIcon>
</tb:TaskbarIcon>-->
<StackPanel DockPanel.Dock="Right">

View File

@@ -32,8 +32,10 @@ namespace BodyshopPartner.Views
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
e.Cancel = true ;
this.Hide();
//e.Cancel = true ;
//this.Hide();
Utils.HTTPServer.tokenSource.Cancel();
Application.Current.Shutdown();
}
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
@@ -41,5 +43,6 @@ namespace BodyshopPartner.Views
Properties.Settings.Default.QuickBooksFilePath = ((System.Windows.Controls.TextBox)sender).Text;
Properties.Settings.Default.Save();
}
}
}