添加设置新图标；支持背景修改；数据库重构初步完成

ExplorerEx/Assets/Settings.xml

@@ -1,33 +1,42 @@
 <settings>
   <category header="Appearance">
-    <expander header="Theme" icon="BrushDrawingImage">
-      <item header="WindowBackdrop" description="#WindowBackdropDescription" type="select">
+    <item header="Language" description="#LanguageDescription" icon="LanguageDrawingImage" type="select">
+      <option header="Chinese" value="2052"/>
+      <option header="English" value="1033"/>
+    </item>
+    <expander header="Background" icon="BrushDrawingImage">
+      <item header="WindowBackdrop" icon="BackgroundDrawingImage" type="select">
         <option header="SolidColor"/>
         <option header="Acrylic"/>
         <option header="MicaWindows11Only"/>
       </item>
-      <item header="ColorMode" description="#ColorModeDescription" type="select">
-        <option header="FollowSystem"/>
-        <option header="ColorMode-Light"/>
-        <option header="ColorMode-Dark"/>
+      <item header="BackgroundImage" icon="ImageDrawingImage" description="#BackgroundImageDescription" type="string">
+        <browse type="file" filter="Image|*.png;*.jpg;*.bmp"/>
       </item>
+      <item header="BackgroundImageOpacity" icon="BlurDrawingImage" type="number" min="0" max="1" default="0.8"/>
     </expander>
+    <item header="ColorMode" icon="ColorDrawingImage" type="select">
+      <option header="FollowSystem"/>
+      <option header="ColorMode-Light"/>
+      <option header="ColorMode-Dark"/>
+    </item>
   </category>
 
   <category header="Common">
-    <item header="DefaultTextEditor" description="#DefaultTextEditorDescription" type="string" default="notepad.exe">
-      <browseDialog type="file" filter=".exe"/>
+    <item header="DefaultTextEditor" icon="TextEditorDrawingImage" description="#DefaultTextEditorDescription" type="string" default="notepad.exe">
+      <browse type="file" filter="Application|*.exe"/>
     </item>
-    <item header="DoubleClickGoUpperLevel" description="#DoubleClickGoUpperLevelDescription" type="boolean" default="true"/>
+    <item header="DoubleClickGoUpperLevel" icon="ClickDrawingImage" description="#DoubleClickGoUpperLevelDescription" type="boolean" default="true"/>
   </category>
 
   <category header="Customize">
+    <item header="DontAskWhenClosingMultiTabs" type="boolean" default="false"/>
     <item header="DontAskWhenRecycle" type="boolean" default="false"/>
     <item header="DontAskWhenDelete" type="boolean" default="false"/>
   </category>
 
   <category header="Advanced">
-    <item header="ShowHiddenFilesAndFolders" description="#ShowHiddenFilesAndFoldersDescription" type="boolean" default="false"/>
-    <item header="ShowProtectedSystemFilesAndFolders" description="#ShowProtectedSystemFilesAndFoldersDescription" type="boolean" default="false"/>
+    <item header="ShowHiddenFilesAndFolders" icon="EyeDrawingImage" type="boolean" default="false"/>
+    <item header="ShowProtectedSystemFilesAndFolders" icon="EyeDrawingImage" type="boolean" default="false"/>
   </category>
 </settings>

ExplorerEx/Command/FileItemCommand.cs

@@ -130,7 +130,7 @@ public class FileItemCommand : ICommand {
 				}
 				var items = Items;
 				switch (items.Count) {
-				case <= 0:
+				case 0:
 					return;
 				case 1:
 					FileTabControl.MouseOverTabControl?.SelectedTab.StartRename(items[0]);
@@ -141,16 +141,20 @@ public class FileItemCommand : ICommand {
 				}
 				break;
 			}
