Added space between items in ImportShortcutTemplatePopup.xaml

PixiEditor/Models/Commands/CommandController.cs

@@ -347,6 +347,7 @@ namespace PixiEditor.Models.Commands
 
             foreach (var command in Commands)
             {
+                Commands.RemoveShortcut(command, command.Shortcut);
                 Commands.AddShortcut(command, command.DefaultShortcut);
                 command.Shortcut = command.DefaultShortcut;
             }

PixiEditor/Views/Dialogs/ImportShortcutTemplatePopup.xaml

@@ -33,7 +33,7 @@
                       Margin="10">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <Grid>
+                    <Grid Margin="0,5">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="Auto"/>
@@ -55,10 +55,10 @@
                                     Visibility="{Binding ProvidesFromInstallation, Converter={BoolToVisibilityConverter}}"
                                     IsEnabled="{Binding HasInstallationPresent}"/>
                             <Button Command="{xaml:Command PixiEditor.Shortcuts.Provider.ImportFile, UseProvided=True}"
-                                    CommandParameter="{Binding}" Content="Import"
+                                    CommandParameter="{Binding}" Content="Import file"
                                     Visibility="{Binding ProvidesImport, Converter={BoolToVisibilityConverter}}"/>
                             <Button Command="{xaml:Command PixiEditor.Shortcuts.Provider.ImportDefault, UseProvided=True}"
-                                    CommandParameter="{Binding}" Content="Use default"
+                                    CommandParameter="{Binding}" Content="Import defaults"
                                     Visibility="{Binding HasDefaultShortcuts, Converter={BoolToVisibilityConverter}}"/>
                         </StackPanel>
                     </Grid>

PixiEditor/Views/Dialogs/SettingsWindow.xaml

@@ -17,7 +17,7 @@
         mc:Ignorable="d"
         Title="Settings" Name="window" 
         Height="688" Width="780"
-        MinHeight="500" MinWidth="680"
+        MinHeight="500" MinWidth="665"
         WindowStyle="None" DataContext="{DynamicResource SettingsWindowViewModel}"
         WindowStartupLocation="CenterScreen"
         BorderBrush="Black" BorderThickness="1"
@@ -203,7 +203,7 @@
                     <Button Command="{cmds:Command PixiEditor.Shortcuts.Import}"
                             Content="Import"/>
                     <Button Command="{cmds:Command PixiEditor.Shortcuts.OpenTemplatePopup}"
-                            Content="Import other"/>
+                            Content="Import from..."/>
                     <Button Command="{cmds:Command PixiEditor.Shortcuts.Reset}"
                             Content="Reset all"/>
                 </StackPanel>