Merge branch 'release-2.3.1'
This commit is contained in:
commit
eb524689b2
@ -1,3 +1,11 @@
|
|||||||
|
Version 2.3.1 (2017-03-03)
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Repariert: Der Begrüßungsdialog war manchmal hinter Word verborgen.
|
||||||
|
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
||||||
Version 2.3.0 (2017-03-03)
|
Version 2.3.0 (2017-03-03)
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
2.3.0
|
2.3.1
|
||||||
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
|
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
|
||||||
b91672aa1989b7dae8a77192983561b542b3b80fafad3a0d219f9cff5ddd1599 ../deploy/releases/zaaReloaded-2.3.0.exe
|
21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3 deploy/releases/zaaReloaded-2.3.1.exe
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
2.3.0
|
2.3.1
|
||||||
2.3.0.0
|
2.3.1.0
|
||||||
|
@ -19,6 +19,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Bovender.Extensions;
|
||||||
using Bovender.Mvvm;
|
using Bovender.Mvvm;
|
||||||
using Bovender.Mvvm.ViewModels;
|
using Bovender.Mvvm.ViewModels;
|
||||||
|
|
||||||
@ -43,7 +44,7 @@ namespace zaaReloaded2.ViewModels
|
|||||||
if (UserSettings.Default.FirstRun)
|
if (UserSettings.Default.FirstRun)
|
||||||
{
|
{
|
||||||
FirstRunViewModel vm = new FirstRunViewModel();
|
FirstRunViewModel vm = new FirstRunViewModel();
|
||||||
vm.InjectInto<T>().Show();
|
vm.InjectInto<T>().ShowInForm();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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="520" Height="320"
|
Width="540" Height="360"
|
||||||
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
|
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
|
||||||
ShowInTaskbar="False" ResizeMode="NoResize"
|
ShowInTaskbar="False" ResizeMode="NoResize"
|
||||||
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
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="600" Height="420"
|
Width="640" Height="460"
|
||||||
ResizeMode="CanResizeWithGrip" ShowInTaskbar="True"
|
ResizeMode="CanResizeWithGrip" ShowInTaskbar="True"
|
||||||
MinWidth="460" MinHeight="400"
|
MinWidth="460" MinHeight="460"
|
||||||
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
Title="Stil bearbeiten"
|
Title="Stil bearbeiten"
|
||||||
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
|
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
|
||||||
@ -63,8 +63,8 @@
|
|||||||
SelectedItem="{Binding ReferenceStyle.SelectedItem}"
|
SelectedItem="{Binding ReferenceStyle.SelectedItem}"
|
||||||
x:Name="ReferenceStyleChooser" HorizontalAlignment="Stretch" />
|
x:Name="ReferenceStyleChooser" HorizontalAlignment="Stretch" />
|
||||||
</DockPanel>
|
</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}" />
|
Target="{Binding ElementName=AbnormalStyleChooser}" />
|
||||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
<ToggleButton IsChecked="{Binding AbnormalBold}" Height="25" Width="25">
|
<ToggleButton IsChecked="{Binding AbnormalBold}" Height="25" Width="25">
|
||||||
@ -77,10 +77,15 @@
|
|||||||
<TextBlock TextDecorations="Underline">U</TextBlock>
|
<TextBlock TextDecorations="Underline">U</TextBlock>
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox IsChecked="{Binding PreferVerboseMolar}" Margin="20 5 10 0">
|
</DockPanel>
|
||||||
mmol/l statt mM
|
<DockPanel DockPanel.Dock="Top" Margin="5 10 0 0">
|
||||||
</CheckBox>
|
<StackPanel Orientation="Horizontal">
|
||||||
</StackPanel>
|
<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">
|
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True"
|
<Button Command="{Binding CloseViewCommand}" Content="Schließen" IsDefault="True" IsCancel="True"
|
||||||
Margin="0 10 0 0" />
|
Margin="0 10 0 0" />
|
||||||
|
Loading…
Reference in New Issue
Block a user