diff --git a/HISTORY.md b/HISTORY.md index 223ec3f..676ce45 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -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) ------------------------------------------------------------------------ diff --git a/www/versioninfo.txt b/www/versioninfo.txt index fe54148..edd4521 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.3.0 +2.3.1 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe -b91672aa1989b7dae8a77192983561b542b3b80fafad3a0d219f9cff5ddd1599 ../deploy/releases/zaaReloaded-2.3.0.exe +21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3 deploy/releases/zaaReloaded-2.3.1.exe diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 4e7a121..525aee1 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.3.0 -2.3.0.0 +2.3.1 +2.3.1.0 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().Show(); + vm.InjectInto().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" /> - - + + + + +