From 1a49eb18e11c654b956f3f741500ba2bbe16a0c9 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <bovender@bovender.de>
Date: Fri, 22 Sep 2017 17:29:59 +0200
Subject: [PATCH] Fix settings repository UI.

- Verbessert: Benutzer-Interface der Stile-Verwaltung.
---
 zaaReloaded2/Ribbon.xml                                | 2 +-
 zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs | 7 +++++++
 zaaReloaded2/Views/SettingsRepositoryView.xaml         | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/zaaReloaded2/Ribbon.xml b/zaaReloaded2/Ribbon.xml
index 1021a52..eb0425a 100755
--- a/zaaReloaded2/Ribbon.xml
+++ b/zaaReloaded2/Ribbon.xml
@@ -27,7 +27,7 @@
 					<button id="zrlFormatLab" label="Formatieren" image="f.png" onAction="Ribbon_Click" size="large"
 					  supertip="Formatiert den ausgewählten Bereich mit dem zuletzt verwendeten Stil."
 					  getEnabled="CanFormat" />
-					<button id="zrlSettings" label="Stilauswahl" image="fff.png" onAction="Ribbon_Click" size="large"
+					<button id="zrlSettings" label="Stile verwalten" image="fff.png" onAction="Ribbon_Click" size="large"
 					  supertip="Zeigt eine Liste vorhandener Stile an. Stile können bearbeitet, hinzugefügt, gelöscht werden." />
 				</group>
 				<group id="zrlGroupDrugs" label="Medikamente">
diff --git a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
index e225497..6e953d6 100755
--- a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
+++ b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
@@ -350,11 +350,17 @@ namespace zaaReloaded2.ViewModels
         void ConfirmDeleteSettings(ViewModelMessageContent content)
         {
             SettingsViewModel vm = content.ViewModel as SettingsViewModel;
+            int oldIndex = SettingsList.IndexOf(vm);
             if (CanDeleteSettings() && content.Confirmed)
             {
                 _repository.SettingsList.Remove(vm.RevealModelObject() as Settings);
                 SettingsList.Remove(vm);
             }
+            int newIndex = (oldIndex < SettingsList.Count) ? oldIndex : SettingsList.Count - 1;
+            if (newIndex >= 0)
+            {
+                SettingsList[newIndex].IsSelected = true;
+            }
         }
 
         void DoResetSettings()
@@ -424,6 +430,7 @@ namespace zaaReloaded2.ViewModels
         {
             settingsViewModel.PropertyChanged += SettingsViewModel_PropertyChanged;
             SettingsList.Add(settingsViewModel);
+            settingsViewModel.IsSelected = true;
         }
 
         void DoExportSettings()
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index dfbef78..7075d1e 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -66,7 +66,7 @@
                     ToolTip="Stil auswählen und Textblock damit formatieren (Enter)">
                 <StackPanel Orientation="Horizontal">
                     <Image Source="/zaaReloaded2;component/Icons/f.png" Width="32" />
-                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Auswählen</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Auswählen &amp; formatieren</TextBlock>
                 </StackPanel>
             </Button>
             <UniformGrid Columns="2" Margin="0 10 0 0" x:Name="buttonsPanel">