[General]Reduce installer size by flattening application paths (#27451)

* Flatten everything and succeed build * Figure out Settings assets * Remove UseCommonOutputDirectory tag * Proper settings app path * [VCM] Fix assets location * Fix some runtime paths * [RegistryPreview]Use MRTCore specific pri file * [Hosts]Use MRTCore specific pri file * [Settings]Use MRTCore specific pri file * [Peek]Use MRTCore specific pri file * [FileLocksmith]Use MRTCore specific pri file * [ScreenRuler]Use MRTCore specific pri file * [PowerRename]Use MRTCore specific pri file * [Peek]Move assets to own folder * [FileLocksmith] Use own Assets path * [Hosts]Use own assets folder * [PowerRename]Use own assets dir * [MeasureTool] Use its own assets folder * [ImageResizer]Use its own assets path * Fix spellcheck * Fix tab instead of space in project files * Normalize target frameworks and platforms * Remove WINRT_NO_MAKE_DETECTION flag. No longer needed? * Fix AOT and Hosts locations * Fix Dll version differences on dependency * Add Common.UI.csproj as refernce to fix dll versions * Update ControlzEx to normalize dll versions * Update System.Management version to 7.0.2 * Add GPOWrapper to Registry Preview to fix dll versions * [PTRun]Reference Microsoft.Extensions.Hosting to fix dll versions * Fix remaining output paths / dll version conflicts * [KeyboardManager]Executables still on their own directories * Fix Monaco paths * WinAppSDK apps get to play outside again * Enable VCM settings again * Fix KBM Editor path again * [Monaco]Set to own Assets dir * Fix installer preamble; Fix publish. remove unneeded publishes * Remove Hardlink functions * Installer builds again (still needs work to work) * Readd Monaco to spellcheck excludes * Fix spellcheck and call publish.cmd again * [Installer] Remove components that don't need own dirs * [Installer] Refactor Power Launcher * [Installer] Refactor Color Picker * [Installer] Refactor Monaco assets * [Installer]Generate File script no longer needs to remove files * [Installer]Refactor FileLocksmith * [Installer] Refactor Hosts * [Installer]Refactor Image Resizer * [Installer]Refactor MouseUtils * [Installer]Refactor MWB * [Installer]Refactor MeasureTool * [Installer]Refactor Peek * [Installer]Refactor PowerRename and registry fixes * [Installer]Refactor RegistryPreview * [Installer]Refactor ShortcutGuide * [Installer]Refactor Settings * [Installer]Clean up some unused stuff * [Installer]Clean up stuff for user install * [Installer]Fix WinUi3Apps wxs * [Installer]Fix misplaced folders * [Installer]Move x86 VCM dll to right path * Fix monaco language list location * [Installer]Fix VCM directory reference * [CI]Fix signing * [Installer] Fix resources folder for release CI * [ci]Looks like we still ship NLog on PowerToys Run * [Settings]Add dependency to avoid dll collision with Experimentation * [RegistryPreview]Move XAML files to own path * [RegistryPreview]Fix app icon * [Hosts]Move XAML files to their own path * [FileLocksmith]Move XAML files to their own path * [Peek]Move XAML files to own path * [ScreenRuler]Move XAML files to its own path * [Settings]Move XAML to its own path * [ColorPicker]Move Resources to Assets * [ShortcutGuide]Move svgs to own Assets path * [Awake]Move images to assets path * [Runner]Remove debug checks for PowerToys Run assets * [PTRun]Move images to its own assets path * [ImageResizer]Icon for context menu on own assets path * [PowerRename]Move ico to its own path * Remove unneeded intermediary directories * Remove further int dirs * Move tests to its own output path * Fix spellcheck * spellcheck: remove warnings * [CppAnalyzers]Ignore rule in a tool * [CI]Check if all deps.json files reference same versions * fix spellcheck * [ci]Fix task identation * [ci]Add script to guard against asset conflicts * [ci]Add more deps.json audit steps in the release build * Add xbf to spellcheck expects * Fix typo in asset conflict check scripts * Fix some more dependency conflicts * Downgrade CsWinRT to have the same dll version as sdk * [ci]Do a recursive check for every deps.json * Fix spellcheck error inside comment * [ci]Fix asset script error * [ci]Name deps.json verify tasks a bit better * [ci]Improve deps json verify script output * [ci]Update WinRT version to the same running in CI * Also upgrade CsWinRT in NOTICE.MD * [PowerRename]Move XAML files to own path * [Common]Fix Settings executable path * [ci]Verify there's no xbf files in app directories * [installer]Fix firewall path * [Monaco]Move new files to their proper assets path * [Monaco]Fix paths for new files after merge * [Feedback]Removed unneeded build conditions * [Feedback]Clear vcxproj direct reference to frameworks * [Feedback]RunPlugins name to hold PTRun plugins * [Feedback]Remove unneeded foreach * [Feedback]Shortcut Guide svgs with ** in project file * [Feedback]Fix spellcheck
2026-04-08 04:07:40 +02:00 · 2023-07-20 00:12:46 +01:00
parent 1f44085e41
commit 864b862952
762 changed files with 2005 additions and 3118 deletions
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -0,0 +1,230 @@
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.KeyboardManagerPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Library"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <converters:VisibleIfNotEmptyConverter x:Key="visibleIfNotEmptyConverter" />
+
+        <Style
+            x:Name="KeysListViewContainerStyle"
+            TargetType="ListViewItem">
+            <Setter Property="IsTabStop" Value="False" />
+        </Style>
+
+        <DataTemplate
+            x:Key="OriginalKeyTemplate"
+            x:DataType="x:String">
+            <controls:KeyVisual
+                Content="{Binding}"
+                VisualType="SmallOutline" />
+        </DataTemplate>
+
+        <DataTemplate
+            x:Key="RemappedKeyTemplate"
+            x:DataType="x:String">
+            <controls:KeyVisual
+                Content="{Binding}"
+                VisualType="Small" />
+        </DataTemplate>
+
+        <!--<DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel">
+            <StackPanel
+                Name="KeyboardManager_RemappedKeysListItem"
+                x:Uid="KeyboardManager_RemappedKeysListItem"
+                Orientation="Horizontal"
+                Height="56">
+
+            </StackPanel>
+        </DataTemplate>-->
+        <!--<DataTemplate x:Name="ShortcutKeysListViewTemplate" x:DataType="Lib:AppSpecificKeysDataModel">
+            <StackPanel
+                Name="KeyboardManager_RemappedShortcutsListItem"
+                x:Uid="KeyboardManager_RemappedShortcutsListItem"
+                Orientation="Horizontal"
+                Height="56">
+
+        </DataTemplate>-->
+    </Page.Resources>
+
+    <controls:SettingsPageControl
+        x:Uid="KeyboardManager"
+        ModuleImageSource="ms-appx:///Assets/Settings/Modules/KBM.png">
+        <controls:SettingsPageControl.ModuleContent>
+            <StackPanel Orientation="Vertical" ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
+                <labs:SettingsCard
+                    x:Uid="KeyboardManager_EnableToggle"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.Enabled, Mode=TwoWay}" />
+                    <labs:SettingsCard.Description>
+                        <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys">
+                            <TextBlock
+                                x:Uid="KBM_KeysCannotBeRemapped"
+                                FontWeight="SemiBold" />
+                        </HyperlinkButton>
+                    </labs:SettingsCard.Description>
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
+                    IsClosable="False"
+                    IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+
+                <controls:SettingsGroup
+                    x:Uid="KeyboardManager_Keys"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
+                    <labs:SettingsCard
+                        x:Uid="KeyboardManager_RemapKeyboardButton"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 FontSize=14,
+                                                 Glyph=&#xE8A7;}"
+                        Command="{Binding Path=RemapKeyboardCommand}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE92E;}"
+                        IsClickEnabled="True" />
+
+                    <ListView
+                        x:Name="RemapKeysList"
+                        x:Uid="RemapKeysList"
+                        IsSwipeEnabled="False"
+                        ItemsSource="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay}"
+                        SelectionMode="None"
+                        Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate x:DataType="Lib:KeysDataModel">
+                                <labs:SettingsCard ContentAlignment="Left">
+                                    <StackPanel Orientation="Horizontal">
+                                        <ItemsControl
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource OriginalKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedOriginalKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <controls:IsEnabledTextBlock
+                                            x:Uid="To"
+                                            Margin="8,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SecondaryIsEnabledTextBlockStyle}" />
+                                        <ItemsControl
+                                            Name="KeyboardManager_RemappedTo"
+                                            x:Uid="KeyboardManager_RemappedTo"
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource RemappedKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedNewRemapKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                    </StackPanel>
+                                </labs:SettingsCard>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup
+                    x:Uid="KeyboardManager_Shortcuts"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
+                    <labs:SettingsCard
+                        x:Uid="KeyboardManager_RemapShortcutsButton"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 FontSize=14,
+                                                 Glyph=&#xE8A7;}"
+                        Command="{Binding Path=EditShortcutCommand}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE92E;}"
+                        IsClickEnabled="True" />
+
+                    <ListView
+                        x:Name="RemapShortcutsList"
+                        x:Uid="RemapShortcutsList"
+                        IsSwipeEnabled="False"
+                        ItemsSource="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay}"
+                        SelectionMode="None"
+                        Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
+                        <ListView.ItemTemplate>
+                            <DataTemplate x:DataType="Lib:AppSpecificKeysDataModel">
+                                <labs:SettingsCard ContentAlignment="Left">
+                                    <StackPanel Orientation="Horizontal">
+                                        <ItemsControl
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource OriginalKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedOriginalKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <controls:IsEnabledTextBlock
+                                            x:Uid="To"
+                                            Margin="8,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SecondaryIsEnabledTextBlockStyle}" />
+
+                                        <ItemsControl
+                                            Name="KeyboardManager_RemappedTo"
+                                            x:Uid="KeyboardManager_RemappedTo"
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource RemappedKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedNewRemapKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <Border
+                                            Margin="16,0,0,0"
+                                            Padding="12,4,12,6"
+                                            VerticalAlignment="Center"
+                                            CornerRadius="12">
+                                            <Border.Background>
+                                                <SolidColorBrush
+                                                    Opacity="0.3"
+                                                    Color="{ThemeResource SystemAccentColor}" />
+                                            </Border.Background>
+                                            <TextBlock Text="{x:Bind TargetApp}" />
+                                        </Border>
+                                    </StackPanel>
+                                </labs:SettingsCard>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </controls:SettingsGroup>
+            </StackPanel>
+        </controls:SettingsPageControl.ModuleContent>
+        <controls:SettingsPageControl.PrimaryLinks>
+            <controls:PageLink
+                x:Uid="LearnMore_KBM"
+                Link="https://aka.ms/PowerToysOverview_KeyboardManager" />
+        </controls:SettingsPageControl.PrimaryLinks>
+    </controls:SettingsPageControl>
+</Page>