From ac90c88501dd69ceba666820fe2af255f7e0a71f Mon Sep 17 00:00:00 2001
From: artehe <112902041+artehe@users.noreply.github.com>
Date: Tue, 7 May 2024 22:48:28 +0100
Subject: [PATCH 1/2] fix error

---
 SIT.Manager/ViewModels/Settings/EftViewModel.cs | 13 +++++++++----
 SIT.Manager/Views/Settings/EftView.axaml        | 10 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/SIT.Manager/ViewModels/Settings/EftViewModel.cs b/SIT.Manager/ViewModels/Settings/EftViewModel.cs
index c808f495..4e151ec5 100644
--- a/SIT.Manager/ViewModels/Settings/EftViewModel.cs
+++ b/SIT.Manager/ViewModels/Settings/EftViewModel.cs
@@ -20,6 +20,9 @@ public partial class EftViewModel : SettingsViewModelBase
     [ObservableProperty]
     private string _sitEftInstallPath;
 
+    [ObservableProperty]
+    private bool _showEftInstallPathMissing;
+
     public IAsyncRelayCommand ChangeInstallLocationCommand { get; }
 
     public EftViewModel(IBarNotificationService barNotificationService,
@@ -36,10 +39,6 @@ public partial class EftViewModel : SettingsViewModelBase
 
         BsgEftInstallPath = Path.GetDirectoryName(_installerService.GetEFTInstallPath()) ?? _localizationService.TranslateSource("EftViewModelBsgEftInstallPathMissing");
         SitEftInstallPath = _configsService.Config.SitEftInstallPath;
-        if (string.IsNullOrEmpty(SitEftInstallPath))
-        {
-            SitEftInstallPath = _localizationService.TranslateSource("EftViewModelSitEftInstallPathMissing");
-        }
 
         ChangeInstallLocationCommand = new AsyncRelayCommand(ChangeInstallLocation);
     }
@@ -74,4 +73,10 @@ private async Task ChangeInstallLocation()
             _barNotificationService.ShowError(_localizationService.TranslateSource("SettingsPageViewModelErrorTitle"), _localizationService.TranslateSource("SettingsPageViewModelConfigErrorEFTDescription"));
         }
     }
+
+    protected override void OnActivated()
+    {
+        base.OnActivated();
+        ShowEftInstallPathMissing = string.IsNullOrEmpty(SitEftInstallPath);
+    }
 }
diff --git a/SIT.Manager/Views/Settings/EftView.axaml b/SIT.Manager/Views/Settings/EftView.axaml
index b085a37e..291c5f0f 100644
--- a/SIT.Manager/Views/Settings/EftView.axaml
+++ b/SIT.Manager/Views/Settings/EftView.axaml
@@ -38,7 +38,15 @@
 					   VerticalAlignment="Center"
 					   TextTrimming="CharacterEllipsis"
 					   TextWrapping="WrapWithOverflow"
-					   Text="{Binding SitEftInstallPath}"/>
+					   Text="{Binding SitEftInstallPath}"
+					   IsVisible="{Binding !ShowEftInstallPathMissing}"/>
+			<TextBlock Grid.Column="1"
+					   Grid.Row="1"
+					   VerticalAlignment="Center"
+					   TextTrimming="CharacterEllipsis"
+					   TextWrapping="WrapWithOverflow"
+					   Text="{DynamicResource EftViewModelSitEftInstallPathMissing}"
+					   IsVisible="{Binding ShowEftInstallPathMissing}"/>
 			<Button Grid.Column="2"
 					Grid.Row="1"
 					VerticalAlignment="Center"

From fca195f5491e0c20706a9ab6864ac4edd290ecd8 Mon Sep 17 00:00:00 2001
From: artehe <112902041+artehe@users.noreply.github.com>
Date: Wed, 8 May 2024 10:31:30 +0100
Subject: [PATCH 2/2] use the string converter rather than a bool value duh

---
 SIT.Manager/ViewModels/Settings/EftViewModel.cs | 4 ----
 SIT.Manager/Views/Settings/EftView.axaml        | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/SIT.Manager/ViewModels/Settings/EftViewModel.cs b/SIT.Manager/ViewModels/Settings/EftViewModel.cs
index 4e151ec5..2400927d 100644
--- a/SIT.Manager/ViewModels/Settings/EftViewModel.cs
+++ b/SIT.Manager/ViewModels/Settings/EftViewModel.cs
@@ -20,9 +20,6 @@ public partial class EftViewModel : SettingsViewModelBase
     [ObservableProperty]
     private string _sitEftInstallPath;
 
-    [ObservableProperty]
-    private bool _showEftInstallPathMissing;
-
     public IAsyncRelayCommand ChangeInstallLocationCommand { get; }
 
     public EftViewModel(IBarNotificationService barNotificationService,
@@ -77,6 +74,5 @@ private async Task ChangeInstallLocation()
     protected override void OnActivated()
     {
         base.OnActivated();
-        ShowEftInstallPathMissing = string.IsNullOrEmpty(SitEftInstallPath);
     }
 }
diff --git a/SIT.Manager/Views/Settings/EftView.axaml b/SIT.Manager/Views/Settings/EftView.axaml
index 291c5f0f..a4c5524f 100644
--- a/SIT.Manager/Views/Settings/EftView.axaml
+++ b/SIT.Manager/Views/Settings/EftView.axaml
@@ -39,14 +39,14 @@
 					   TextTrimming="CharacterEllipsis"
 					   TextWrapping="WrapWithOverflow"
 					   Text="{Binding SitEftInstallPath}"
-					   IsVisible="{Binding !ShowEftInstallPathMissing}"/>
+					   IsVisible="{Binding SitEftInstallPath, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
 			<TextBlock Grid.Column="1"
 					   Grid.Row="1"
 					   VerticalAlignment="Center"
 					   TextTrimming="CharacterEllipsis"
 					   TextWrapping="WrapWithOverflow"
 					   Text="{DynamicResource EftViewModelSitEftInstallPathMissing}"
-					   IsVisible="{Binding ShowEftInstallPathMissing}"/>
+					   IsVisible="{Binding SitEftInstallPath}, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
 			<Button Grid.Column="2"
 					Grid.Row="1"
 					VerticalAlignment="Center"