diff --git a/PrinterApp/App.xaml.cs b/PrinterApp/App.xaml.cs index 968da09..d48704e 100644 --- a/PrinterApp/App.xaml.cs +++ b/PrinterApp/App.xaml.cs @@ -87,6 +87,7 @@ private void MainWindowClosing(object? sender, System.ComponentModel.CancelEvent return; } + Marketing.ManualShutdown(); _printerModel.SocketsClose(); _autoUpdater.StopTimer(); Current.Shutdown(); diff --git a/PrinterApp/MainWindow.xaml b/PrinterApp/MainWindow.xaml index acde9f4..e487e2b 100644 --- a/PrinterApp/MainWindow.xaml +++ b/PrinterApp/MainWindow.xaml @@ -12,7 +12,7 @@ ResizeMode="NoResize" Topmost="True" ShowInTaskbar="False" - d:DataContext="{d:DesignInstance local:PrinterViewModel}"> + d:DataContext="{d:DesignInstance local:PrinterViewModel}" Focusable="False"> @@ -43,11 +43,12 @@ + Visibility="{Binding PrintQrVisibility}" Focusable="False" /> + Fill="{DynamicResource Labels.Foreground}" Focusable="False" /> + Foreground="{DynamicResource Labels.Foreground}" FontFamily="Roboto" FontWeight="Bold" + Focusable="False"> @@ -59,24 +60,25 @@ + FontWeight="Bold" Focusable="False" /> + TextWrapping="Wrap" Foreground="{DynamicResource Labels.Foreground}" FontWeight="Bold" + Focusable="False" /> + FontWeight="Bold" Focusable="False" /> + FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Focusable="False" /> + Canvas.Top="591" HorizontalAlignment="Center" VerticalAlignment="Top" Focusable="False" /> + Canvas.Top="591" HorizontalAlignment="Left" VerticalAlignment="Center" Focusable="False" /> + HorizontalAlignment="Left" VerticalAlignment="Top" Focusable="False" /> @@ -88,7 +90,7 @@ IsEnabled="{Binding DownloadNotInProgress}" TextAlignment="Center" Style="{DynamicResource MyTextBoxStyle1}" VerticalContentAlignment="Center" - HorizontalContentAlignment="Center" Margin="0,29,0,105" /> + HorizontalContentAlignment="Center" Margin="0,29,0,105" TabIndex="1" /> @@ -107,9 +109,9 @@ Background="Red" Foreground="White" Content="{Binding ErrorTextBlockText, FallbackValue=123}" Padding="0,0,0,0" Margin="0,157,0,0" Visibility="{Binding ErrorTextBlockVisibility}" /> -