From ec5320ee1f4d942e66cb91d36ffbb752458f9234 Mon Sep 17 00:00:00 2001
From: chenzhaoji <chenzhaoji@genomics.cn>
Date: Mon, 17 Jul 2023 11:27:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=85=E5=8D=87=E7=BA=A7=EF=BC=9B?=
 =?UTF-8?q?=E5=BA=9F=E5=BC=83package=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=9Fexe=E6=A8=A1=E5=BC=8F=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OMDb.Core/Helpers/ImageHelper.cs              |  14 ++++------
 OMDb.Core/Helpers/RandomHelper.cs             |   4 +--
 OMDb.Core/OMDb.Core.csproj                    |  18 ++++++------
 OMDb.Core/Services/DbService.cs               |   1 -
 OMDb.Core/Utils/Logger.cs                     |   4 +--
 OMDb.Douban/OMDb.Douban.csproj                |   4 +--
 .../Dialogs/AddEntryBatchDialog.xaml.cs       |   1 -
 .../OMDb.WinUI3/Helpers/WindowHelper.cs       |  12 +++++++-
 .../MyControls/StorageCard.xaml.cs            |   1 -
 OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj    |  26 +++++++++++++++---
 .../Properties/launchSettings.json            |   7 +++++
 .../OMDb.WinUI3/Services/ActivationService.cs |   2 +-
 .../OMDb.WinUI3/Services/ConfigService.cs     |   1 -
 .../OMDb.WinUI3/Services/ExcelService.cs      |   3 +-
 .../ViewModels/ClassificationViewModel.cs     |   1 -
 .../ViewModels/LabelCollectionViewModel.cs    |   1 -
 .../ViewModels/LabelPropertyViewModel.cs      |   3 --
 .../OMDb.WinUI3/ViewModels/LabelViewModel.cs  |   2 --
 .../ViewModels/StorageViewModel.cs            |   1 -
 .../Management/LabelPropertyPage.xaml.cs      |   1 -
 .../OMDb.WinUI3/Views/Tools/ToolPageBase.cs   |   1 -
 .../OMDb.WinUI3/Wins/MainWindow.xaml.cs       |   3 ++
 OMDb.WinUI3/OMDb.WinUI3/app.manifest          |   9 ++++--
 OMDb.WinUI3/OMDb.WinUI3/logo_32.ico           | Bin 0 -> 4286 bytes
 OMDb.WinUI3/OMDb.WinUI3/logo_32.png           | Bin 0 -> 838 bytes
 25 files changed, 70 insertions(+), 50 deletions(-)
 create mode 100644 OMDb.WinUI3/OMDb.WinUI3/Properties/launchSettings.json
 create mode 100644 OMDb.WinUI3/OMDb.WinUI3/logo_32.ico
 create mode 100644 OMDb.WinUI3/OMDb.WinUI3/logo_32.png

diff --git a/OMDb.Core/Helpers/ImageHelper.cs b/OMDb.Core/Helpers/ImageHelper.cs
index 6c04f04..f15a3ef 100644
--- a/OMDb.Core/Helpers/ImageHelper.cs
+++ b/OMDb.Core/Helpers/ImageHelper.cs
@@ -1,13 +1,9 @@
-using ImageMagick;
-using OMDb.Core.Const;
+using OMDb.Core.Const;
 using OMDb.Core.Models;
 using OMDb.Core.Services;
 using OMDb.Core.Utils.Extensions;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors;
 using System.Net;
