mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-20 01:59:50 +01:00
Compare commits
4 Commits
async-cpp-
...
v0.49.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6dd74f5762 | ||
|
|
61b1a4b382 | ||
|
|
2a07c46500 | ||
|
|
f5bc7896dd |
1
.github/actions/spell-check/expect.txt
vendored
1
.github/actions/spell-check/expect.txt
vendored
@@ -655,6 +655,7 @@ finalizer
|
|||||||
findfast
|
findfast
|
||||||
findstr
|
findstr
|
||||||
FIXEDFILEINFO
|
FIXEDFILEINFO
|
||||||
|
FFAA
|
||||||
FLASHZONES
|
FLASHZONES
|
||||||
FLASHZONESONQUICKSWITCH
|
FLASHZONESONQUICKSWITCH
|
||||||
flt
|
flt
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ namespace ColorPicker.Helpers
|
|||||||
/// <param name="color">The see cref="Color"/> for the hexadecimal presentation</param>
|
/// <param name="color">The see cref="Color"/> for the hexadecimal presentation</param>
|
||||||
/// <returns>A hexadecimal <see cref="string"/> representation of a RGB color</returns>
|
/// <returns>A hexadecimal <see cref="string"/> representation of a RGB color</returns>
|
||||||
private static string ColorToHex(Color color)
|
private static string ColorToHex(Color color)
|
||||||
=> $"#{color.R.ToString("X2", CultureInfo.InvariantCulture)}"
|
=> $"{color.R.ToString("X2", CultureInfo.InvariantCulture)}"
|
||||||
+ $"{color.G.ToString("X2", CultureInfo.InvariantCulture)}"
|
+ $"{color.G.ToString("X2", CultureInfo.InvariantCulture)}"
|
||||||
+ $"{color.B.ToString("X2", CultureInfo.InvariantCulture)}";
|
+ $"{color.B.ToString("X2", CultureInfo.InvariantCulture)}";
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,9 @@ namespace ColorPicker.ViewModels
|
|||||||
new ColorFormatModel()
|
new ColorFormatModel()
|
||||||
{
|
{
|
||||||
FormatName = ColorRepresentationType.HEX.ToString(),
|
FormatName = ColorRepresentationType.HEX.ToString(),
|
||||||
Convert = (Color color) => { return ColorRepresentationHelper.GetStringRepresentationFromMediaColor(color, ColorRepresentationType.HEX); },
|
#pragma warning disable CA1304 // Specify CultureInfo
|
||||||
|
Convert = (Color color) => { return ColorRepresentationHelper.GetStringRepresentationFromMediaColor(color, ColorRepresentationType.HEX).ToLower(); },
|
||||||
|
#pragma warning restore CA1304 // Specify CultureInfo
|
||||||
});
|
});
|
||||||
|
|
||||||
_allColorRepresentations.Add(
|
_allColorRepresentations.Add(
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Microsoft.ColorPicker.UnitTests
|
|||||||
{
|
{
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
[DataRow(ColorRepresentationType.CMYK, "cmyk(0%, 0%, 0%, 100%)")]
|
[DataRow(ColorRepresentationType.CMYK, "cmyk(0%, 0%, 0%, 100%)")]
|
||||||
[DataRow(ColorRepresentationType.HEX, "#000000")]
|
[DataRow(ColorRepresentationType.HEX, "000000")]
|
||||||
[DataRow(ColorRepresentationType.NCol, "R0, 0%, 100%")]
|
[DataRow(ColorRepresentationType.NCol, "R0, 0%, 100%")]
|
||||||
[DataRow(ColorRepresentationType.HSB, "hsb(0, 0%, 0%)")]
|
[DataRow(ColorRepresentationType.HSB, "hsb(0, 0%, 0%)")]
|
||||||
[DataRow(ColorRepresentationType.HSI, "hsi(0, 0%, 0%)")]
|
[DataRow(ColorRepresentationType.HSI, "hsi(0, 0%, 0%)")]
|
||||||
|
|||||||
@@ -180,11 +180,7 @@ void PowerPreviewModule::apply_settings(const PowerToysSettings::PowerToyValues&
|
|||||||
{
|
{
|
||||||
const bool isElevated = is_process_elevated(false);
|
const bool isElevated = is_process_elevated(false);
|
||||||
bool notifyShell = false;
|
bool notifyShell = false;
|
||||||
if (!isElevated)
|
bool updatesNeeded = false;
|
||||||
{
|
|
||||||
show_update_warning_message();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto& fileExplorerModule : m_fileExplorerModules)
|
for (auto& fileExplorerModule : m_fileExplorerModules)
|
||||||
{
|
{
|
||||||
@@ -195,6 +191,11 @@ void PowerPreviewModule::apply_settings(const PowerToysSettings::PowerToyValues&
|
|||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Mark that updates were to the registry were needed
|
||||||
|
updatesNeeded = true;
|
||||||
|
}
|
||||||
|
|
||||||
// (Un)Apply registry changes depending on the new setting value
|
// (Un)Apply registry changes depending on the new setting value
|
||||||
const bool updated = *toggle ? fileExplorerModule.registryChanges.apply() : fileExplorerModule.registryChanges.unApply();
|
const bool updated = *toggle ? fileExplorerModule.registryChanges.apply() : fileExplorerModule.registryChanges.unApply();
|
||||||
@@ -209,6 +210,10 @@ void PowerPreviewModule::apply_settings(const PowerToysSettings::PowerToyValues&
|
|||||||
Trace::PowerPreviewSettingsUpdateFailed(fileExplorerModule.settingName.c_str(), !*toggle, *toggle, true);
|
Trace::PowerPreviewSettingsUpdateFailed(fileExplorerModule.settingName.c_str(), !*toggle, *toggle, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!isElevated && updatesNeeded)
|
||||||
|
{
|
||||||
|
show_update_warning_message();
|
||||||
|
}
|
||||||
if (notifyShell)
|
if (notifyShell)
|
||||||
{
|
{
|
||||||
SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
|
SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
|
|||||||
SelectableColorRepresentations = new Dictionary<ColorRepresentationType, string>
|
SelectableColorRepresentations = new Dictionary<ColorRepresentationType, string>
|
||||||
{
|
{
|
||||||
{ ColorRepresentationType.CMYK, "CMYK - cmyk(100%, 50%, 75%, 0%)" },
|
{ ColorRepresentationType.CMYK, "CMYK - cmyk(100%, 50%, 75%, 0%)" },
|
||||||
{ ColorRepresentationType.HEX, "HEX - #FFAA00" },
|
{ ColorRepresentationType.HEX, "HEX - ffaa00" },
|
||||||
{ ColorRepresentationType.HSB, "HSB - hsb(100, 50%, 75%)" },
|
{ ColorRepresentationType.HSB, "HSB - hsb(100, 50%, 75%)" },
|
||||||
{ ColorRepresentationType.HSI, "HSI - hsi(100, 50%, 75%)" },
|
{ ColorRepresentationType.HSI, "HSI - hsi(100, 50%, 75%)" },
|
||||||
{ ColorRepresentationType.HSL, "HSL - hsl(100, 50%, 75%)" },
|
{ ColorRepresentationType.HSL, "HSL - hsl(100, 50%, 75%)" },
|
||||||
@@ -199,7 +199,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
|
|||||||
var cielabFormatName = ColorRepresentationType.CIELAB.ToString();
|
var cielabFormatName = ColorRepresentationType.CIELAB.ToString();
|
||||||
var ciexyzFormatName = ColorRepresentationType.CIEXYZ.ToString();
|
var ciexyzFormatName = ColorRepresentationType.CIEXYZ.ToString();
|
||||||
|
|
||||||
formatsUnordered.Add(new ColorFormatModel(hexFormatName, "#EF68FF", visibleFormats.ContainsKey(hexFormatName) && visibleFormats[hexFormatName]));
|
formatsUnordered.Add(new ColorFormatModel(hexFormatName, "ef68ff", visibleFormats.ContainsKey(hexFormatName) && visibleFormats[hexFormatName]));
|
||||||
formatsUnordered.Add(new ColorFormatModel(rgbFormatName, "rgb(239, 104, 255)", visibleFormats.ContainsKey(rgbFormatName) && visibleFormats[rgbFormatName]));
|
formatsUnordered.Add(new ColorFormatModel(rgbFormatName, "rgb(239, 104, 255)", visibleFormats.ContainsKey(rgbFormatName) && visibleFormats[rgbFormatName]));
|
||||||
formatsUnordered.Add(new ColorFormatModel(hslFormatName, "hsl(294, 100%, 70%)", visibleFormats.ContainsKey(hslFormatName) && visibleFormats[hslFormatName]));
|
formatsUnordered.Add(new ColorFormatModel(hslFormatName, "hsl(294, 100%, 70%)", visibleFormats.ContainsKey(hslFormatName) && visibleFormats[hslFormatName]));
|
||||||
formatsUnordered.Add(new ColorFormatModel(hsvFormatName, "hsv(294, 59%, 100%)", visibleFormats.ContainsKey(hsvFormatName) && visibleFormats[hsvFormatName]));
|
formatsUnordered.Add(new ColorFormatModel(hsvFormatName, "hsv(294, 59%, 100%)", visibleFormats.ContainsKey(hsvFormatName) && visibleFormats[hsvFormatName]));
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
using Microsoft.PowerToys.Settings.UI.Library;
|
using Microsoft.PowerToys.Settings.UI.Library;
|
||||||
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
|
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
|
||||||
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
|
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
|
||||||
|
using Microsoft.PowerToys.Settings.UI.Views;
|
||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using Windows.UI.Xaml.Navigation;
|
using Windows.UI.Xaml.Navigation;
|
||||||
|
|
||||||
@@ -26,6 +27,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|||||||
|
|
||||||
private void SettingsLaunchButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
|
private void SettingsLaunchButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (OobeShellPage.OpenMainWindowCallback != null)
|
||||||
|
{
|
||||||
|
OobeShellPage.OpenMainWindowCallback(typeof(VideoConferencePage));
|
||||||
|
}
|
||||||
|
|
||||||
ViewModel.LogOpeningSettingsEvent();
|
ViewModel.LogOpeningSettingsEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,13 +45,10 @@
|
|||||||
x:Uid="ImagesSizesListView"
|
x:Uid="ImagesSizesListView"
|
||||||
ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}"
|
ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}"
|
||||||
SelectionMode="None"
|
SelectionMode="None"
|
||||||
ScrollViewer.HorizontalScrollMode="Enabled"
|
|
||||||
ScrollViewer.HorizontalScrollBarVisibility="Auto"
|
|
||||||
ScrollViewer.IsHorizontalRailEnabled="True"
|
|
||||||
ContainerContentChanging="ImagesSizesListView_ContainerContentChanging">
|
ContainerContentChanging="ImagesSizesListView_ContainerContentChanging">
|
||||||
<ListView.ItemTemplate>
|
<ListView.ItemTemplate>
|
||||||
<DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize">
|
<DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize">
|
||||||
<Grid AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
|
<Grid AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{ThemeResource CardBackgroundBrush}"
|
Background="{ThemeResource CardBackgroundBrush}"
|
||||||
BorderThickness="{ThemeResource CardBorderThickness}"
|
BorderThickness="{ThemeResource CardBorderThickness}"
|
||||||
@@ -59,12 +56,10 @@
|
|||||||
CornerRadius="{ThemeResource ControlCornerRadius}"
|
CornerRadius="{ThemeResource ControlCornerRadius}"
|
||||||
Padding="0,0,16,0"
|
Padding="0,0,16,0"
|
||||||
MinHeight="68">
|
MinHeight="68">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="56" />
|
<ColumnDefinition Width="56" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="52" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<StackPanel Orientation="Vertical" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,16,0">
|
<StackPanel Orientation="Vertical" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,16,0">
|
||||||
|
|||||||
Reference in New Issue
Block a user