From 9653403189203591b439b545972f902efbb2002b Mon Sep 17 00:00:00 2001
From: Daniel Kraus <bovender@bovender.de>
Date: Fri, 3 Mar 2017 21:49:49 +0100
Subject: [PATCH] Fix some views.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Repariert: Der Begrüßungsdialog war manchmal hinter Word verborgen.
---
 zaaReloaded2/ViewModels/FirstRunViewModel.cs  |  3 ++-
 .../Views/SettingsRepositoryView.xaml         |  2 +-
 zaaReloaded2/Views/SettingsView.xaml          | 21 ++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/zaaReloaded2/ViewModels/FirstRunViewModel.cs b/zaaReloaded2/ViewModels/FirstRunViewModel.cs
index 3f93223..774f448 100755
--- a/zaaReloaded2/ViewModels/FirstRunViewModel.cs
+++ b/zaaReloaded2/ViewModels/FirstRunViewModel.cs
@@ -19,6 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Bovender.Extensions;
 using Bovender.Mvvm;
 using Bovender.Mvvm.ViewModels;
 
@@ -43,7 +44,7 @@ namespace zaaReloaded2.ViewModels
             if (UserSettings.Default.FirstRun)
             {
                 FirstRunViewModel vm = new FirstRunViewModel();
-                vm.InjectInto<T>().Show();
+                vm.InjectInto<T>().ShowInForm();
             }
         }
 
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index 129abe8..dfbef78 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -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="520" Height="320"
+        Width="540" Height="360"
         Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
         ShowInTaskbar="False" ResizeMode="NoResize"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index ca77cc4..7aa673f 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -23,9 +23,9 @@
         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="600" Height="420"
+        Width="640" Height="460"
         ResizeMode="CanResizeWithGrip" ShowInTaskbar="True"
-        MinWidth="460" MinHeight="400"
+        MinWidth="460" MinHeight="460"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil bearbeiten"
         FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
@@ -63,8 +63,8 @@
                       SelectedItem="{Binding ReferenceStyle.SelectedItem}"
                       x:Name="ReferenceStyleChooser" HorizontalAlignment="Stretch" />
         </DockPanel>
-        <StackPanel DockPanel.Dock="Top" Margin="0 10 0 0" Orientation="Horizontal">
-            <Label Content="Auszeichnung pathologischer Werte:" Margin="0 0 10 0"
+        <DockPanel DockPanel.Dock="Top" Margin="0 10 0 0">
+            <Label DockPanel.Dock="Left" Content="Auszeichnung pathologischer Werte:" Margin="0 0 10 0"
                    Target="{Binding ElementName=AbnormalStyleChooser}" />
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <ToggleButton IsChecked="{Binding AbnormalBold}" Height="25" Width="25">
@@ -77,10 +77,15 @@
                     <TextBlock TextDecorations="Underline">U</TextBlock>
                 </ToggleButton>
             </StackPanel>
-            <CheckBox IsChecked="{Binding PreferVerboseMolar}" Margin="20 5 10 0">
-                mmol/l statt mM
-            </CheckBox>
-        </StackPanel>
+        </DockPanel>
+        <DockPanel DockPanel.Dock="Top" Margin="5 10 0 0">
+            <StackPanel Orientation="Horizontal">
+                <Label Content="Einheiten:" Padding="0 0 10 0" />
+                <CheckBox IsChecked="{Binding PreferVerboseMolar}">
+                    mmol/l statt mM
+                </CheckBox>
+            </StackPanel>
+        </DockPanel>
         <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True"
                     Margin="0 10 0 0" />