feat(paste): add setting to show/hide AI paste section

src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs

@@ -47,6 +47,8 @@ internal sealed class IntegrationTestUserSettings : IUserSettings
 
     public bool ShowCustomPreview => false;
 
+    public bool ShowAIPaste => true;
+
     public bool CloseAfterLosingFocus => false;
 
     public bool EnableClipboardPreview => true;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs

@@ -125,17 +125,7 @@ namespace AdvancedPaste
 
         public void SetFocus()
         {
-            // Set initial focus based on AI enabled state:
-            // - If AI is enabled, focus the prompt textbox
-            // - If AI is disabled, focus the paste options list for keyboard navigation
-            if (_optionsViewModel.IsCustomAIServiceEnabled)
-            {
-                MainPage.CustomFormatTextBox.InputTxtBox.Focus(FocusState.Programmatic);
-            }
-            else
-            {
-                MainPage.SetInitialFocusToPasteOptions();
-            }
+            MainPage.CustomFormatTextBox.InputTxtBox.Focus(FocusState.Programmatic);
         }
 
         public void ClearInputText()

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml

@@ -163,13 +163,11 @@
             </Grid.ColumnDefinitions>
             <controls:ClipboardHistoryItemPreviewControl Height="48" ClipboardItem="{x:Bind ViewModel.CurrentClipboardItem, Mode=OneWay}" />
             <Button
-                x:Name="ClipboardHistoryButton"
                 x:Uid="ClipboardHistoryButton"
                 Grid.Column="1"
                 Margin="0,0,4,0"
                 VerticalAlignment="Center"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                KeyDown="ClipboardHistoryButton_KeyDown"
                 Style="{StaticResource SubtleButtonStyle}"
                 Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
                 <ToolTipService.ToolTip>
@@ -183,19 +181,15 @@
                     Glyph="&#xE81C;" />
                 <Button.Flyout>
                     <Flyout
-                        x:Name="ClipboardHistoryFlyout"
-                        Closed="ClipboardHistoryFlyout_Closed"
                         FlyoutPresenterStyle="{StaticResource PaddingLessFlyoutPresenterStyle}"
                         Placement="Right"
                         ShouldConstrainToRootBounds="False">
                         <ItemsView
-                            x:Name="ClipboardHistoryItemsView"
                             Width="320"
                             Margin="8,8,8,0"
                             IsItemInvokedEnabled="True"
                             ItemInvoked="ClipboardHistory_ItemInvoked"
                             ItemsSource="{x:Bind clipboardHistory, Mode=OneWay}"
-                            KeyDown="ClipboardHistoryItemsView_KeyDown"
                             SelectionMode="None">
                             <ItemsView.Layout>
                                 <StackLayout Orientation="Vertical" Spacing="8" />
@@ -257,7 +251,8 @@
             Margin="20,0,20,0"
             x:FieldModifier="public"
             IsEnabled="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay}"
-            TabIndex="0">
+            TabIndex="0"
+            Visibility="{x:Bind ViewModel.ShowAIPasteSection, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
             <controls:PromptBox.Footer>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
@@ -323,13 +318,10 @@
                     ItemContainerTransitions="{x:Null}"
                     ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                     ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                    KeyDown="PasteOptionsListView_KeyDown"
                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
                     ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="Single"
-                    SingleSelectionFollowsFocus="True"
-                    TabIndex="1"
-                    XYFocusKeyboardNavigation="Enabled" />
+                    SelectionMode="None"
+                    TabIndex="1" />
                 <Rectangle
                     Grid.Row="1"
                     Height="1"
@@ -346,13 +338,10 @@
                     ItemContainerTransitions="{x:Null}"
                     ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                     ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                    KeyDown="PasteOptionsListView_KeyDown"
                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
                     ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="Single"
-                    SingleSelectionFollowsFocus="True"
-                    TabIndex="2"
-                    XYFocusKeyboardNavigation="Enabled" />
+                    SelectionMode="None"
+                    TabIndex="2" />
             </Grid>
         </ScrollViewer>
     </Grid>

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs

@@ -208,103 +208,5 @@ namespace AdvancedPaste.Pages
                 Clipboard.SetHistoryItemAsContent(item.Item);
             }
         }
