remove obsolete UI Fonticon properties (#30668)
* remove obsolete UI Fonticon properties * Update LaunchPage.xaml * remove obsolete UI Fonticon properties * Revert "Merge branch 'UI-Fonticon-properties' of https://github.com/Jay-o-Way/PowerToys into UI-Fonticon-properties" This reverts commit119ec3d79c
, reversing changes made to0692c2f4ff
.
This commit is contained in:
Родитель
a94b3eec39
Коммит
6ea1c039dc
|
@ -6,7 +6,7 @@
|
||||||
xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
|
xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:ui="using:CommunityToolkit.WinUI.UI"
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<controls:SettingsPageControl x:Uid="EnvironmentVariables" ModuleImageSource="ms-appx:///Assets/Settings/Modules/EnvironmentVariables.png">
|
<controls:SettingsPageControl x:Uid="EnvironmentVariables" ModuleImageSource="ms-appx:///Assets/Settings/Modules/EnvironmentVariables.png">
|
||||||
|
@ -27,17 +27,13 @@
|
||||||
<controls:SettingsGroup x:Uid="EnvironmentVariables_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
<controls:SettingsGroup x:Uid="EnvironmentVariables_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
||||||
<controls1:SettingsCard
|
<controls1:SettingsCard
|
||||||
x:Uid="EnvironmentVariables_LaunchButtonControl"
|
x:Uid="EnvironmentVariables_LaunchButtonControl"
|
||||||
ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
FontSize=14,
|
|
||||||
Glyph=}"
|
|
||||||
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
<controls1:SettingsCard
|
<controls1:SettingsCard
|
||||||
x:Uid="EnvironmentVariables_Toggle_LaunchAdministrator"
|
x:Uid="EnvironmentVariables_Toggle_LaunchAdministrator"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.LaunchAdministratorEnabled}">
|
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.LaunchAdministratorEnabled}">
|
||||||
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.LaunchAdministrator}" />
|
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.LaunchAdministrator}" />
|
||||||
</controls1:SettingsCard>
|
</controls1:SettingsCard>
|
||||||
|
|
|
@ -29,8 +29,7 @@
|
||||||
<custom:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
<custom:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="FancyZones_LaunchEditorButtonControl"
|
x:Uid="FancyZones_LaunchEditorButtonControl"
|
||||||
ActionIcon="{ui:FontIcon FontSize=14,
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Command="{x:Bind ViewModel.LaunchEditorEventHandler}"
|
Command="{x:Bind ViewModel.LaunchEditorEventHandler}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
|
|
|
@ -27,8 +27,7 @@
|
||||||
<custom:SettingsGroup x:Uid="Hosts_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
<custom:SettingsGroup x:Uid="Hosts_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="Hosts_LaunchButtonControl"
|
x:Uid="Hosts_LaunchButtonControl"
|
||||||
ActionIcon="{ui:FontIcon FontSize=14,
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
|
|
|
@ -69,8 +69,7 @@
|
||||||
<custom:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
|
<custom:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="KeyboardManager_RemapKeyboardButton"
|
x:Uid="KeyboardManager_RemapKeyboardButton"
|
||||||
ActionIcon="{ui:FontIcon FontSize=14,
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Command="{Binding Path=RemapKeyboardCommand}"
|
Command="{Binding Path=RemapKeyboardCommand}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
|
@ -123,8 +122,7 @@
|
||||||
<custom:SettingsGroup x:Uid="KeyboardManager_Shortcuts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
|
<custom:SettingsGroup x:Uid="KeyboardManager_Shortcuts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="KeyboardManager_RemapShortcutsButton"
|
x:Uid="KeyboardManager_RemapShortcutsButton"
|
||||||
ActionIcon="{ui:FontIcon FontSize=14,
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Command="{Binding Path=EditShortcutCommand}"
|
Command="{Binding Path=EditShortcutCommand}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
|
|
|
@ -58,8 +58,7 @@
|
||||||
</controls:SettingsCard>
|
</controls:SettingsCard>
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="MouseUtils_FindMyMouse_ActivationShortcut"
|
x:Uid="MouseUtils_FindMyMouse_ActivationShortcut"
|
||||||
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationIntToVisibilityConverter}, ConverterParameter=3}">
|
Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationIntToVisibilityConverter}, ConverterParameter=3}">
|
||||||
<custom:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.FindMyMouseActivationShortcut, Mode=TwoWay}" />
|
<custom:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.FindMyMouseActivationShortcut, Mode=TwoWay}" />
|
||||||
</controls:SettingsCard>
|
</controls:SettingsCard>
|
||||||
|
|
|
@ -153,7 +153,7 @@
|
||||||
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.TabSelectsContextButtons, Mode=TwoWay}" />
|
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.TabSelectsContextButtons, Mode=TwoWay}" />
|
||||||
</controls:SettingsCard>
|
</controls:SettingsCard>
|
||||||
|
|
||||||
<controls:SettingsCard x:Uid="PowerLauncher_UsePinyin" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=}">
|
<controls:SettingsCard x:Uid="PowerLauncher_UsePinyin" HeaderIcon="{ui:FontIcon Glyph=}">
|
||||||
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.UsePinyin, Mode=TwoWay}" />
|
<ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.UsePinyin, Mode=TwoWay}" />
|
||||||
</controls:SettingsCard>
|
</controls:SettingsCard>
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,7 @@
|
||||||
<custom:SettingsGroup x:Uid="RegistryPreview_Launch_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsRegistryPreviewEnabled}">
|
<custom:SettingsGroup x:Uid="RegistryPreview_Launch_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsRegistryPreviewEnabled}">
|
||||||
<controls:SettingsCard
|
<controls:SettingsCard
|
||||||
x:Uid="RegistryPreview_LaunchButtonControl"
|
x:Uid="RegistryPreview_LaunchButtonControl"
|
||||||
ActionIcon="{ui:FontIcon FontSize=14,
|
ActionIcon="{ui:FontIcon Glyph=}"
|
||||||
Glyph=}"
|
|
||||||
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
Command="{x:Bind ViewModel.LaunchEventHandler}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
IsClickEnabled="True" />
|
IsClickEnabled="True" />
|
||||||
|
|
Загрузка…
Ссылка в новой задаче