From f8bca48db3ed55bebe7ae1cdd293487b3fb5c909 Mon Sep 17 00:00:00 2001
From: "Muyuan Li (from Dev Box)" <muyuanli@microsoft.com>
Date: Fri, 17 Apr 2026 15:56:08 +0800
Subject: [PATCH] Settings UX: enable toggle, Load/Refresh button, greyed-out
 Apply

- Add master toggle to enable/disable Python scripts feature entirely
  (IsPythonScriptsEnabled in settings model, ViewModel, and runtime)
- Button shows 'Load scripts' initially, changes to 'Refresh scripts'
  after first load
- Edit dialog 'Apply changes' button is greyed out until a field changes
  (tracks initial snapshot vs current values for all fields)
- Runtime BuildPythonScriptFormats respects IsPythonScriptsEnabled

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../AdvancedPaste/Helpers/IUserSettings.cs    |  2 +
 .../AdvancedPaste/Helpers/UserSettings.cs     |  3 +
 .../ViewModels/OptionsViewModel.cs            |  5 ++
 .../AdvancedPastePythonScriptSettings.cs      |  3 +
 .../SettingsXAML/Views/AdvancedPastePage.xaml | 18 ++++-
 .../Views/AdvancedPastePage.xaml.cs           | 80 ++++++++++++++++++-
 .../Settings.UI/Strings/en-us/Resources.resw  |  6 ++
 .../ViewModels/AdvancedPasteViewModel.cs      | 23 ++++++
 8 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
index 96b8c23583..f60edd85ea 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
@@ -29,6 +29,8 @@ namespace AdvancedPaste.Settings
 
         public IReadOnlyList<AdvancedPastePythonScriptAction> PythonScriptActions { get; }
 
+        public bool IsPythonScriptsEnabled { get; }
+
         public string PythonScriptsFolder { get; }
 
         public string PythonExecutablePath { get; }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
index 94403900b9..956f60c1e5 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
@@ -57,6 +57,8 @@ namespace AdvancedPaste.Settings
 
         public string PythonScriptsFolder { get; private set; }
 
+        public bool IsPythonScriptsEnabled { get; private set; }
+
         public string PythonExecutablePath { get; private set; }
 
         public int PythonScriptTimeoutSeconds { get; private set; } = 30;
@@ -159,6 +161,7 @@ namespace AdvancedPaste.Settings
                                 _customActions.AddRange(properties.CustomActions.Value.Where(customAction => customAction.IsShown && customAction.IsValid));
 
                                 var pythonScripts = properties.PythonScripts ?? new AdvancedPastePythonScriptSettings();
