From c80bb52fb994f6c878ff2142819092b4c60e4e2d Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sat, 23 Nov 2024 12:45:09 +0200 Subject: [PATCH] fix gititnore, add ico --- .gitignore | 2 +- Azaion.Annotator/Annotator.xaml.cs | 2 -- Azaion.Common/DTO/LoginResponse.cs | 6 ++++++ Azaion.Dataset/DatasetExplorer.xaml.cs | 8 +------- Azaion.Dataset/DatasetExplorerEventHandler.cs | 2 +- Azaion.Suite/App.xaml.cs | 4 +++- logo.ico | Bin 0 -> 2686 bytes 7 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 Azaion.Common/DTO/LoginResponse.cs create mode 100644 logo.ico diff --git a/.gitignore b/.gitignore index 8b9cbb4..10391fc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ obj .vs *.DotSettings* *.user -log* \ No newline at end of file +log*.txt \ No newline at end of file diff --git a/Azaion.Annotator/Annotator.xaml.cs b/Azaion.Annotator/Annotator.xaml.cs index e570b93..d5c3507 100644 --- a/Azaion.Annotator/Annotator.xaml.cs +++ b/Azaion.Annotator/Annotator.xaml.cs @@ -415,8 +415,6 @@ public partial class Annotator _mediaPlayer.Stop(); _mediaPlayer.Dispose(); _libVLC.Dispose(); - - Application.Current.Shutdown(); } private void OpenContainingFolder(object sender, RoutedEventArgs e) diff --git a/Azaion.Common/DTO/LoginResponse.cs b/Azaion.Common/DTO/LoginResponse.cs new file mode 100644 index 0000000..b2a027b --- /dev/null +++ b/Azaion.Common/DTO/LoginResponse.cs @@ -0,0 +1,6 @@ +namespace Azaion.Common.DTO; + +public class LoginResponse +{ + public string Token { get; set; } = null!; +} \ No newline at end of file diff --git a/Azaion.Dataset/DatasetExplorer.xaml.cs b/Azaion.Dataset/DatasetExplorer.xaml.cs index 56df701..6159ca4 100644 --- a/Azaion.Dataset/DatasetExplorer.xaml.cs +++ b/Azaion.Dataset/DatasetExplorer.xaml.cs @@ -89,13 +89,7 @@ public partial class DatasetExplorer DataContext = this; }; - Closing += (sender, args) => - { - args.Cancel = true; - Visibility = Visibility.Hidden; - }; - - ThumbnailsView.KeyDown += async (sender, args) => + ThumbnailsView.KeyDown += async (sender, args) => { switch (args.Key) { diff --git a/Azaion.Dataset/DatasetExplorerEventHandler.cs b/Azaion.Dataset/DatasetExplorerEventHandler.cs index 72eff92..6db0ab0 100644 --- a/Azaion.Dataset/DatasetExplorerEventHandler.cs +++ b/Azaion.Dataset/DatasetExplorerEventHandler.cs @@ -22,7 +22,7 @@ public class DatasetExplorerEventHandler(DatasetExplorer datasetExplorer, IGalle public async Task Handle(KeyEvent keyEvent, CancellationToken cancellationToken) { - if (keyEvent.WindowEnum != WindowEnum.Annotator) + if (keyEvent.WindowEnum != WindowEnum.DatasetExplorer) return; var key = keyEvent.Args.Key; diff --git a/Azaion.Suite/App.xaml.cs b/Azaion.Suite/App.xaml.cs index 3265eb1..089c156 100644 --- a/Azaion.Suite/App.xaml.cs +++ b/Azaion.Suite/App.xaml.cs @@ -44,6 +44,7 @@ public partial class App static App() { + //Load encrypted dlls var result = Parser.Default.ParseArguments(Environment.GetCommandLineArgs()); if (result.Errors.Any()) return; @@ -158,8 +159,9 @@ public partial class App protected override async void OnExit(ExitEventArgs e) { + base.OnExit(e); + await _host.StopAsync(); _host.Dispose(); - base.OnExit(e); } } \ No newline at end of file diff --git a/logo.ico b/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..8addc0030a4b01a0caaf55bfd1475922407a9f0d GIT binary patch literal 2686 zcmeHJJ5B>J6r5F%98mxj?Y8tBAUO`DJG)zVn~p2_0NjB+LOLQPikW#PWD{tR_y}od z^WNC+XZx)-GSKi@E^i<_TmrY`JIa!hC=D*C3Hm-qs(~q4yflZDgq$-|iv3WEMif3W zNllnKFm>P`cfiAiAo1`)8sOaEstzIg*oWZyxO((+A4BM!M^vZ~&{J{Nd5-3u*}*Z2 z7Oxn$;uIzC=O(4F2e(i-$`Ojb}AI)b`UzutzzW_V)cpaW`1n&66 zpd%jL^}wTmQ^R{d4jBi7GMv58w~o|+QG4jDZ{TPBU9G%Z zR9;_K9$e+zRJMyqDSQ6^$glxg@fxs%0hno?co7n7_oSV8Vd0j*a7)NyCM0pAszPVs xOkj1P9gN^|