Fix views.
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:
parent
03a62ddf5a
commit
1afa9bb14f
@ -25,7 +25,8 @@
|
|||||||
xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
|
xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
|
||||||
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
|
xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
|
||||||
SizeToContent="Height" Width="700"
|
SizeToContent="Height" Width="700" ShowInTaskbar="False"
|
||||||
|
WindowStyle="ToolWindow" Topmost="True" ResizeMode="CanResizeWithGrip"
|
||||||
x:Name="exceptionDetailView"
|
x:Name="exceptionDetailView"
|
||||||
Title="Technische Fehlerdetails"
|
Title="Technische Fehlerdetails"
|
||||||
settings:WindowState.Save="True"
|
settings:WindowState.Save="True"
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
|
xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
|
||||||
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
|
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
|
||||||
|
WindowStyle="ToolWindow" ShowInTaskbar="False" Topmost="True"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
Title="zaaReloaded2: Fehler!"
|
Title="zaaReloaded2: Fehler!"
|
||||||
settings:WindowState.Save="True"
|
settings:WindowState.Save="True"
|
||||||
|
@ -21,17 +21,21 @@
|
|||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
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"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
Title="Neues Element auswählen"
|
Title="Neues Element auswählen"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<StackPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<Label Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
|
<Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
|
||||||
<!-- TODO: Expand tree by default. -->
|
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
|
||||||
<TreeView ItemsSource="{Binding Categories}" Height="120">
|
<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>
|
<TreeView.ItemContainerStyle>
|
||||||
<Style TargetType="{x:Type TreeViewItem}">
|
<Style TargetType="{x:Type TreeViewItem}">
|
||||||
<Setter Property="IsExpanded" Value="True" />
|
<Setter Property="IsExpanded" Value="True" />
|
||||||
@ -44,9 +48,5 @@
|
|||||||
</HierarchicalDataTemplate>
|
</HierarchicalDataTemplate>
|
||||||
</TreeView.ItemTemplate>
|
</TreeView.ItemTemplate>
|
||||||
</TreeView>
|
</TreeView>
|
||||||
<UniformGrid Columns="2" Rows="1" Margin="0 10 0 0">
|
</DockPanel>
|
||||||
<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>
|
|
||||||
</Window>
|
</Window>
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
||||||
|
WindowStyle="ToolWindow" Topmost="True"
|
||||||
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
Title="Element bearbeiten"
|
Title="Element bearbeiten"
|
||||||
>
|
>
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
SizeToContent="WidthAndHeight" MaxWidth="480"
|
SizeToContent="WidthAndHeight" MaxWidth="480"
|
||||||
|
WindowStyle="ToolWindow" Topmost="True"
|
||||||
ResizeMode="NoResize" ShowInTaskbar="False"
|
ResizeMode="NoResize" ShowInTaskbar="False"
|
||||||
b:WindowState.CenterScreen="True"
|
b:WindowState.CenterScreen="True"
|
||||||
Title="Import/Export-Fehler"
|
Title="Import/Export-Fehler"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
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"
|
Width="340" Height="370" Topmost="True"
|
||||||
MinWidth="360" MinHeight="370" WindowStyle="ToolWindow"
|
MinWidth="360" MinHeight="370" 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"
|
||||||
|
@ -24,6 +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="640" Height="480" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
Width="640" Height="480" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
||||||
|
WindowStyle="ToolWindow" Topmost="True"
|
||||||
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
Title="Stil bearbeiten"
|
Title="Stil bearbeiten"
|
||||||
>
|
>
|
||||||
|
Loading…
Reference in New Issue
Block a user