mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-20 18:20:27 +01:00
Compare commits
1 Commits
async-cpp-
...
issue/3296
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
240083bede |
@@ -47,6 +47,8 @@ internal sealed class IntegrationTestUserSettings : IUserSettings
|
|||||||
|
|
||||||
public bool ShowCustomPreview => false;
|
public bool ShowCustomPreview => false;
|
||||||
|
|
||||||
|
public bool ShowAIPaste => true;
|
||||||
|
|
||||||
public bool CloseAfterLosingFocus => false;
|
public bool CloseAfterLosingFocus => false;
|
||||||
|
|
||||||
public bool EnableClipboardPreview => true;
|
public bool EnableClipboardPreview => true;
|
||||||
|
|||||||
@@ -251,7 +251,8 @@
|
|||||||
Margin="20,0,20,0"
|
Margin="20,0,20,0"
|
||||||
x:FieldModifier="public"
|
x:FieldModifier="public"
|
||||||
IsEnabled="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay}"
|
IsEnabled="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay}"
|
||||||
TabIndex="0">
|
TabIndex="0"
|
||||||
|
Visibility="{x:Bind ViewModel.ShowAIPasteSection, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
|
||||||
<controls:PromptBox.Footer>
|
<controls:PromptBox.Footer>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ namespace AdvancedPaste.Settings
|
|||||||
|
|
||||||
public bool ShowCustomPreview { get; }
|
public bool ShowCustomPreview { get; }
|
||||||
|
|
||||||
|
public bool ShowAIPaste { get; }
|
||||||
|
|
||||||
public bool CloseAfterLosingFocus { get; }
|
public bool CloseAfterLosingFocus { get; }
|
||||||
|
|
||||||
public bool EnableClipboardPreview { get; }
|
public bool EnableClipboardPreview { get; }
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ namespace AdvancedPaste.Settings
|
|||||||
|
|
||||||
public bool ShowCustomPreview { get; private set; }
|
public bool ShowCustomPreview { get; private set; }
|
||||||
|
|
||||||
|
public bool ShowAIPaste { get; private set; }
|
||||||
|
|
||||||
public bool CloseAfterLosingFocus { get; private set; }
|
public bool CloseAfterLosingFocus { get; private set; }
|
||||||
|
|
||||||
public bool EnableClipboardPreview { get; private set; }
|
public bool EnableClipboardPreview { get; private set; }
|
||||||
@@ -54,6 +56,7 @@ namespace AdvancedPaste.Settings
|
|||||||
|
|
||||||
IsAIEnabled = false;
|
IsAIEnabled = false;
|
||||||
ShowCustomPreview = true;
|
ShowCustomPreview = true;
|
||||||
|
ShowAIPaste = true;
|
||||||
CloseAfterLosingFocus = false;
|
CloseAfterLosingFocus = false;
|
||||||
EnableClipboardPreview = true;
|
EnableClipboardPreview = true;
|
||||||
PasteAIConfiguration = new PasteAIConfiguration();
|
PasteAIConfiguration = new PasteAIConfiguration();
|
||||||
@@ -109,6 +112,7 @@ namespace AdvancedPaste.Settings
|
|||||||
|
|
||||||
IsAIEnabled = properties.IsAIEnabled;
|
IsAIEnabled = properties.IsAIEnabled;
|
||||||
ShowCustomPreview = properties.ShowCustomPreview;
|
ShowCustomPreview = properties.ShowCustomPreview;
|
||||||
|
ShowAIPaste = properties.ShowAIPaste;
|
||||||
CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
|
CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
|
||||||
EnableClipboardPreview = properties.EnableClipboardPreview;
|
EnableClipboardPreview = properties.EnableClipboardPreview;
|
||||||
PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();
|
PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();
|
||||||
|
|||||||
@@ -234,6 +234,8 @@ namespace AdvancedPaste.ViewModels
|
|||||||
|
|
||||||
public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
|
public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
|
||||||
|
|
||||||
|
public bool ShowAIPasteSection => _userSettings.ShowAIPaste && IsAllowedByGPO;
|
||||||
|
|
||||||
public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
|
public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
|
||||||
|
|
||||||
private PasteFormats CustomAIFormat =>
|
private PasteFormats CustomAIFormat =>
|
||||||
@@ -320,6 +322,7 @@ namespace AdvancedPaste.ViewModels
|
|||||||
OnPropertyChanged(nameof(AIProviders));
|
OnPropertyChanged(nameof(AIProviders));
|
||||||
OnPropertyChanged(nameof(AllowedAIProviders));
|
OnPropertyChanged(nameof(AllowedAIProviders));
|
||||||
OnPropertyChanged(nameof(ShowClipboardPreview));
|
OnPropertyChanged(nameof(ShowClipboardPreview));
|
||||||
|
OnPropertyChanged(nameof(ShowAIPasteSection));
|
||||||
|
|
||||||
NotifyActiveProviderChanged();
|
NotifyActiveProviderChanged();
|
||||||
|
|
||||||
|
|||||||
@@ -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"}
|
||||||
@@ -26,6 +26,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
AdditionalActions = new();
|
AdditionalActions = new();
|
||||||
IsAIEnabled = false;
|
IsAIEnabled = false;
|
||||||
ShowCustomPreview = true;
|
ShowCustomPreview = true;
|
||||||
|
ShowAIPaste = true;
|
||||||
CloseAfterLosingFocus = false;
|
CloseAfterLosingFocus = false;
|
||||||
EnableClipboardPreview = true;
|
EnableClipboardPreview = true;
|
||||||
PasteAIConfiguration = new();
|
PasteAIConfiguration = new();
|
||||||
@@ -73,6 +74,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
||||||
public bool ShowCustomPreview { get; set; }
|
public bool ShowCustomPreview { get; set; }
|
||||||
|
|
||||||
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
||||||
|
public bool ShowAIPaste { get; set; }
|
||||||
|
|
||||||
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
||||||
public bool CloseAfterLosingFocus { get; set; }
|
public bool CloseAfterLosingFocus { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -183,6 +183,9 @@
|
|||||||
<tkcontrols:SettingsCard Name="AdvancedPasteShowCustomPreviewSettingsCard" ContentAlignment="Left">
|
<tkcontrols:SettingsCard Name="AdvancedPasteShowCustomPreviewSettingsCard" ContentAlignment="Left">
|
||||||
<controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard" IsChecked="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
|
<controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard" IsChecked="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
|
||||||
</tkcontrols:SettingsCard>
|
</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.Items>
|
||||||
</tkcontrols:SettingsExpander>
|
</tkcontrols:SettingsExpander>
|
||||||
</controls:SettingsGroup>
|
</controls:SettingsGroup>
|
||||||
|
|||||||
@@ -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">
|
<data name="AdvancedPaste_ShowCustomPreviewSettingsCard.Description" xml:space="preserve">
|
||||||
<value>Preview the output of AI formats and Image to text before pasting</value>
|
<value>Preview the output of AI formats and Image to text before pasting</value>
|
||||||
</data>
|
</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">
|
<data name="AdvancedPaste_EnableAdvancedAI.Text" xml:space="preserve">
|
||||||
<value>Advanced AI</value>
|
<value>Advanced AI</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -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
|
public bool CloseAfterLosingFocus
|
||||||
{
|
{
|
||||||
get => _advancedPasteSettings.Properties.CloseAfterLosingFocus;
|
get => _advancedPasteSettings.Properties.CloseAfterLosingFocus;
|
||||||
@@ -1221,6 +1234,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
OnPropertyChanged(nameof(ShowCustomPreview));
|
OnPropertyChanged(nameof(ShowCustomPreview));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (target.ShowAIPaste != source.ShowAIPaste)
|
||||||
|
{
|
||||||
|
target.ShowAIPaste = source.ShowAIPaste;
|
||||||
|
OnPropertyChanged(nameof(ShowAIPaste));
|
||||||
|
}
|
||||||
|
|
||||||
if (target.CloseAfterLosingFocus != source.CloseAfterLosingFocus)
|
if (target.CloseAfterLosingFocus != source.CloseAfterLosingFocus)
|
||||||
{
|
{
|
||||||
target.CloseAfterLosingFocus = source.CloseAfterLosingFocus;
|
target.CloseAfterLosingFocus = source.CloseAfterLosingFocus;
|
||||||
|
|||||||
Reference in New Issue
Block a user