+using ImageInfo = OMDb.Core.Models.ImageInfo;
 
 namespace OMDb.Core.Helpers
 {
@@ -17,12 +13,12 @@ public static void GetImageSize(string path, out double Wpx, out double Hpx)
         {
             try
             {
-                MagickImageInfo image = new MagickImageInfo(path);
+                ImageMagick.MagickImageInfo image = new ImageMagick.MagickImageInfo(path);
                 int w = image.Width;//宽
                 int h = image.Height;//高
                 Wpx = image.Density.X;//分辨率
                 Hpx = image.Density.Y;//分辨率
-                if (image.Density.Units == DensityUnit.PixelsPerCentimeter)//判断分辨率单位
+                if (image.Density.Units == ImageMagick.DensityUnit.PixelsPerCentimeter)//判断分辨率单位
                 {
                     Wpx *= 2.54;
                     Hpx *= 2.54;
@@ -38,7 +34,7 @@ public static ImageInfo GetImageInfo(string path)
             try
             {
                 ImageInfo imageInfo = new ImageInfo();
-                MagickImageInfo image = new MagickImageInfo(path);
+                ImageMagick.MagickImageInfo image = new ImageMagick.MagickImageInfo(path);
                 imageInfo.Width = image.Width;
                 imageInfo.Height = image.Height;
                 imageInfo.FullPath = path;
diff --git a/OMDb.Core/Helpers/RandomHelper.cs b/OMDb.Core/Helpers/RandomHelper.cs
index 2e8ffaf..f32867d 100644
--- a/OMDb.Core/Helpers/RandomHelper.cs
+++ b/OMDb.Core/Helpers/RandomHelper.cs
@@ -1,6 +1,4 @@
-using Google.Protobuf.WellKnownTypes;
-using Org.BouncyCastle.Utilities;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
diff --git a/OMDb.Core/OMDb.Core.csproj b/OMDb.Core/OMDb.Core.csproj
index 1e62478..bf34e3c 100644
--- a/OMDb.Core/OMDb.Core.csproj
+++ b/OMDb.Core/OMDb.Core.csproj
@@ -8,18 +8,18 @@
 
 	<ItemGroup>
 		<PackageReference Include="DotNetCore.NPOI" Version="1.2.3" />
-		<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
-		<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="12.2.1" />
-		<PackageReference Include="Magick.NET.Core" Version="12.2.1" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageReference Include="NLog" Version="5.1.2" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
-		<PackageReference Include="SqlSugarCore" Version="5.1.3.34" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
+		<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.1.3" />
+		<PackageReference Include="Magick.NET.Core" Version="13.1.3" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog" Version="5.2.2" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.91" />
 		<PackageReference Include="System.Composition.AttributedModel" Version="7.0.0" />
 		<PackageReference Include="System.Composition.Convention" Version="7.0.0" />
 		<PackageReference Include="System.Composition.TypedParts" Version="7.0.0" />
-		<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
-		<PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
+		<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
+		<PackageReference Include="Xabe.FFmpeg" Version="5.2.6" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/OMDb.Core/Services/DbService.cs b/OMDb.Core/Services/DbService.cs
index 1a5eaf7..7d45e9b 100644
--- a/OMDb.Core/Services/DbService.cs
+++ b/OMDb.Core/Services/DbService.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace OMDb.Core.Services
 {
diff --git a/OMDb.Core/Utils/Logger.cs b/OMDb.Core/Utils/Logger.cs
index 4b7f37c..a722b8e 100644
--- a/OMDb.Core/Utils/Logger.cs
+++ b/OMDb.Core/Utils/Logger.cs
@@ -1,6 +1,4 @@
-using Google.Protobuf.WellKnownTypes;
-using Org.BouncyCastle.Utilities;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
diff --git a/OMDb.Douban/OMDb.Douban.csproj b/OMDb.Douban/OMDb.Douban.csproj
index 9da4e8b..603ee12 100644
--- a/OMDb.Douban/OMDb.Douban.csproj
+++ b/OMDb.Douban/OMDb.Douban.csproj
@@ -8,8 +8,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
-		<PackageReference Include="NLog" Version="5.1.2" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
+		<PackageReference Include="NLog" Version="5.2.2" />
 		<PackageReference Include="System.Composition.AttributedModel" Version="7.0.0" />
 	</ItemGroup>
 
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Dialogs/AddEntryBatchDialog.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Dialogs/AddEntryBatchDialog.xaml.cs
index 8009c81..6cf7f22 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Dialogs/AddEntryBatchDialog.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Dialogs/AddEntryBatchDialog.xaml.cs
@@ -18,7 +18,6 @@
 using OMDb.WinUI3.Services;
 using OMDb.WinUI3.Services.Settings;
 using OMDb.WinUI3.ViewModels;
-using Org.BouncyCastle.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Helpers/WindowHelper.cs b/OMDb.WinUI3/OMDb.WinUI3/Helpers/WindowHelper.cs
index 8752ce4..072a248 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Helpers/WindowHelper.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Helpers/WindowHelper.cs
@@ -1,4 +1,5 @@
 using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
 
 namespace OMDb.WinUI3.Helpers
@@ -45,6 +46,15 @@ public static void SetMainWindow(Window window)
         {
             MainWindow = window;
         }
-
+        public static IntPtr GetWindowHandle(Window window)
+        {
+            return WinRT.Interop.WindowNative.GetWindowHandle(window);
+        }
+        public static Microsoft.UI.Windowing.AppWindow GetAppWindow(Window window)
+        {
+            var hWnd = GetWindowHandle(window);
+            Microsoft.UI.WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(hWnd);
+            return Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
+        }
     }
 }
diff --git a/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs
index 646ad6f..89d5b94 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs
@@ -9,7 +9,6 @@
 using OMDb.WinUI3.Helpers;
 using OMDb.WinUI3.Models;
 using OMDb.WinUI3.ViewModels;
-using Org.BouncyCastle.Asn1.X509;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj b/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
index 46a9d57..5060af0 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
+++ b/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
@@ -9,6 +9,14 @@
 		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<UseWinUI>true</UseWinUI>
 		<BaseOutputPath>bin\</BaseOutputPath>
+		<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+		<!--package需注释掉-->
+		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+		<WindowsPackageType>None</WindowsPackageType>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<AssemblyName>OMDb</AssemblyName>
+		<!--package需注释掉-->
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="Enums\**" />
@@ -94,13 +102,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
 		<PackageReference Include="DotNetCore.NPOI" Version="1.2.3" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221116.1" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
-		<PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
+		<PackageReference Include="Xabe.FFmpeg" Version="5.2.6" />
 		<Manifest Include="$(ApplicationManifest)" />
 	</ItemGroup>
 
@@ -372,10 +380,20 @@
 		<Folder Include="Assets\FFmpeg\" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Include="Properties\PublishProfiles\win10-x64.pubxml.user" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <Page Update="MyControls\ExplorerControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
+	  <None Update="logo_32.ico">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="logo_32.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
 	  <None Update="nlog.config">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Properties/launchSettings.json b/OMDb.WinUI3/OMDb.WinUI3/Properties/launchSettings.json
new file mode 100644
index 0000000..fa74c24
--- /dev/null
+++ b/OMDb.WinUI3/OMDb.WinUI3/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "OMDb": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Services/ActivationService.cs b/OMDb.WinUI3/OMDb.WinUI3/Services/ActivationService.cs
index a3bc78a..944fc7e 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Services/ActivationService.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Services/ActivationService.cs
@@ -10,7 +10,7 @@ public static class ActivationService
     {
         public static void Init()
         {
-            Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
+            //Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
             ConfigService.Load();
             //SettingService.Load();
             RecentFileService.Init();
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Services/ConfigService.cs b/OMDb.WinUI3/OMDb.WinUI3/Services/ConfigService.cs
index dc6280c..9874a2a 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Services/ConfigService.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Services/ConfigService.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json;
 using OMDb.WinUI3.Models;
 using OMDb.WinUI3.Services.Settings;
-using Org.BouncyCastle.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs b/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs
index becbf2c..16ee0e0 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs
@@ -1,5 +1,4 @@
-using Google.Protobuf.WellKnownTypes;
-using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.Core;
 using NPOI.OpenXmlFormats.Vml;
 using NPOI.POIFS.FileSystem;
 using NPOI.SS.Formula;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ClassificationViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ClassificationViewModel.cs
index 6542514..66ca9bc 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ClassificationViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ClassificationViewModel.cs
@@ -2,7 +2,6 @@
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
-using MySqlX.XDevAPI.Common;
 using OMDb.Core.Enums;
 using OMDb.Core.Helpers;
 using OMDb.Core.Models;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelCollectionViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelCollectionViewModel.cs
index 443bf33..6bffc66 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelCollectionViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelCollectionViewModel.cs
@@ -1,6 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Google.Protobuf.WellKnownTypes;
 using Microsoft.UI.Xaml.Controls;
 using OMDb.Core.DbModels;
 using OMDb.Core.Models;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelPropertyViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelPropertyViewModel.cs
index aa20871..483f314 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelPropertyViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelPropertyViewModel.cs
@@ -1,7 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml.Media;
-using MySqlX.XDevAPI.Common;
 using Newtonsoft.Json;
 using OMDb.WinUI3.Models;
 using OMDb.WinUI3.Services;
@@ -14,7 +13,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-//using Microsoft.UI.Xaml.Media;
 using Microsoft.UI;
 using System.Xml.Linq;
 using Microsoft.UI.Xaml;
@@ -24,7 +22,6 @@
 using OMDb.WinUI3.Services.Settings;
 using System.ComponentModel.Design;
 using OMDb.Core.DbModels;
-using Org.BouncyCastle.Crypto;
 
 namespace OMDb.WinUI3.ViewModels
 {
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelViewModel.cs
index 0bca561..f50448e 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelViewModel.cs
@@ -1,7 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml.Media;
-using MySqlX.XDevAPI.Common;
 using Newtonsoft.Json;
 using OMDb.WinUI3.Models;
 using OMDb.WinUI3.Services;
@@ -14,7 +13,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-//using Microsoft.UI.Xaml.Media;
 using Microsoft.UI;
 using System.Xml.Linq;
 using Microsoft.UI.Xaml;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/StorageViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/StorageViewModel.cs
index 0de896d..e836b7a 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/StorageViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/StorageViewModel.cs
@@ -1,6 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Google.Protobuf.WellKnownTypes;
 using Newtonsoft.Json;
 using OMDb.Core.DbModels;
 using OMDb.Core.Models;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Views/Management/LabelPropertyPage.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Views/Management/LabelPropertyPage.xaml.cs
index 7ca35d1..d2efe90 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Views/Management/LabelPropertyPage.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Views/Management/LabelPropertyPage.xaml.cs
@@ -5,7 +5,6 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
-using MySqlX.XDevAPI.Common;
 using OMDb.Core.Services;
 using OMDb.Core.Utils;
 using OMDb.Core.Utils.Extensions;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Views/Tools/ToolPageBase.cs b/OMDb.WinUI3/OMDb.WinUI3/Views/Tools/ToolPageBase.cs
index 69fdc36..058c5e1 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Views/Tools/ToolPageBase.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Views/Tools/ToolPageBase.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Ubiety.Dns.Core;
 
 namespace OMDb.WinUI3.Views.Tools
 {
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
index e402cb4..6a41ad7 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
@@ -2,7 +2,9 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using OMDb.Core.Services.PluginsService;
+using OMDb.WinUI3.Helpers;
 using OMDb.WinUI3.Services;
+using System;
 using System.Runtime.InteropServices; // For DllImport
 using WinRT; // required to support Window.As<ICompositionSupportsSystemBackdrop>()
 
@@ -16,6 +18,7 @@ public MainWindow()
         {
             this.InitializeComponent();
             this.Title = "OMDb";
+            WindowHelper.GetAppWindow(this).SetIcon(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logo_32.ico"));
             Helpers.WindowHelper.TrackWindow(this);
             Helpers.WindowHelper.SetMainWindow(this);
             ExtendsContentIntoTitleBar = true;
diff --git a/OMDb.WinUI3/OMDb.WinUI3/app.manifest b/OMDb.WinUI3/OMDb.WinUI3/app.manifest
index f4650c2..b081d26 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/app.manifest
+++ b/OMDb.WinUI3/OMDb.WinUI3/app.manifest
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="OMDb.WinUI3.app"/>
-
+	<assemblyIdentity version="1.0.0.0" name="OMDb.WinUI3.app"/>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<!-- Windows 10 and Windows 11 -->
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <!-- The combination of below two tags have the following effect:
diff --git a/OMDb.WinUI3/OMDb.WinUI3/logo_32.ico b/OMDb.WinUI3/OMDb.WinUI3/logo_32.ico
new file mode 100644
index 0000000000000000000000000000000000000000..429d2bad9a1c1f0c46d90d754fdedd0f491b1ffa
GIT binary patch
literal 4286
zcmchb!An&^6vmIXNF*>^yrn+GMYL!kw62w_R{aI7TeNtzF3VN8YwM;KK^tk|A_^jF
zV^E-w5F(`(2|cJ3lU`&^-*<WEaXikw-nrZyIo_Ew=X}32Z^pSiMf&j5YzlwN!_y)S
z5jg{cOD@9b&l={cwpY&@P1rTqBiI`33v9P*?9<0N#x$#Pd>*vU!Ct^ZqA};J*Gm~A
z|3M-%R^$B?CS$=IhkdSrt@TiAyi6U4n}GeQk*zgQbE2pQ%#Xo%rZlJSC$-1&YQWsm
ze`M=gmSTKxXO4lbHO$x=z#W18IYvHNBU%IcvoZF{>nkDF)>dxoIu1S8SMP?ck8_9o
z5&c>6;XeiY8kz5Dw6~sSW$b)^8{WJ;-}C#Ncgw9Tt|XsKvM+m`*m(c<k3jv{9DS^-
z^Ru18rxw|_@-(fVeC~(!**-rTZ6()FEwZ0joxFY#U-yT6){(#`dp(b7{ds(zH*KHZ
z-^<tue6ma3cQL-6H}d%zuwJqg`1=0Na_xG3-}CKx+uQxn%dfy+^{m*~^Yy&Zzr1*<
zDxd7R7|;7G-<~(_zl}{?KiSu9eqLYs{=E74L_XP*UL!UppXXZ}KmS-<B7d@b2XDr-
ztdD#e8}GTidzgEZSDV#Cf785wrrq3uwb}h9Kkpvq{irqia}m*>HvD1C@A#P5`;U9z
z<2e4-USw$pn*F<UIb;nhzq<!57Zc^w6w|V7?L&LMCjFw?=auK5U=P4b-A5Jcr1pU4
z+A-!EFn*URT0@mNYVxb$kqvQ!u;(?_K&`<e!7czf{4QB#tv2VXlT8|e&oglcwwF)~
zW0_O9*C~ZSs~^U@`UdPVjCZEKzuBjcbByUPs~xt7LYV3ce?@NYi(Kf4jBbkzZHSy)
i5II4c!oLvIq@ZbxJ{OR?0Ua7OsZB-@$(W%t8vX$QF#=Tp

literal 0
HcmV?d00001

diff --git a/OMDb.WinUI3/OMDb.WinUI3/logo_32.png b/OMDb.WinUI3/OMDb.WinUI3/logo_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3527aaa5711eb1b2ab63959ba5a3827fc706a4d0
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009GNkl<ZScScp
zOGs2v7{`CU$X8a1ie>o-m2id@N$H}<9!Q0?X(^O$6T%j*TC`{pEh4IQA=o0QMJ-xb
zNwqS|j7Aa7Mh!(olypW*nj*g2xzl*hotb;5u^(Kx_nhzXzvq7EaZ`$3^x=?H;22P^
zu38{pxh?|3K%csv1HYVvP1jm<vVbc<JCLpQ{vj9G1)NaNtH2%Q_f4~oAXRHw&qWoi
zGe&YdvX##YaKWZOOf&%!pclBQ^|&KNjYMy>7qAmh1bhG*wVuRjR56R<36Sso8mLNQ
za+4|*J1dre2SAPHnmlS$4qE}2faVQMZqlrB8JO#U%x6EaCDQU_UM~0QYS(#p`KRfe
zoYA5__EuA0xNTkAL~xb*exGIwECH3WewZWBVNEVPT@F&*`-W$;^WnC0m8G;4Xr`R;
zjnVpUn3d2^<N5a3WVGa{Tpf`kFbR}tW)b)g)fo>t>1oV=U*pu<A*OzWG`sFSm6T*{
z;^_Mkt<S;~P%b0T6fe2S!!NVOU18=X?t1MfN+1+sEU==r+aNicM1WWCv*+dFk}<S`
zXKNnU%Xiq?xxgy|8r*nXot_KVgw(_3(qhfV1q~v=<JPNX#Lv*zW#hiBawq$<Gc_BB
zctk)+BA#u&Pew6HQQq>{*MkE}?Dhgj$PBnPI$@Yr<YpVyp9msgAyE<C3xA99cu8R*
zMY$jXMzv-aSc|fHbB-JL(NuMW`X?fbQl_U1`b0p~_0mdyMw-@UViu)Kd?KJn9V(+D
z1t!(rTDG0C4EtkbWKlXqa`uRT0Px7pM|Q)xBL|EEGl#eT;6B=m3p86SMd<*^889~^
zS(iTp(Z@Ks$d<WV2F_duWM{hZpOT|;NzQdAA~{A6YNp9&Q02lZKsXBoH!yin<p^UH
zAjh)9fb03>fHf7{A4`BRpms?8;FmZvD&~MSf}H?i94H0uYd!AiQnAMEJmc+#Ex=yj
zRRW3SCq&-*d@Lg;f5#uyx2ph7t9uD7i@y24CqJ;V84StE4R|7_^0<+K-*$w|3?-^L
Qi~s-t07*qoM6N<$g7z1MmH+?%

literal 0
HcmV?d00001


From 1208f29a1422248eaf54484a2a06dc3b367911d6 Mon Sep 17 00:00:00 2001
From: QEDSD <2998739882@qq.com>
Date: Mon, 17 Jul 2023 11:31:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4Package=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OMDb.sln | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/OMDb.sln b/OMDb.sln
index 236e2ab..b912a37 100644
--- a/OMDb.sln
+++ b/OMDb.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "OMDb.WinUI3 (Package)", "OMDb.WinUI3\OMDb.WinUI3 (Package)\OMDb.WinUI3 (Package).wapproj", "{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OMDb.WinUI3", "OMDb.WinUI3\OMDb.WinUI3\OMDb.WinUI3.csproj", "{FC3D8BCF-3896-4CEE-9A85-AD6C14E1E129}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OMDb.Core", "OMDb.Core\OMDb.Core.csproj", "{F76062C6-552D-45D3-BC8B-A11ABDBDDBFF}"
@@ -27,30 +25,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|Any CPU.Build.0 = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|arm64.ActiveCfg = Debug|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|arm64.Build.0 = Debug|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|arm64.Deploy.0 = Debug|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x64.ActiveCfg = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x64.Build.0 = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x64.Deploy.0 = Debug|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x86.ActiveCfg = Debug|x86
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x86.Build.0 = Debug|x86
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Debug|x86.Deploy.0 = Debug|x86
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|Any CPU.ActiveCfg = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|Any CPU.Build.0 = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|Any CPU.Deploy.0 = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|arm64.ActiveCfg = Release|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|arm64.Build.0 = Release|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|arm64.Deploy.0 = Release|arm64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x64.ActiveCfg = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x64.Build.0 = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x64.Deploy.0 = Release|x64
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x86.ActiveCfg = Release|x86
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x86.Build.0 = Release|x86
-		{F6D42782-A8F4-4C38-8AB8-C44B54418BB1}.Release|x86.Deploy.0 = Release|x86
 		{FC3D8BCF-3896-4CEE-9A85-AD6C14E1E129}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{FC3D8BCF-3896-4CEE-9A85-AD6C14E1E129}.Debug|Any CPU.Build.0 = Debug|x64
 		{FC3D8BCF-3896-4CEE-9A85-AD6C14E1E129}.Debug|arm64.ActiveCfg = Debug|arm64

From 45abf631ba57c7e109cb2c8064c3d5b60f7a07c1 Mon Sep 17 00:00:00 2001
From: QEDSD <2998739882@qq.com>
Date: Mon, 17 Jul 2023 18:10:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BB=E9=A1=B5TabView=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OMDb.WinUI3/OMDb.WinUI3/App.xaml              |   4 +
 .../OMDb.WinUI3/Assets/Img/logo_32.png        | Bin 644 -> 838 bytes
 .../Converters/BoolToVisibilityConverter.cs   |   2 +-
 OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj    |   4 +-
 .../OMDb.WinUI3/ViewModels/ShellViewModel.cs  |  18 +-
 OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml  | 361 +++++++++---------
 .../OMDb.WinUI3/Views/ShellPage.xaml.cs       |  31 +-
 OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml  |  45 +--
 .../OMDb.WinUI3/Wins/MainWindow.xaml.cs       |   2 +-
 OMDb.WinUI3/OMDb.WinUI3/logo_32.png           | Bin 838 -> 0 bytes
 10 files changed, 231 insertions(+), 236 deletions(-)
 delete mode 100644 OMDb.WinUI3/OMDb.WinUI3/logo_32.png

diff --git a/OMDb.WinUI3/OMDb.WinUI3/App.xaml b/OMDb.WinUI3/OMDb.WinUI3/App.xaml
index 48a8e7c..a504af6 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/App.xaml
+++ b/OMDb.WinUI3/OMDb.WinUI3/App.xaml
@@ -2,6 +2,7 @@
     x:Class="OMDb.WinUI3.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:OMDb.WinUI3.Converters"
     xmlns:local="using:OMDb.WinUI3">
     <Application.Resources>
         <ResourceDictionary>
@@ -18,6 +19,9 @@
             <x:Double x:Key="ContentDialogMaxWidth">1000</x:Double>
             <x:Double x:Key="ContentDialogMinWidth">10</x:Double>
             <x:Double x:Key="ContentDialogMinHeight">10</x:Double>
+            <converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" />
+            <converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" IsReverse="True" />
+            <converters:BoolReverseConverte x:Key="BoolReverseConverte" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png b/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png
index 1802d11aa3617fdf14f01969c519efaedb5a5aa3..3527aaa5711eb1b2ab63959ba5a3827fc706a4d0 100644
GIT binary patch
delta 816
zcmV-01JC?~1;z%DBYy)8Nkl<ZScScpOGs2v7{`CU$X8a1ie>o-m2id@N$H}<9!Q0?
zX(^O$6T%j*TC`{pEh4IQA=o0QMJ-xbNwqS|j7Aa7Mh!(olypW*nj*g2xzl*hotb;5
zu^(Kx_nhzXzvq7EaZ`$3^x=?H;22P^u38{pxh?|3K%csv1Ao7qgiY64bh3aeKs%7F
z_5L9j*ae(W&#S;4<@Zgqjv!TQS<giktTRS(JF=C}3UI-uKTI?M5}+5jsr9%cMU6yn
zv=^`wPy~Dc8nvFpX;d+b;t7!N{TirBVseuz6+0`IfCoU0=9)ZeR1RAKmw@ICOm5Pw
zav7NGfXrt<uzw}e@?>5v_v&ibd3X7z>71O=qCWOkQ(w4kUE4%(mHK|4W(zC<m9l=A
zBhX<@E<9ZhQr!E7XS4I+wsV!Gv=nHjobip(`fiw&&`;y}_Sj^!<fvR7ks~k(lxb!W
z_z%??4>{>+%zt0w)Y~DZeuOl;?md;1WNqT;`w^|r!haM{E+fzsFS*IXFSEv7Vdf_8
zdhI7lAQWOOu%flwAUT^vfLHIc=jGy(F|>kbYaZ9jci7swz$*e8+<07_o(tE6)WhY{
zV$H?{4I;qf)~jX2&(POp<G!tOC;PKAH5-R`L_kR*o^8HQMlniJ-tySjg9A$J_5w%9
z47fHrVSkub<YpVyp9msgAyE<C3xA99cu8R*MY$jXMzv-aSc|fHbB-JL(NuMW`X?fb
zQl_U1`b0p~_0mdyMw-@UViu)Kd?KJn9V(+D1t!(rTDG0C4EtkbWKlXqa`uRT0Px7p
zM|Q)xBL|EEGl#eT;6B=m3p86SMd<*^889~^S$~&51JTDgxyY8eTL#Wt2V`fu@t=~T
za!Jm0Cn7mU4{D~#XHezBDnK|31UE2wP~`|?6(Gm5!+`7g<bX95+aF7SFraow{ot24
zGb-kQHG-W0VH_w0?rS~n=~A)A?L6b{hAqHe;8g;N<tIem`g|-SCx6Eu)winvPOEzf
uEGdh=`M)PWu(BBp$;l0PBB%1Wk%8ZKgv<;jsyU1R0000<MNUMnLSTY<D}_4%

delta 620
zcmV-y0+ap5280EWBYy%*Nkl<ZScPL0-n#KA0|Nsu!@z*gEDQ_`QUhc;2=Fq2T!A4>
zKk%7p04)cDQ3tSKh%hiP)F~)3<Z0<*i0^*#m?84gc?@x6@W#szLktE)wr#=?W9EvE
ztYlzdU`G}__~8RX*X^4OV*eQ!41`7C;>vvdV6k2A-eMR81AicWKfiuu(Bv0j;AUlI
z`1<=dL+9m-48iA4W2j|dVEBbM3QF$W1p68pB&ew~_y`DMs6_@7pFLridGk70WbW-7
zU_LH@*8w1K{nH1AEAQTdeFFETp$UTpHxGtdWU%q|D==@-)2A46$bhIs`25>9hT03~
z;CwMoPKL>bCVv>}kimoBzrZ{gjSCQ+3l_b8$*|zoO*mhXkB?!NrVfTWQUOWX5Is!<
zDJp?;4BZ?60-$Vo|I;TpACz4QB}#mNtb!=_{27K<-@n88phT&_%7&qiW)3*<^$SDU
z`7>}nC{eC9x57|IGY5dcmJjb4CSAJ>=aZW#DXI&a9)H|tSa<&(oDWKr`BE|%>hJ-I
zE2FgQSHJ}o4AdGJk(4N@QX3|mJxz9^q>2MTr5z|y!isB9qFi8XilGi0pjvwXlqmbI
zA`+#JkT8ZCY=9^SNOEyuh+zYuS`WFnriueJ`2-jgdHINrQ&4ez;^hkraa;he13>xO
zRYn%vuw?+nDWNJD268T4Kq;>A0jv%HRWP8Y6)0cB04Pqk*gG*S*E7UWj}AbIG8ZXP
z;sc<b(Wimz8DR|pdV*00fE+MT@ecyLppMD20doWc!)E|n61h)#-Z^vt0000<MNUMn
GLSTX-h6*YG

diff --git a/OMDb.WinUI3/OMDb.WinUI3/Converters/BoolToVisibilityConverter.cs b/OMDb.WinUI3/OMDb.WinUI3/Converters/BoolToVisibilityConverter.cs
index 1ee2388..45f94db 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Converters/BoolToVisibilityConverter.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Converters/BoolToVisibilityConverter.cs
@@ -30,7 +30,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
             {
                 return Visibility.Collapsed;
             }
-            if ((bool)value)
+            if (value.GetType() == typeof(bool) && (bool)value)
             {
                 return IsReverse ? Visibility.Collapsed : Visibility.Visible;
             }
diff --git a/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj b/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
index 5060af0..bf39435 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
+++ b/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
@@ -388,10 +388,10 @@
 	  <Page Update="MyControls\ExplorerControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
-	  <None Update="logo_32.ico">
+	  <None Update="Assets\Img\logo_32.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
-	  <None Update="logo_32.png">
+	  <None Update="logo_32.ico">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
 	  <None Update="nlog.config">
diff --git a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ShellViewModel.cs b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ShellViewModel.cs
index 228817d..5a3da06 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ShellViewModel.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/ViewModels/ShellViewModel.cs
@@ -24,6 +24,14 @@ public ShellViewModel()
         {
             Current = this;
         }
+
+        private bool isInTabView;
+        public bool IsInTabView
+        {
+            get => isInTabView;
+            set => SetProperty(ref isInTabView, value);
+        }
+
         private string selectedPage;
         public string SelectedPage
         {
@@ -34,12 +42,6 @@ public string SelectedPage
             }
         }
 
-        private bool canGoBack;
-        public bool CanGoBack
-        {
-            get => canGoBack;
-            set => SetProperty(ref canGoBack, value);
-        }
         public void Init(Frame frame)
         {
             NavigationService.Frame = frame;
@@ -48,13 +50,11 @@ public void Init(Frame frame)
         public void GoBack()
         {
             NavigationService.GoBack();
-            CanGoBack = NavigationService.CanGoBack;
         }
 
         public void SetSelected(Type type)
         {
             SelectedPage = type.Name;
-            CanGoBack = NavigationService.CanGoBack;
         }
 
         public ICommand NavClickCommand => new RelayCommand<Button>((item) =>
@@ -63,7 +63,7 @@ public void SetSelected(Type type)
             if (pageType != null)
             {
                 NavigationService.Navigate(pageType, null);
-                CanGoBack = NavigationService.CanGoBack;
+                IsInTabView = false;
             }
         });
     }
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml b/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml
index 394dbf3..9e4c553 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml
+++ b/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml
@@ -39,186 +39,197 @@
 
     <Grid x:Name="MainContentGrid">
         <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="42" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Button
-                Height="36"
-                VerticalContentAlignment="Center"
-                Click="Button_Click"
-                IsEnabled="{x:Bind ViewModel.CanGoBack, Mode=OneWay}"
-                Style="{StaticResource NavButtonStyle}">
-                <SymbolIcon Symbol="Back">
-                    <SymbolIcon.RenderTransform>
-                        <ScaleTransform CenterY="12" ScaleX="0.6" ScaleY="0.6" />
-                    </SymbolIcon.RenderTransform>
-                </SymbolIcon>
-            </Button>
-            <Grid Grid.Row="1" Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid Margin="0,0,0,4">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <!--  主功能列表  -->
-                    <StackPanel>
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:HomePage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="HomePage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="Home">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="主页" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=HomePage}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:ClassificationPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="ClassificationPage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="AlignCenter">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="分类" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ClassificationPage}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:CollectionsPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="CollectionsPage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="List">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="片单" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=CollectionsPage}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:EntryPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="EntryPage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="ViewAll">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="词条" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=EntryPage}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:ManagementPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="ManagementPage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="Library">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="管理" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ManagementPage}" />
-                            </Grid>
-                        </Button>
-                    </StackPanel>
-                    <!--  Foot  -->
-                    <StackPanel Grid.Row="1">
-                        <Button
-                            helpers:NavHelper.NavigateTo="views:ToolsPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="ToolsPage">
-                            <Grid HorizontalAlignment="Center">
-                                <StackPanel Orientation="Vertical">
-                                    <SymbolIcon Symbol="Repair">
-                                        <SymbolIcon.RenderTransform>
-                                            <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        FontSize="12"
-                                        Text="工具" />
-                                </StackPanel>
-                                <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=ViewModel.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ToolsPage}" />
-                            </Grid>
-                        </Button>
-                        <Button
-                            Height="38"
-                            helpers:NavHelper.NavigateTo="views:SettingPage"
-                            Command="{x:Bind ViewModel.NavClickCommand}"
-                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
-                            Style="{StaticResource NavButtonStyle}"
-                            Tag="SettingPage">
-                            <Grid HorizontalAlignment="Center">
-                                <SymbolIcon VerticalAlignment="Center" Symbol="Setting">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid Margin="0,0,0,4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <StackPanel Height="32" Orientation="Horizontal">
+                    <Grid Margin="8,0" CornerRadius="8">
+                        <Image
+                            Width="18"
+                            Height="18"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Source="/Assets/Img/logo_32.png" />
+                    </Grid>
+                    <TextBlock
+                        x:Uid="AppDisplayNameTextBlock"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource CaptionTextBlockStyle}" />
+                </StackPanel>
+                <!--  主功能列表  -->
+                <StackPanel Grid.Row="1">
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:HomePage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="HomePage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="Home">
                                     <SymbolIcon.RenderTransform>
-                                        <ScaleTransform ScaleX="0.8" ScaleY="0.8" />
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
                                     </SymbolIcon.RenderTransform>
                                 </SymbolIcon>
-                            </Grid>
-                        </Button>
-                    </StackPanel>
-
-                </Grid>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="主页" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=HomePage}" />
+                        </Grid>
+                    </Button>
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:ClassificationPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="ClassificationPage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="AlignCenter">
+                                    <SymbolIcon.RenderTransform>
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
+                                    </SymbolIcon.RenderTransform>
+                                </SymbolIcon>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="分类" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ClassificationPage}" />
+                        </Grid>
+                    </Button>
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:CollectionsPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="CollectionsPage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="List">
+                                    <SymbolIcon.RenderTransform>
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
+                                    </SymbolIcon.RenderTransform>
+                                </SymbolIcon>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="片单" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=CollectionsPage}" />
+                        </Grid>
+                    </Button>
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:EntryPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="EntryPage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="ViewAll">
+                                    <SymbolIcon.RenderTransform>
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
+                                    </SymbolIcon.RenderTransform>
+                                </SymbolIcon>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="词条" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=EntryPage}" />
+                        </Grid>
+                    </Button>
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:ManagementPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="ManagementPage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="Library">
+                                    <SymbolIcon.RenderTransform>
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
+                                    </SymbolIcon.RenderTransform>
+                                </SymbolIcon>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="管理" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ManagementPage}" />
+                        </Grid>
+                    </Button>
+                </StackPanel>
+                <!--  Foot  -->
+                <StackPanel Grid.Row="2">
+                    <Button
+                        helpers:NavHelper.NavigateTo="views:ToolsPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="ToolsPage">
+                        <Grid HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical">
+                                <SymbolIcon Symbol="Repair">
+                                    <SymbolIcon.RenderTransform>
+                                        <ScaleTransform CenterX="12" ScaleX="0.8" ScaleY="0.8" />
+                                    </SymbolIcon.RenderTransform>
+                                </SymbolIcon>
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="12"
+                                    Text="工具" />
+                            </StackPanel>
+                            <Rectangle Style="{StaticResource NavRectangleStyle}" Visibility="{Binding ElementName=page, Path=VM.SelectedPage, Mode=OneWay, Converter={StaticResource EqualStringToVisibilityConvertercs}, ConverterParameter=ToolsPage}" />
+                        </Grid>
+                    </Button>
+                    <Button
+                        Height="38"
+                        helpers:NavHelper.NavigateTo="views:SettingPage"
+                        Command="{x:Bind VM.NavClickCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=Self}}"
+                        Style="{StaticResource NavButtonStyle}"
+                        Tag="SettingPage">
+                        <Grid HorizontalAlignment="Center">
+                            <SymbolIcon VerticalAlignment="Center" Symbol="Setting">
+                                <SymbolIcon.RenderTransform>
+                                    <ScaleTransform ScaleX="0.8" ScaleY="0.8" />
+                                </SymbolIcon.RenderTransform>
+                            </SymbolIcon>
+                        </Grid>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <Grid Grid.Column="1" Background="Transparent">
+                <TabView
+                    x:Name="ContentTabView"
+                    AddTabButtonClick="ContentTabView_AddTabButtonClick"
+                    SelectionChanged="ContentTabView_SelectionChanged"
+                    IsAddTabButtonVisible="False">
+                    <TabView.TabStripFooter>
+                        <Grid
+                            x:Name="CustomDragRegion"
+                            MinWidth="150"
+                            Background="Transparent" />
+                    </TabView.TabStripFooter>
+                </TabView>
                 <Frame
-                    x:Name="shellFrame"
-                    Grid.Column="1"
+                    x:Name="ShellFrame"
+                    Margin="0,36,0,0"
                     Background="Transparent"
-                    CornerRadius="8" />
+                    CornerRadius="8"
+                    Visibility="{x:Bind VM.IsInTabView, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
             </Grid>
         </Grid>
         <InfoBar
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml.cs
index 6d56c29..683d86f 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Views/ShellPage.xaml.cs
@@ -5,20 +5,43 @@ namespace OMDb.WinUI3.Views
 {
     public sealed partial class ShellPage : Page
     {
-        public ViewModels.ShellViewModel ViewModel { get; set; } = new ViewModels.ShellViewModel();
+        public ViewModels.ShellViewModel VM { get; set; } = new ViewModels.ShellViewModel();
         public ShellPage()
         {
             this.InitializeComponent();
+            Loaded += ShellPage_Loaded;
             Helpers.InfoHelper.InfoBar = InfoBar;
             Helpers.InfoHelper.WaitingGrid = WaitingGrid;
             Helpers.InfoHelper.WaitingProgressRing = WaitingProgressRing;
             Helpers.InfoHelper.DialogFrame = DialogFrame;
-            ViewModel.Init(shellFrame);
+            VM.Init(ShellFrame);
         }
 
-        private void Button_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void ShellPage_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.GoBack();
+            Helpers.WindowHelper.GetWindowForElement(this).SetTitleBar(CustomDragRegion);
+        }
+
+        private void ContentTabView_AddTabButtonClick(TabView sender, object args)
+        {
+            TabViewItem item = new TabViewItem()
+            {
+                Header = "Test",
+                IsSelected = true,
+            };
+            sender.TabItems.Add(item);
+        }
+
+        private void ContentTabView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if((sender as TabView).SelectedItem == null)
+            {
+                VM.IsInTabView = false;
+            }
+            else
+            {
+                VM.IsInTabView = true;
+            }
         }
     }
 }
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml
index c713caf..e4e7df5 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml
+++ b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml
@@ -9,49 +9,6 @@
     mc:Ignorable="d">
 
     <Grid x:Name="MainWindowGrid" Background="Transparent">
-        <Grid
-            Height="42"
-            VerticalAlignment="Top"
-            Canvas.ZIndex="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Border
-                Name="AppTitleLeftBorder"
-                Grid.Column="0"
-                Width="80" />
-
-            <StackPanel Grid.Column="1" Orientation="Horizontal">
-                <Grid
-                    Grid.Column="1"
-                    Height="16"
-                    CornerRadius="8">
-                    <Image
-                        Width="16"
-                        Height="16"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Source="/Images/logo_32.png" />
-                </Grid>
-
-                <TextBlock
-                    x:Uid="AppDisplayNameTextBlock"
-                    Margin="12,0,0,0"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource CaptionTextBlockStyle}" />
-            </StackPanel>
-
-            <!--  Draggable part of the title bar  -->
-            <Border
-                x:Name="AppTitleBar"
-                Grid.Column="1"
-                Height="32"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Top" />
-        </Grid>
-        <views:ShellPage Grid.Row="1" />
+        <views:ShellPage />
     </Grid>
-
 </Window>
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
index 6a41ad7..bd03d90 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
+++ b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
@@ -22,7 +22,7 @@ public MainWindow()
             Helpers.WindowHelper.TrackWindow(this);
             Helpers.WindowHelper.SetMainWindow(this);
             ExtendsContentIntoTitleBar = true;
-            SetTitleBar(AppTitleBar);
+            //SetTitleBar(AppTitleBar);
             PluginsBaseService.Init();
             Instance = this;
             if (Content is FrameworkElement rootElement)
diff --git a/OMDb.WinUI3/OMDb.WinUI3/logo_32.png b/OMDb.WinUI3/OMDb.WinUI3/logo_32.png
deleted file mode 100644
index 3527aaa5711eb1b2ab63959ba5a3827fc706a4d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009GNkl<ZScScp
zOGs2v7{`CU$X8a1ie>o-m2id@N$H}<9!Q0?X(^O$6T%j*TC`{pEh4IQA=o0QMJ-xb
zNwqS|j7Aa7Mh!(olypW*nj*g2xzl*hotb;5u^(Kx_nhzXzvq7EaZ`$3^x=?H;22P^
zu38{pxh?|3K%csv1HYVvP1jm<vVbc<JCLpQ{vj9G1)NaNtH2%Q_f4~oAXRHw&qWoi
zGe&YdvX##YaKWZOOf&%!pclBQ^|&KNjYMy>7qAmh1bhG*wVuRjR56R<36Sso8mLNQ
za+4|*J1dre2SAPHnmlS$4qE}2faVQMZqlrB8JO#U%x6EaCDQU_UM~0QYS(#p`KRfe
zoYA5__EuA0xNTkAL~xb*exGIwECH3WewZWBVNEVPT@F&*`-W$;^WnC0m8G;4Xr`R;
zjnVpUn3d2^<N5a3WVGa{Tpf`kFbR}tW)b)g)fo>t>1oV=U*pu<A*OzWG`sFSm6T*{
z;^_Mkt<S;~P%b0T6fe2S!!NVOU18=X?t1MfN+1+sEU==r+aNicM1WWCv*+dFk}<S`
zXKNnU%Xiq?xxgy|8r*nXot_KVgw(_3(qhfV1q~v=<JPNX#Lv*zW#hiBawq$<Gc_BB
zctk)+BA#u&Pew6HQQq>{*MkE}?Dhgj$PBnPI$@Yr<YpVyp9msgAyE<C3xA99cu8R*
zMY$jXMzv-aSc|fHbB-JL(NuMW`X?fbQl_U1`b0p~_0mdyMw-@UViu)Kd?KJn9V(+D
z1t!(rTDG0C4EtkbWKlXqa`uRT0Px7pM|Q)xBL|EEGl#eT;6B=m3p86SMd<*^889~^
zS(iTp(Z@Ks$d<WV2F_duWM{hZpOT|;NzQdAA~{A6YNp9&Q02lZKsXBoH!yin<p^UH
zAjh)9fb03>fHf7{A4`BRpms?8;FmZvD&~MSf}H?i94H0uYd!AiQnAMEJmc+#Ex=yj
zRRW3SCq&-*d@Lg;f5#uyx2ph7t9uD7i@y24CqJ;V84StE4R|7_^0<+K-*$w|3?-^L
Qi~s-t07*qoM6N<$g7z1MmH+?%