mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Revert buttons on KBM Landing page (#2870)

Browse Source 
* Revert buttons

* Fixed button placement
This commit is contained in:
Arjun Balgovind 2020-05-12 09:21:54 -07:00 committed by GitHub
parent 69cde6092b
commit 66c2d1cba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 233 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -177,7 +177,7 @@
<value>Select the profile to display the active key remap and shortcuts</value> <value>Select the profile to display the active key remap and shortcuts</value>
<comment>Keyboard Manager configuration dropdown decription</comment> <comment>Keyboard Manager configuration dropdown decription</comment>
</data> </data>
<data name="KeyboardManager_RemapKeyboardButton.Label" xml:space="preserve"> <data name="KeyboardManager_RemapKeyboardButton.Content" xml:space="preserve">
<value>Remap a key</value> <value>Remap a key</value>
<comment>Keyboard Manager remap keyboard button content</comment> <comment>Keyboard Manager remap keyboard button content</comment>
</data> </data>
@ -185,7 +185,7 @@
<value>Remap keyboard</value> <value>Remap keyboard</value>
<comment>Keyboard Manager remap keyboard header</comment> <comment>Keyboard Manager remap keyboard header</comment>
</data> </data>
<data name="KeyboardManager_RemapShortcutsButton.Label" xml:space="preserve"> <data name="KeyboardManager_RemapShortcutsButton.Content" xml:space="preserve">
<value>Remap a shortcut</value> <value>Remap a shortcut</value>
<comment>Keyboard Manager remap shortcuts button</comment> <comment>Keyboard Manager remap shortcuts button</comment>
</data> </data>

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

@ -143,7 +143,11 @@
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<Button x:Uid="KeyboardManager_RemapKeyboardButton"
Margin="{StaticResource SmallTopMargin}"
Style="{StaticResource AccentButtonStyle}"
Command="{Binding Path=RemapKeyboardCommand}"
IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
<ListView x:Name="RemapKeysList" <ListView x:Name="RemapKeysList"
extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}" extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
@ -161,14 +165,14 @@
Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}" Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}"
/> />
<AppBarButton x:Uid="KeyboardManager_RemapKeyboardButton" <!--<AppBarButton x:Uid="KeyboardManager_RemapKeyboardButton"
Icon="Add" Icon="Add"
Width="370" Width="370"
Style="{StaticResource AddItemAppBarButtonStyle}" Style="{StaticResource AddItemAppBarButtonStyle}"
Command="{Binding Path=RemapKeyboardCommand}" Command="{Binding Path=RemapKeyboardCommand}"
Margin="{StaticResource AddItemButtonMargin}" Margin="{StaticResource AddItemButtonMargin}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/> IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>-->
<TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader" <TextBlock x:Uid="KeyboardManager_RemapShortcutsHeader"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>
@ -176,7 +180,12 @@
<TextBlock Text="Click below to remap a shortcut (hotkey) to another shortcut" <TextBlock Text="Click below to remap a shortcut (hotkey) to another shortcut"
TextWrapping="Wrap" Margin="{StaticResource SmallTopMargin}"/> TextWrapping="Wrap" Margin="{StaticResource SmallTopMargin}"/>
<Button x:Uid="KeyboardManager_RemapShortcutsButton"
Margin="{StaticResource SmallTopMargin}"
Style="{StaticResource AccentButtonStyle}"
Command="{Binding Path=EditShortcutCommand}"
IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"
/>
<ListView x:Name="RemapShortcutsList" <ListView x:Name="RemapShortcutsList"
extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}" extensions:ListViewExtensions.AlternateColor="{ThemeResource SystemControlBackgroundListLowBrush}"
@ -194,7 +203,7 @@
Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}" Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}"
/> />
<AppBarButton x:Uid="KeyboardManager_RemapShortcutsButton" <!--<AppBarButton x:Uid="KeyboardManager_RemapShortcutsButton"
Icon="Add" Icon="Add"
Width="370" Width="370"
Style="{StaticResource AddItemAppBarButtonStyle}" Style="{StaticResource AddItemAppBarButtonStyle}"
@ -202,7 +211,7 @@
IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}" IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"
Margin="{StaticResource AddItemButtonMargin}" Margin="{StaticResource AddItemButtonMargin}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
/> />-->
</StackPanel> </StackPanel>
<StackPanel <StackPanel