mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-13 19:19:23 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Keyboard Manager UI tweaks (dev/build-features) (#2179)

Browse Source 
* Fix Issue 2163

* Commented out profiles UI

* Added banded list view rows

* Fixed spacing
This commit is contained in:
Arjun Balgovind 2020-04-17 18:06:36 -07:00 committed by GitHub
parent 3fc738b53a
commit fc7103f56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@ -126,6 +126,9 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version> <Version>6.2.9</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication"> <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
<Version>6.0.0</Version> <Version>6.0.0</Version>
</PackageReference> </PackageReference>

32
src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@ -5,14 +5,16 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views" xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
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:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels" xmlns:viewModel="using:Microsoft.PowerToys.Settings.UI.ViewModels"
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Page.Resources> <Page.Resources>
<viewmodels:RemapKeysModel x:Key="dummyData"/> <viewModel:RemapKeysModel x:Key="dummyData"/>
<viewModel:KeyboardManagerViewModel x:Key="eventViewModel"/>
<DataTemplate x:Name="KeysListViewTemplate" x:DataType="viewmodels:RemapKeysModel"> <DataTemplate x:Name="KeysListViewTemplate" x:DataType="viewModel:RemapKeysModel">
<Grid Height="56"> <Grid Height="56">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
@ -39,7 +41,7 @@
Grid.Column="1" Grid.Column="1"
FontSize="14" FontSize="14"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
<Border Background="{ThemeResource SystemAccentColor}" <Border Background="{ThemeResource SystemAccentColor}"
CornerRadius="4" CornerRadius="4"
Grid.Column="2" Grid.Column="2"
@ -100,7 +102,7 @@
IsOn="True" IsOn="True"
Margin="{StaticResource SmallTopMargin}" /> Margin="{StaticResource SmallTopMargin}" />
<TextBlock x:Uid="KeyboardManager_ConfigHeader" <!--<TextBlock x:Uid="KeyboardManager_ConfigHeader"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>
<TextBlock x:Uid="KeyboardManager_ProfileDescription" <TextBlock x:Uid="KeyboardManager_ProfileDescription"
@ -108,10 +110,10 @@
<ComboBox SelectedIndex="1" MinWidth="160" <ComboBox SelectedIndex="1" MinWidth="160"
Margin="{StaticResource SmallTopMargin}"> Margin="{StaticResource SmallTopMargin}">
<ComboBoxItem Content="Config-1"/> <ComboBoxItem Content="Config-1"/>
<ComboBoxItem Content="Config-2"/> <ComboBoxItem Content="Config-2"/>
<ComboBoxItem Content="Config-3"/> <ComboBoxItem Content="Config-3"/>
</ComboBox> </ComboBox>-->
<TextBlock x:Uid="KeyboardManager_RemapKeyboardHeader" <TextBlock x:Uid="KeyboardManager_RemapKeyboardHeader"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>
@ -126,6 +128,7 @@
Command="{Binding Path=RemapKeyboardCommand}"/> Command="{Binding Path=RemapKeyboardCommand}"/>
<ListView x:Name="RemapKeysList" <ListView x:Name="RemapKeysList"
extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
ItemsSource="{StaticResource dummyData}" ItemsSource="{StaticResource dummyData}"
ItemTemplate="{StaticResource KeysListViewTemplate}" ItemTemplate="{StaticResource KeysListViewTemplate}"
BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
@ -133,7 +136,9 @@
Width="350" Width="350"
MaxHeight="200" MaxHeight="200"
Margin="{StaticResource MediumTopBottomMargin}" Margin="{StaticResource MediumTopBottomMargin}"
HorizontalAlignment="Left"/> HorizontalAlignment="Left"
SelectionMode="None"
IsSwipeEnabled="False"/>
<TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader" <TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader"
@ -147,7 +152,8 @@
Style="{StaticResource ButtonRevealStyle}" Style="{StaticResource ButtonRevealStyle}"
Command="{Binding Path=EditShortcutCommand}"/> Command="{Binding Path=EditShortcutCommand}"/>
<ListView x:Name="RemapShortcutsList" <ListView x:Name="RemapShortcutsList"
extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
ItemsSource="{StaticResource dummyData}" ItemsSource="{StaticResource dummyData}"
ItemTemplate="{StaticResource KeysListViewTemplate}" ItemTemplate="{StaticResource KeysListViewTemplate}"
BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}" BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
@ -156,7 +162,9 @@
Width="350" Width="350"
MaxHeight="200" MaxHeight="200"
Margin="{StaticResource MediumTopBottomMargin}" Margin="{StaticResource MediumTopBottomMargin}"
HorizontalAlignment="Left"/> HorizontalAlignment="Left"
SelectionMode="None"
IsSwipeEnabled="False"/>
</StackPanel> </StackPanel>