Fixed some options not work after restart VS and allow disable compar…

…e selected files menu
heku · Apr 6, 2024 · 20d907d · 20d907d
1 parent cb1a0f5
commit 20d907d
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/Kool.VsDiff.Linked/I18n.Designer.cs b/Kool.VsDiff.Linked/I18n.Designer.cs
diff --git a/Kool.VsDiff.Linked/I18n.en.resx b/Kool.VsDiff.Linked/I18n.en.resx
@@ -135,6 +135,9 @@
   <data name="OptionsPage_EnableDiffClipboardWithFile" xml:space="preserve">
     <value>Enable compare Clipboard content with selected file.</value>
   </data>
+  <data name="OptionsPage_EnableDiffSelectedFiles" xml:space="preserve">
+    <value>Enable compare two selected files.</value>
+  </data>
   <data name="OptionsPage_PreferToUsePreviewWindow" xml:space="preserve">
     <value>Prefer to use preview window (if support).</value>
   </data>

diff --git a/Kool.VsDiff.Linked/I18n.zh-Hans.resx b/Kool.VsDiff.Linked/I18n.zh-Hans.resx
@@ -135,6 +135,9 @@
   <data name="OptionsPage_EnableDiffClipboardWithFile" xml:space="preserve">
     <value>启用选中文件与剪贴板内容的比较功能</value>
   </data>
+  <data name="OptionsPage_EnableDiffSelectedFiles" xml:space="preserve">
+    <value>启用两个选中文件的比较功能</value>
+  </data>
   <data name="OptionsPage_PreferToUsePreviewWindow" xml:space="preserve">
     <value>优先使用预览窗口 (如果支持的话)</value>
   </data>

diff --git a/Kool.VsDiff.Shared/Models/VS.cs b/Kool.VsDiff.Shared/Models/VS.cs
@@ -91,10 +91,7 @@ private static List<NameFile> GetSelectedFiles(SelectedItems selectedItems)
                 {
                     continue;
                 }
-                if (files == null)
-                {
-                    files = new List<NameFile>();
-                }
+                files ??= new List<NameFile>();
                 files.Add(new NameFile { Name = item.ProjectItem.Name, File = file });
             }
             return files ?? GetSelectedFilesInsideFolderView();

diff --git a/Kool.VsDiff.Shared/Package.cs b/Kool.VsDiff.Shared/Package.cs
@@ -48,6 +48,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         CommandService.AddCommand(DiffClipboardWithFileCommand.Instance);
         CommandService.AddCommand(DiffClipboardWithDocumentCommand.Instance);
 
-        Debug.WriteLine("Package is sited and initialized.");
+        Options.RefreshCommandsState();
+
+        Debug.WriteLine(NAME + " Package is initialized.");
     }
 }
diff --git a/Kool.VsDiff.Shared/Pages/VsDiffOptions.cs b/Kool.VsDiff.Shared/Pages/VsDiffOptions.cs
@@ -20,6 +20,7 @@ internal sealed class VsDiffOptions : UIElementDialogPage
     public string CustomDiffToolPath { get; set; }
     public string CustomDiffToolArgs { get; set; }
 
+    public bool DiffSelectedFilesEnabled { get; set; }
     public bool DiffClipboardWithCodeEnabled { get; set; }
     public bool DiffClipboardWithFileEnabled { get; set; }
     public bool DiffClipboardWithDocumentEnabled { get; set; }
@@ -35,14 +36,20 @@ protected override void OnActivate(CancelEventArgs e)
 
     protected override void OnApply(PageApplyEventArgs e)
     {
-        DiffClipboardWithCodeCommand.Instance.Turn(DiffClipboardWithCodeEnabled);
-        DiffClipboardWithFileCommand.Instance.Turn(DiffClipboardWithFileEnabled);
-        DiffClipboardWithDocumentCommand.Instance.Turn(DiffClipboardWithDocumentEnabled);
+        RefreshCommandsState();
         DiffToolFactory.ClearCache();
 
         base.OnApply(e);
     }
 
+    public void RefreshCommandsState()
+    {
+        DiffSelectedFilesCommand.Instance.Turn(DiffSelectedFilesEnabled);
+        DiffClipboardWithCodeCommand.Instance.Turn(DiffClipboardWithCodeEnabled);
+        DiffClipboardWithFileCommand.Instance.Turn(DiffClipboardWithFileEnabled);
+        DiffClipboardWithDocumentCommand.Instance.Turn(DiffClipboardWithDocumentEnabled);
+    }
+
     protected override void OnClosed(EventArgs e)
     {
         base.OnClosed(e);
@@ -61,6 +68,7 @@ private void SetDefaults()
         UseCustomDiffTool = false;
         CustomDiffToolPath = @"%ProgramFiles(x86)%\WinMerge\WinMergeU.exe";
         CustomDiffToolArgs = "-e -u \"$FILE1\" \"$FILE2\" -dl \"$NAME1\" -dr \"$NAME2\"";
+        DiffSelectedFilesEnabled = true;
         DiffClipboardWithCodeEnabled = true;
         DiffClipboardWithFileEnabled = true;
         DiffClipboardWithDocumentEnabled = true;

diff --git a/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml b/Kool.VsDiff.Shared/Pages/VsDiffOptionsPage.xaml
@@ -38,6 +38,7 @@
         </Grid>
       </StackPanel>
     </GroupBox>
+    <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffSelectedFilesEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffSelectedFiles}" />
     <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithCodeEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithCode}" />
     <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithFileEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithFile}" />
     <CheckBox Margin="0,5,0,0" IsChecked="{Binding DiffClipboardWithDocumentEnabled}" Content="{x:Static kv:I18n.OptionsPage_EnableDiffClipboardWithDocument}" />

diff --git a/Screenshots/Configuration.png b/Screenshots/Configuration.png