-
-        /// <summary>
-        /// Sets initial focus to the paste options list when AI is disabled.
-        /// </summary>
-        public void SetInitialFocusToPasteOptions()
-        {
-            try
-            {
-                if (PasteOptionsListView.Items.Count > 0)
-                {
-                    PasteOptionsListView.SelectedIndex = 0;
-                    PasteOptionsListView.Focus(FocusState.Programmatic);
-                    Logger.LogTrace("Focus set to PasteOptionsListView");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to set focus to paste options", ex);
-            }
-        }
-
-        /// <summary>
-        /// Gets the appropriate arrow key for "forward" direction based on RTL settings.
-        /// </summary>
-        private VirtualKey GetForwardKey()
-        {
-            return FlowDirection == FlowDirection.RightToLeft ? VirtualKey.Left : VirtualKey.Right;
-        }
-
-        /// <summary>
-        /// Gets the appropriate arrow key for "backward" direction based on RTL settings.
-        /// </summary>
-        private VirtualKey GetBackwardKey()
-        {
-            return FlowDirection == FlowDirection.RightToLeft ? VirtualKey.Right : VirtualKey.Left;
-        }
-
-        /// <summary>
-        /// Handles keyboard navigation on the paste options ListViews.
-        /// Enter key invokes the selected item.
-        /// </summary>
-        private async void PasteOptionsListView_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
-        {
-            if (sender is ListView listView && e.Key == VirtualKey.Enter)
-            {
-                if (listView.SelectedItem is PasteFormat format)
-                {
-                    e.Handled = true;
-                    await ViewModel.ExecutePasteFormatAsync(format, PasteActionSource.InAppKeyboardShortcut);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handles keyboard navigation on the clipboard history button.
-        /// Right arrow (or Left in RTL) opens the flyout.
-        /// </summary>
-        private void ClipboardHistoryButton_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
-        {
-            if (e.Key == GetForwardKey())
-            {
-                e.Handled = true;
-                if (ClipboardHistoryButton.Flyout is Flyout flyout)
-                {
-                    flyout.ShowAt(ClipboardHistoryButton);
-                    Logger.LogTrace("Clipboard history flyout opened via keyboard");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handles keyboard navigation within the clipboard history flyout.
-        /// Escape or Left arrow (Right in RTL) closes the flyout and returns focus to the button.
-        /// </summary>
-        private void ClipboardHistoryItemsView_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
-        {
-            if (e.Key == VirtualKey.Escape || e.Key == GetBackwardKey())
-            {
-                e.Handled = true;
-                ClipboardHistoryFlyout.Hide();
-            }
-        }
-
-        /// <summary>
-        /// Handles the clipboard history flyout closing event.
-        /// Returns focus to the clipboard history button.
-        /// </summary>
-        private void ClipboardHistoryFlyout_Closed(object sender, object e)
-        {
-            try
-            {
-                ClipboardHistoryButton.Focus(FocusState.Programmatic);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to return focus to clipboard history button", ex);
-            }
-        }
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs

@@ -17,6 +17,8 @@ namespace AdvancedPaste.Settings
 
         public bool ShowCustomPreview { get; }
 
+        public bool ShowAIPaste { get; }
+
         public bool CloseAfterLosingFocus { get; }
 
         public bool EnableClipboardPreview { get; }

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -38,6 +38,8 @@ namespace AdvancedPaste.Settings
 
         public bool ShowCustomPreview { get; private set; }
 
+        public bool ShowAIPaste { get; private set; }
+
         public bool CloseAfterLosingFocus { get; private set; }
 
         public bool EnableClipboardPreview { get; private set; }
@@ -54,6 +56,7 @@ namespace AdvancedPaste.Settings
 
             IsAIEnabled = false;
             ShowCustomPreview = true;
+            ShowAIPaste = true;
             CloseAfterLosingFocus = false;
             EnableClipboardPreview = true;
             PasteAIConfiguration = new PasteAIConfiguration();
@@ -109,6 +112,7 @@ namespace AdvancedPaste.Settings
 
                                 IsAIEnabled = properties.IsAIEnabled;
                                 ShowCustomPreview = properties.ShowCustomPreview;
+                                ShowAIPaste = properties.ShowAIPaste;
                                 CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
                                 EnableClipboardPreview = properties.EnableClipboardPreview;
                                 PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();

src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs

@@ -234,6 +234,8 @@ namespace AdvancedPaste.ViewModels
 
         public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
 
+        public bool ShowAIPasteSection => _userSettings.ShowAIPaste && IsAllowedByGPO;
+
         public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
 
         private PasteFormats CustomAIFormat =>
@@ -320,6 +322,7 @@ namespace AdvancedPaste.ViewModels
             OnPropertyChanged(nameof(AIProviders));
             OnPropertyChanged(nameof(AllowedAIProviders));
             OnPropertyChanged(nameof(ShowClipboardPreview));
+            OnPropertyChanged(nameof(ShowAIPasteSection));
 
             NotifyActiveProviderChanged();
 

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json

@@ -1 +1 @@
-{"properties":{"IsAIEnabled":{"value":false},"ShowCustomPreview":{"value":true},"CloseAfterLosingFocus":{"value":false},"advanced-paste-ui-hotkey":{"win":true,"ctrl":false,"alt":false,"shift":true,"code":86,"key":""},"paste-as-plain-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":79,"key":""},"paste-as-markdown-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":77,"key":""},"paste-as-json-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":74,"key":""},"custom-actions":{"value":[]},"additional-actions":{"image-to-text":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-file":{"isShown":true,"paste-as-txt-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-png-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-html-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}},"transcode":{"isShown":true,"transcode-to-mp3":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"transcode-to-mp4":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}}},"paste-ai-configuration":{"active-provider-id":"","providers":[],"use-shared-credentials":true}},"name":"AdvancedPaste","version":"1"}
+{"properties":{"IsAIEnabled":{"value":false},"ShowCustomPreview":{"value":true},"ShowAIPaste":{"value":true},"CloseAfterLosingFocus":{"value":false},"advanced-paste-ui-hotkey":{"win":true,"ctrl":false,"alt":false,"shift":true,"code":86,"key":""},"paste-as-plain-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":79,"key":""},"paste-as-markdown-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":77,"key":""},"paste-as-json-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":74,"key":""},"custom-actions":{"value":[]},"additional-actions":{"image-to-text":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-file":{"isShown":true,"paste-as-txt-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-png-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-html-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}},"transcode":{"isShown":true,"transcode-to-mp3":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"transcode-to-mp4":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}}},"paste-ai-configuration":{"active-provider-id":"","providers":[],"use-shared-credentials":true}},"name":"AdvancedPaste","version":"1"}

