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 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
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 @@
-
-
+
+
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">
@@ -18,6 +19,9 @@
1000
10
10
+
+
+
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png b/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png
index 1802d11..3527aaa 100644
Binary files a/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png and b/OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png differ
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/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 39bdf8b..87727b8 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..bf39435 100644
--- a/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
+++ b/OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj
@@ -9,6 +9,14 @@
win10-x86;win10-x64;win10-arm64
true
bin\
+ Properties\PublishProfiles\win10-$(Platform).pubxml
+
+ true
+ true
+ None
+ 1.0.0.0
+ OMDb
+
@@ -94,13 +102,13 @@
-
+
-
-
+
+
-
+
@@ -372,10 +380,20 @@
+
+
+
+
MSBuild:Compile
+
+ Always
+
+
+ Always
+
Always
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 ee77554..d5bd779 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/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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CornerRadius="8"
+ Visibility="{x:Bind VM.IsInTabView, Mode=OneWay, Converter={StaticResource FalseToVisibleConverter}}" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
diff --git a/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs b/OMDb.WinUI3/OMDb.WinUI3/Wins/MainWindow.xaml.cs
index e402cb4..bd03d90 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()
@@ -16,10 +18,11 @@ 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;
- SetTitleBar(AppTitleBar);
+ //SetTitleBar(AppTitleBar);
PluginsBaseService.Init();
Instance = this;
if (Content is FrameworkElement rootElement)
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 @@
-
-
+
+
+
+
+
+
+