Multiple fixes for Views and ViewModels.

This commit is contained in:
Daniel Kraus
2015-08-13 17:59:23 +02:00
parent 3a615eda8b
commit 63447def9b
7 changed files with 79 additions and 25 deletions

View File

@ -61,7 +61,8 @@
<DockPanel Margin="10">
<Label DockPanel.Dock="Top" Target="{Binding ElementName=settingsList}">Bitte Stil auswählen:</Label>
<StackPanel DockPanel.Dock="Right" Margin="10 0 0 0">
<Button Command="{Binding UseSettingsCommand}" IsDefault="True" x:Name="OkButton">
<Button Command="{Binding UseSettingsCommand}" IsDefault="True" x:Name="OkButton"
ToolTip="Stil auswählen und Textblock damit formatieren (Enter)">
<StackPanel Orientation="Horizontal">
<Image Source="/zaaReloaded2;component/Icons/f.png" Width="32" />
<TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Auswählen</TextBlock>
@ -74,16 +75,16 @@
<Button Command="{Binding DeleteSettingsCommand}" ToolTip="Entfernen" Margin="5 0 0 5">
<Image Source="/zaaReloaded2;component/Icons/minus.png" Width="24" />
</Button>
<Button Command="{Binding EditSettingsCommand}" ToolTip="Bearbeiten" Margin="0 5 5 5">
<Button Command="{Binding EditSettingsCommand}" ToolTip="Bearbeiten (Leertaste)" Margin="0 5 5 5">
<Image Source="/zaaReloaded2;component/Icons/pen.png" Width="24" />
</Button>
<Button Command="{Binding CopySettingsCommand}" ToolTip="Kopieren" Margin="5 5 0 5">
<Button Command="{Binding CopySettingsCommand}" ToolTip="Kopieren (STRG+D)" Margin="5 5 0 5">
<Image Source="/zaaReloaded2;component/Icons/duplicate.png" Width="24" />
</Button>
<Button Command="{Binding ExportSettingsCommand}" ToolTip="Exportieren" Margin="0 5 5 5">
<Button Command="{Binding ExportSettingsCommand}" ToolTip="Exportieren (STRG+S)" Margin="0 5 5 5">
<Image Source="/zaaReloaded2;component/Icons/export.png" Width="24" />
</Button>
<Button Command="{Binding ImportSettingsCommand}" ToolTip="Importieren" Margin="5 5 0 5">
<Button Command="{Binding ImportSettingsCommand}" ToolTip="Importieren (STRG+O)" Margin="5 5 0 5">
<Image Source="/zaaReloaded2;component/Icons/import.png" Width="24" />
</Button>
<Button Command="{Binding ResetSettingsCommand}" ToolTip="Auf Werkseinstellungen zurücksetzen"
@ -98,6 +99,15 @@
<ListBox ItemsSource="{Binding SettingsList}"
DisplayMemberPath="Name"
ItemContainerStyle="{DynamicResource ResourceKey=ViewModelListBox}"
x:Name="settingsList" />
x:Name="settingsList">
<ListBox.InputBindings>
<MouseBinding Gesture="LeftDoubleClick" Command="{Binding UseSettingsCommand}" />
<KeyBinding Key="Space" Command="{Binding EditSettingsCommand}" />
<KeyBinding Key="Delete" Command="{Binding DeleteSettingsCommand}" />
<KeyBinding Key="S" Modifiers="Control" Command="{Binding ExportSettingsCommand}" />
<KeyBinding Key="O" Modifiers="Control" Command="{Binding ImportSettingsCommand}" />
<KeyBinding Key="D" Modifiers="Control" Command="{Binding CopySettingsCommand}" />
</ListBox.InputBindings>
</ListBox>
</DockPanel>
</Window>