daniel/zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Fix views.

Browse Source 
Needed to set all WindowStyles to ToolWindow and make the windows
topmost because Word and WPF do not play together all too well.
This commit is contained in:
Daniel Kraus
2015-08-12 10:04:59 +02:00
parent 03a62ddf5a
commit 1afa9bb14f
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zaaReloaded2/Views/ElementPickerView.xaml
View File

@@ -21,17 +21,21 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
Width="280" Height="320" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Neues Element auswählen"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
</Window.Resources>
<StackPanel Margin="10">
<Label Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
<!-- TODO: Expand tree by default. -->
<TreeView ItemsSource="{Binding Categories}" Height="120">
<DockPanel Margin="10">
<Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
<Button Content="OK" Command="{Binding ChooseElementCommand}" IsDefault="True" Margin="0 0 5 0" />
<Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
</UniformGrid>
<TreeView ItemsSource="{Binding Categories}">
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
<Setter Property="IsExpanded" Value="True" />
@@ -44,9 +48,5 @@
</HierarchicalDataTemplate>
</TreeView.ItemTemplate>
</TreeView>
<UniformGrid Columns="2" Rows="1" Margin="0 10 0 0">
<Button Content="OK" Command="{Binding ChooseElementCommand}" IsDefault="True" Margin="0 0 10 0" />
<Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="10 0 0 0" />
</UniformGrid>
</StackPanel>
</DockPanel>
</Window>

1
zaaReloaded2/Views/ElementView.xaml
View File

@@ -22,6 +22,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Element bearbeiten"
>

1
zaaReloaded2/Views/IoErrorView.xaml
View File

@@ -22,6 +22,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
SizeToContent="WidthAndHeight" MaxWidth="480"
WindowStyle="ToolWindow" Topmost="True"
ResizeMode="NoResize" ShowInTaskbar="False"
b:WindowState.CenterScreen="True"
Title="Import/Export-Fehler"

2
zaaReloaded2/Views/SettingsRepositoryView.xaml
View File

@@ -23,7 +23,7 @@
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
Width="340" Height="370"
Width="340" Height="370" Topmost="True"
MinWidth="360" MinHeight="370" WindowStyle="ToolWindow"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"

1
zaaReloaded2/Views/SettingsView.xaml
View File

@@ -24,6 +24,7 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
Width="640" Height="480" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Stil bearbeiten"
>