Merge branch 'release-v2.3.2'

- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.

HISTORY.md

@@ -1,3 +1,19 @@
+Version 2.3.2 (2017-03-06)
+------------------------------------------------------------------------
+
+- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.3.1 (2017-03-03)
+------------------------------------------------------------------------
+
+- Repariert: Der Begrüßungsdialog war manchmal hinter Word verborgen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.3.0 (2017-03-03)
 ------------------------------------------------------------------------
 

Tests/Controller/SettingsRepositoryTest.cs

@@ -27,18 +27,18 @@ namespace Tests.Controller
     [TestFixture]
     class SettingsRepositoryTest
     {
-        string _savedSettings;
+        SettingsRepository _savedRepository;
 
         [SetUp]
         public void SetUp()
         {
-            _savedSettings = zaaReloaded2.UserSettings.Default.SettingsRepository;
+            _savedRepository = zaaReloaded2.UserSettings.Default.SettingsRepository;
         }
 
         [TearDown]
         public void TearDown()
         {
-            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedSettings;
+            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedRepository;
             zaaReloaded2.UserSettings.Default.Save();
         }
 

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.3.0
+2.3.2
 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
-b91672aa1989b7dae8a77192983561b542b3b80fafad3a0d219f9cff5ddd1599  ../deploy/releases/zaaReloaded-2.3.0.exe
+49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f  deploy/releases/zaaReloaded-2.3.2.exe
 

zaaReloaded2/ThisAddIn.cs

@@ -26,6 +26,7 @@ using System.Windows.Input;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Configuration;
+using System.Windows.Threading;
 
 namespace zaaReloaded2
 {
@@ -89,7 +90,12 @@ namespace zaaReloaded2
                     Updater.Version.Current.ToString()
                 );
 
-            ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>();
+            _dispatcher = Dispatcher.CurrentDispatcher;
+            System.Threading.Timer timer = new System.Threading.Timer((obj) =>
+            {
+                _dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>()), null);
+
+            }, null, 500, System.Threading.Timeout.Infinite);
             Logger.Info("ThisAddIn_Startup: Finished startup");
         }
 
@@ -184,6 +190,7 @@ namespace zaaReloaded2
         Ribbon _ribbon;
         string _oldCaption;
         UpdaterViewModel _updaterVM;
+        Dispatcher _dispatcher;
 
         #endregion
 

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.3.0
+2.3.2
-2.3.0.0
+2.3.2.0

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();
             }
         }
 

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"

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">
+        <DockPanel DockPanel.Dock="Top" Margin="0 10 0 0">
-            <Label Content="Auszeichnung pathologischer Werte:" Margin="0 0 10 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">
+        </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" />