src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs

@@ -26,6 +26,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             AdditionalActions = new();
             IsAIEnabled = false;
             ShowCustomPreview = true;
+            ShowAIPaste = true;
             CloseAfterLosingFocus = false;
             EnableClipboardPreview = true;
             PasteAIConfiguration = new();
@@ -73,6 +74,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool ShowCustomPreview { get; set; }
 
+        [JsonConverter(typeof(BoolPropertyJsonConverter))]
+        public bool ShowAIPaste { get; set; }
+
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool CloseAfterLosingFocus { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml

@@ -183,6 +183,9 @@
                                 <tkcontrols:SettingsCard Name="AdvancedPasteShowCustomPreviewSettingsCard" ContentAlignment="Left">
                                     <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard" IsChecked="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard Name="AdvancedPasteShowAIPasteSettingsCard" ContentAlignment="Left">
+                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowAIPasteSettingsCard" IsChecked="{x:Bind ViewModel.ShowAIPaste, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
                             </tkcontrols:SettingsExpander.Items>
                         </tkcontrols:SettingsExpander>
                     </controls:SettingsGroup>

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -4117,6 +4117,12 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AdvancedPaste_ShowCustomPreviewSettingsCard.Description" xml:space="preserve">
     <value>Preview the output of AI formats and Image to text before pasting</value>
   </data>
+  <data name="AdvancedPaste_ShowAIPasteSettingsCard.Header" xml:space="preserve">
+    <value>Show AI paste section</value>
+  </data>
+  <data name="AdvancedPaste_ShowAIPasteSettingsCard.Description" xml:space="preserve">
+    <value>Show the AI paste input box in the Advanced Paste window</value>
+  </data>
   <data name="AdvancedPaste_EnableAdvancedAI.Text" xml:space="preserve">
     <value>Advanced AI</value>
   </data>

src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs

@@ -543,6 +543,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool ShowAIPaste
+        {
+            get => _advancedPasteSettings.Properties.ShowAIPaste;
+            set
+            {
+                if (value != _advancedPasteSettings.Properties.ShowAIPaste)
+                {
+                    _advancedPasteSettings.Properties.ShowAIPaste = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
         public bool CloseAfterLosingFocus
         {
             get => _advancedPasteSettings.Properties.CloseAfterLosingFocus;
@@ -1221,6 +1234,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 OnPropertyChanged(nameof(ShowCustomPreview));
             }
 
+            if (target.ShowAIPaste != source.ShowAIPaste)
+            {
+                target.ShowAIPaste = source.ShowAIPaste;
+                OnPropertyChanged(nameof(ShowAIPaste));
+            }
+
             if (target.CloseAfterLosingFocus != source.CloseAfterLosingFocus)
             {
                 target.CloseAfterLosingFocus = source.CloseAfterLosingFocus;