diff --git a/HISTORY.md b/HISTORY.md index 676ce45..86786f5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,11 @@ +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) ------------------------------------------------------------------------ diff --git a/Tests/Controller/SettingsRepositoryTest.cs b/Tests/Controller/SettingsRepositoryTest.cs index 6e70650..1481415 100755 --- a/Tests/Controller/SettingsRepositoryTest.cs +++ b/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(); } diff --git a/www/img/firstrun.png b/www/img/firstrun.png index f12b975..b9ae99d 100755 Binary files a/www/img/firstrun.png and b/www/img/firstrun.png differ diff --git a/www/img/preferences.png b/www/img/preferences.png index 159b16d..69e8215 100755 Binary files a/www/img/preferences.png and b/www/img/preferences.png differ diff --git a/www/img/stilauswahl.png b/www/img/stilauswahl.png index 060a955..f5fe092 100644 Binary files a/www/img/stilauswahl.png and b/www/img/stilauswahl.png differ diff --git a/www/img/stilbearbeiten.png b/www/img/stilbearbeiten.png index 76daaee..28d5c27 100644 Binary files a/www/img/stilbearbeiten.png and b/www/img/stilbearbeiten.png differ diff --git a/www/versioninfo.txt b/www/versioninfo.txt index edd4521..603c622 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.3.1 +2.3.2 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe -21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3 deploy/releases/zaaReloaded-2.3.1.exe +49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f deploy/releases/zaaReloaded-2.3.2.exe diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs index fd46177..50c4b34 100755 --- a/zaaReloaded2/ThisAddIn.cs +++ b/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(); + _dispatcher = Dispatcher.CurrentDispatcher; + System.Threading.Timer timer = new System.Threading.Timer((obj) => + { + _dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded()), 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 diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 525aee1..7e5c979 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.3.1 -2.3.1.0 +2.3.2 +2.3.2.0