-			case "Delete":  // 删除一个或多个文件，按住shift就是强制删除
+			case "Delete": { // 删除一个或多个文件，按住shift就是强制删除
 				if (Folder.IsReadonly) {
 					break;
 				}
-				if ((Keyboard.Modifiers & ModifierKeys.Shift) != ModifierKeys.Shift) {  // 没有按Shift
+				var items = Items;
+				if (items.Count == 0) {
+					break;
+				}
+				if ((Keyboard.Modifiers & ModifierKeys.Shift) != ModifierKeys.Shift) { // 没有按Shift
 					if (!ContentDialog.ShowWithDefault(Settings.CommonSettings.DontAskWhenRecycle, "#AreYouSureToRecycleTheseFiles".L())) {
 						return;
 					}
 					try {
-						await FileUtils.FileOperation(FileOpType.Delete, Items.Where(item => item is FileSystemItem).Select(item => item.FullPath).ToArray());
+						await FileUtils.FileOperation(FileOpType.Delete, items.Where(item => item is FileSystemItem).Select(item => item.FullPath).ToArray());
 					} catch (Exception e) {
 						Logger.Exception(e);
 					}
@@ -159,7 +163,7 @@ public class FileItemCommand : ICommand {
 						return;
 					}
 					var failedFiles = new List<string>();
-					foreach (var item in Items) {
+					foreach (var item in items) {
 						if (item is FileSystemItem fsi) {
 							try {
 								if (fsi.IsFolder) {
@@ -178,6 +182,7 @@ public class FileItemCommand : ICommand {
 					}
 				}
 				break;
+			}
 			case "AddToBookmarks":
 				TabControlProvider.Invoke()?.MainWindow.AddToBookmarks(Items.Select(i => i.FullPath).ToArray());
 				break;

ExplorerEx/Converter/DictionaryConverter.cs

@@ -8,10 +8,10 @@
 namespace ExplorerEx.Converter;
 
 public class DependencyKeyValuePair : DependencyObject {
-	public object Key { get; set; }
+	public object Key { get; set; } = null!;
 
 	public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-		"Value", typeof(object), typeof(DependencyKeyValuePair), new PropertyMetadata(default(object)));
+		nameof(Value), typeof(object), typeof(DependencyKeyValuePair), new PropertyMetadata(default(object)));
 
 	public object Value {
 		get => GetValue(ValueProperty);
@@ -42,7 +42,7 @@ public class DictionaryConverter : IValueConverter {
 		};
 	}
 
-	public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+	public object? Convert(object? value, Type targetType, object parameter, CultureInfo culture) {
 		if (value == null) {
 			return null;
 		}
@@ -53,6 +53,6 @@ public class DictionaryConverter : IValueConverter {
 	}
 
 	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
-		throw new NotImplementedException();
+		throw new InvalidOperationException();
 	}
 }

ExplorerEx/Converter/FileAssocTemplateSelector.cs

@@ -2,14 +2,16 @@
 using System.Windows.Controls;
 using ExplorerEx.Model;
 
-namespace ExplorerEx.Converter; 
+namespace ExplorerEx.Converter;
 
-internal class FileAssocTemplateSelector : StyleSelector {
-	public Style DefaultStyle { get; set; }
+internal class FileAssocTemplateSelector : StyleSelector
+{
+    public Style DefaultStyle { get; set; } = null!;
 
-	public Style CustomStyle { get; set; }
+    public Style CustomStyle { get; set; } = null!;
 
-	public override Style SelectStyle(object item, DependencyObject container) {
-		return item is FileAssocItem ? CustomStyle : DefaultStyle;
-	}
+    public override Style SelectStyle(object item, DependencyObject container)
+    {
+        return item is FileAssocItem ? CustomStyle : DefaultStyle;
+    }
 }

ExplorerEx/Converter/FileViewItemDetailsConverter.cs

@@ -22,8 +22,11 @@ internal class SelectedItemsCount2TextConverter : IValueConverter {
 
 internal class ItemsCount2TextConverter : IValueConverter {
 	public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) {
-		if (value is int i and > 0) {
-			return string.Format("...Items".L(), i);
+		if (value is int i) {
+			if (i > 1) {
+				return string.Format("...Items".L(), i);
+			}
+			return string.Format("...Item".L(), i);
 		}
 		return null;
 	}