+                                IsPythonScriptsEnabled = pythonScripts.IsEnabled;
                                 PythonScriptsFolder = string.IsNullOrWhiteSpace(pythonScripts.ScriptsFolder)
                                     ? GetDefaultScriptsFolder()
                                     : pythonScripts.ScriptsFolder;
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
index deb9bd535a..71982cc5c6 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
@@ -433,6 +433,11 @@ namespace AdvancedPaste.ViewModels
 
         private IEnumerable<PasteFormat> BuildPythonScriptFormats()
         {
+            if (!_userSettings.IsPythonScriptsEnabled)
+            {
+                yield break;
+            }
+
             var folder = _userSettings.PythonScriptsFolder;
             if (string.IsNullOrWhiteSpace(folder))
             {
diff --git a/src/settings-ui/Settings.UI.Library/AdvancedPastePythonScriptSettings.cs b/src/settings-ui/Settings.UI.Library/AdvancedPastePythonScriptSettings.cs
index bbe24c4417..fc116f7f4a 100644
--- a/src/settings-ui/Settings.UI.Library/AdvancedPastePythonScriptSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPastePythonScriptSettings.cs
@@ -9,6 +9,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library;
 
 public sealed class AdvancedPastePythonScriptSettings
 {
+    [JsonPropertyName("isEnabled")]
+    public bool IsEnabled { get; set; }
+
     [JsonPropertyName("scriptsFolder")]
     public string ScriptsFolder { get; set; } = string.Empty;
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
index 5dcdb24359..9e3fb0cbe7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
@@ -392,7 +392,14 @@
                     </controls:SettingsGroup>
 
                     <controls:SettingsGroup x:Uid="AdvancedPaste_PythonScripts_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                        <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ScriptsFolder_SettingsCard">
+                        <tkcontrols:SettingsCard x:Uid="AdvancedPaste_PythonScripts_EnableCard">
+                            <tkcontrols:SettingsCard.HeaderIcon>
+                                <FontIcon Glyph="&#xE943;" />
+                            </tkcontrols:SettingsCard.HeaderIcon>
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsPythonScriptsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                        <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ScriptsFolder_SettingsCard"
+                            IsEnabled="{x:Bind ViewModel.IsPythonScriptsEnabled, Mode=OneWay}">
                             <tkcontrols:SettingsCard.HeaderIcon>
                                 <FontIcon Glyph="&#xE8B7;" />
                             </tkcontrols:SettingsCard.HeaderIcon>
@@ -418,7 +425,8 @@
                                     ToolTipService.ToolTip="Open folder" />
                             </StackPanel>
                         </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard x:Uid="AdvancedPaste_PythonExecutablePath_SettingsCard">
+                        <tkcontrols:SettingsCard x:Uid="AdvancedPaste_PythonExecutablePath_SettingsCard"
+                            IsEnabled="{x:Bind ViewModel.IsPythonScriptsEnabled, Mode=OneWay}">
                             <tkcontrols:SettingsCard.HeaderIcon>
                                 <FontIcon Glyph="&#xE943;" />
                             </tkcontrols:SettingsCard.HeaderIcon>
@@ -443,13 +451,15 @@
                             x:Name="PythonScriptListExpander"
                             x:Uid="AdvancedPaste_PythonScriptList"
                             HeaderIcon="{ui:FontIcon Glyph=&#xE756;}"
+                            IsEnabled="{x:Bind ViewModel.IsPythonScriptsEnabled, Mode=OneWay}"
                             IsExpanded="True"
                             ItemsSource="{x:Bind ViewModel.PythonScriptActions, Mode=OneWay}">
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <Button
-                                    x:Uid="AdvancedPaste_PythonScript_RefreshScripts"
+                                    x:Name="RefreshScriptsButton"
                                     Click="RefreshPythonScripts_Click"
-                                    Style="{ThemeResource AccentButtonStyle}" />
+                                    Style="{ThemeResource AccentButtonStyle}"
+                                    Content="Load scripts" />
                             </StackPanel>
                             <tkcontrols:SettingsExpander.ItemTemplate>
                                 <DataTemplate x:DataType="models:AdvancedPastePythonScriptAction">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
index 9185967e21..8bd7702a27 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
@@ -314,6 +314,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         private void RefreshPythonScripts_Click(object sender, RoutedEventArgs e)
         {
             ViewModel?.RefreshPythonScripts();
+            RefreshScriptsButton.Content = "Refresh scripts";
         }
 
         private async void EditPythonScript_Click(object sender, RoutedEventArgs e)
@@ -323,6 +324,19 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
+            // Snapshot initial values to detect changes
+            var initialName = action.Name;
+            var initialDesc = action.Description;
+            var initialPlatform = action.Platform;
+            var initialText = action.SupportsText;
+            var initialHtml = action.SupportsHtml;
+            var initialImage = action.SupportsImage;
+            var initialAudio = action.SupportsAudio;
+            var initialVideo = action.SupportsVideo;
+            var initialFiles = action.SupportsFiles;
+            var initialAutoDetect = action.RequiresAutoDetect;
+            var initialRequires = action.Requires;
+
             // Populate dialog fields from the action
             ScriptEditFilePath.Text = action.ScriptPath;
             ScriptEditName.Text = action.Name;
@@ -341,7 +355,53 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             void OnDepsToggled(object s, RoutedEventArgs args) =>
                 ScriptEditRequires.IsEnabled = !ScriptEditAutoDetectDeps.IsOn;
 
-            ScriptEditAutoDetectDeps.Toggled += OnDepsToggled;
+            // Change detection: disable Apply button when nothing has changed
+            PythonScriptEditDialog.IsPrimaryButtonEnabled = false;
+
+            void CheckForChanges(object s, object args)
+            {
+                bool hasChanges =
+                    ScriptEditName.Text != initialName ||
+                    ScriptEditDescription.Text != initialDesc ||
+                    (ScriptEditPlatform.SelectedItem as string ?? "windows") != initialPlatform ||
+                    (ScriptEditText.IsChecked == true) != initialText ||
+                    (ScriptEditHtml.IsChecked == true) != initialHtml ||
+                    (ScriptEditImage.IsChecked == true) != initialImage ||
+                    (ScriptEditAudio.IsChecked == true) != initialAudio ||
+                    (ScriptEditVideo.IsChecked == true) != initialVideo ||
+                    (ScriptEditFiles.IsChecked == true) != initialFiles ||
+                    ScriptEditAutoDetectDeps.IsOn != initialAutoDetect ||
+                    ScriptEditRequires.Text != initialRequires;
+                PythonScriptEditDialog.IsPrimaryButtonEnabled = hasChanges;
+            }
+
+            void OnTextChanged(object s, TextChangedEventArgs args) => CheckForChanges(s, args);
+            void OnChecked(object s, RoutedEventArgs args) => CheckForChanges(s, args);
+            void OnToggled(object s, RoutedEventArgs args)
+            {
+                OnDepsToggled(s, args);
+                CheckForChanges(s, args);
+            }
+
+            void OnSelectionChanged(object s, SelectionChangedEventArgs args) => CheckForChanges(s, args);
+
+            ScriptEditName.TextChanged += OnTextChanged;
+            ScriptEditDescription.TextChanged += OnTextChanged;
+            ScriptEditRequires.TextChanged += OnTextChanged;
+            ScriptEditPlatform.SelectionChanged += OnSelectionChanged;
+            ScriptEditText.Checked += OnChecked;
+            ScriptEditText.Unchecked += OnChecked;
+            ScriptEditHtml.Checked += OnChecked;
+            ScriptEditHtml.Unchecked += OnChecked;
+            ScriptEditImage.Checked += OnChecked;
+            ScriptEditImage.Unchecked += OnChecked;
+            ScriptEditAudio.Checked += OnChecked;
+            ScriptEditAudio.Unchecked += OnChecked;
+            ScriptEditVideo.Checked += OnChecked;
+            ScriptEditVideo.Unchecked += OnChecked;
+            ScriptEditFiles.Checked += OnChecked;
+            ScriptEditFiles.Unchecked += OnChecked;
+            ScriptEditAutoDetectDeps.Toggled += OnToggled;
 
             try
             {
@@ -368,7 +428,23 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
             finally
             {
-                ScriptEditAutoDetectDeps.Toggled -= OnDepsToggled;
+                ScriptEditName.TextChanged -= OnTextChanged;
+                ScriptEditDescription.TextChanged -= OnTextChanged;
+                ScriptEditRequires.TextChanged -= OnTextChanged;
+                ScriptEditPlatform.SelectionChanged -= OnSelectionChanged;
+                ScriptEditText.Checked -= OnChecked;
+                ScriptEditText.Unchecked -= OnChecked;
+                ScriptEditHtml.Checked -= OnChecked;
+                ScriptEditHtml.Unchecked -= OnChecked;
+                ScriptEditImage.Checked -= OnChecked;
+                ScriptEditImage.Unchecked -= OnChecked;
+                ScriptEditAudio.Checked -= OnChecked;
+                ScriptEditAudio.Unchecked -= OnChecked;
+                ScriptEditVideo.Checked -= OnChecked;
+                ScriptEditVideo.Unchecked -= OnChecked;
+                ScriptEditFiles.Checked -= OnChecked;
+                ScriptEditFiles.Unchecked -= OnChecked;
+                ScriptEditAutoDetectDeps.Toggled -= OnToggled;
             }
         }
 
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 28118f9d21..541edf91c9 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -601,6 +601,12 @@ opera.exe</value>
   <data name="AdvancedPaste_PythonScripts_GroupSettings.Header" xml:space="preserve">
     <value>Python scripts</value>
   </data>
+  <data name="AdvancedPaste_PythonScripts_EnableCard.Header" xml:space="preserve">
+    <value>Enable Python scripts</value>
+  </data>
+  <data name="AdvancedPaste_PythonScripts_EnableCard.Description" xml:space="preserve">
+    <value>Run custom Python scripts from the Advanced Paste menu</value>
+  </data>
   <data name="AdvancedPaste_ScriptsFolder_SettingsCard.Header" xml:space="preserve">
     <value>Scripts folder</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
index 76657f86cf..932d2a1bdd 100644
--- a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
@@ -293,6 +293,28 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public AdvancedPasteAdditionalActions AdditionalActions => _additionalActions;
 
+        public bool IsPythonScriptsEnabled
+        {
+            get
+            {
+                var scripts = _advancedPasteSettings.Properties.PythonScripts;
+                return scripts?.IsEnabled ?? false;
+            }
+
+            set
+            {
+                var scripts = _advancedPasteSettings.Properties.PythonScripts ??= new AdvancedPastePythonScriptSettings();
+                if (scripts.IsEnabled != value)
+                {
+                    scripts.IsEnabled = value;
+                    OnPropertyChanged(nameof(IsPythonScriptsEnabled));
+                    SaveAndNotifySettings();
+                }
+            }
+        }
+
+        public bool ScriptsDiscovered => _scriptsDiscovered;
+
         public string PythonExecutablePath
         {
             get => _advancedPasteSettings.Properties.PythonScripts?.PythonExecutablePath ?? string.Empty;
@@ -348,6 +370,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         public void RefreshPythonScripts()
         {
             _scriptsDiscovered = true;
+            OnPropertyChanged(nameof(ScriptsDiscovered));
 
             var folder = ScriptsFolder;
             if (string.IsNullOrWhiteSpace(folder) || !System.IO.Directory.Exists(folder))