Use icons in SettingsRepositoryView.

This commit is contained in:
Daniel Kraus
2015-08-12 15:50:01 +02:00
parent f2cb30fabb
commit 6f65340ca5
20 changed files with 49 additions and 13 deletions
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 751 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 743 B

+35 -13
View File
@@ -24,7 +24,7 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender" xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
Width="340" Height="370" Topmost="True" Width="340" Height="370" Topmost="True"
MinWidth="360" MinHeight="370" WindowStyle="ToolWindow" MinWidth="370" MinHeight="380" WindowStyle="ToolWindow"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
b:WindowState.CenterScreen="True" b:WindowState.Save="True" b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Stil auswählen" Title="Stil auswählen"
@@ -60,18 +60,40 @@
</i:Interaction.Triggers> </i:Interaction.Triggers>
<DockPanel Margin="10"> <DockPanel Margin="10">
<Label DockPanel.Dock="Top" Target="{Binding ElementName=settingsList}">Bitte Stil auswählen:</Label> <Label DockPanel.Dock="Top" Target="{Binding ElementName=settingsList}">Bitte Stil auswählen:</Label>
<UniformGrid DockPanel.Dock="Bottom" Margin="0 10 0 0" Columns="2" Rows="1" HorizontalAlignment="Left"> <StackPanel DockPanel.Dock="Right" Margin="10 0 0 0">
<Button Command="{Binding UseSettingsCommand}" Content="Auswählen" IsDefault="True" Margin="0 0 5 0" /> <Button Command="{Binding UseSettingsCommand}" IsDefault="True" x:Name="OkButton">
<Button Command="{Binding CloseViewCommand}" Content="Schließen" Margin="5 0 0 0" IsCancel="True" /> <StackPanel Orientation="Horizontal">
</UniformGrid> <Image Source="/zaaReloaded2;component/Icons/f.png" Width="32" />
<StackPanel DockPanel.Dock="Right" Margin="10 0 0 0" x:Name="buttonsPanel"> <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Auswählen</TextBlock>
<Button Command="{Binding AddSettingsCommand}" Content="Hinzufügen" Margin="0 0 0 5" /> </StackPanel>
<Button Command="{Binding EditSettingsCommand}" Content="Bearbeiten" Margin="0 0 0 5" /> </Button>
<Button Command="{Binding DeleteSettingsCommand}" Content="Entfernen" Margin="0 0 0 5" /> <UniformGrid Columns="2" Margin="0 10 0 0" x:Name="buttonsPanel">
<Button Command="{Binding CopySettingsCommand}" Content="Kopieren" Margin="0 0 0 5" /> <Button Command="{Binding AddSettingsCommand}" ToolTip="Hinzufügen" Margin="0 0 5 5">
<Button Command="{Binding ExportSettingsCommand}" Content="Exportieren" Margin="0 5 0 5" /> <Image Source="/zaaReloaded2;component/Icons/plus.png" Width="24" />
<Button Command="{Binding ImportSettingsCommand}" Content="Importieren" Margin="0 0 0 5" /> </Button>
<Button Command="{Binding ResetSettingsCommand}" Content="Werkseinstellungen" Margin="0 0 0 5" /> <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">
<Image Source="/zaaReloaded2;component/Icons/pen.png" Width="24" />
</Button>
<Button Command="{Binding CopySettingsCommand}" ToolTip="Kopieren" 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">
<Image Source="/zaaReloaded2;component/Icons/export.png" Width="24" />
</Button>
<Button Command="{Binding ImportSettingsCommand}" ToolTip="Importieren" Margin="5 5 0 5">
<Image Source="/zaaReloaded2;component/Icons/import.png" Width="24" />
</Button>
<Button Command="{Binding ResetSettingsCommand}" ToolTip="Auf Werkseinstellungen zurücksetzen"
Margin="0 5 5 5">
<Image Source="/zaaReloaded2;component/Icons/reset.png" Width="24" />
</Button>
<Button Command="{Binding CloseViewCommand}" ToolTip="Schließen" Margin="5 5 0 5">
<Image Source="/zaaReloaded2;component/Icons/exit.png" Width="24" />
</Button>
</UniformGrid>
</StackPanel> </StackPanel>
<ListBox ItemsSource="{Binding SettingsList}" <ListBox ItemsSource="{Binding SettingsList}"
DisplayMemberPath="Name" DisplayMemberPath="Name"
+14
View File
@@ -384,6 +384,20 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\d.png" /> <Resource Include="Icons\d.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\duplicate.png" />
<Resource Include="Icons\export.png" />
<Resource Include="Icons\import.png" />
<Resource Include="Icons\minus.png" />
<Resource Include="Icons\pen.png" />
<Resource Include="Icons\plus.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\reset.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\exit.png" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>