fix: KiTTY session file selection dialog in Serial form does not appear (#810)

itagagaki · web-flow · commit 0c0d450cb852 · 2024-12-16T16:52:54.000+08:00
Similar fix as in 9514fcd
diff --git a/Ui/View/Editor/Forms/SerialFormView.xaml.cs b/Ui/View/Editor/Forms/SerialFormView.xaml.cs
@@ -1,6 +1,7 @@
 ﻿using System.IO;
 using System.Windows;
 using System.Windows.Controls;
+using _1RM.Utils;
 using _1RM.Utils.KiTTY;
 using _1RM.Utils.KiTTY.Model;
 using Shawn.Utils.Wpf.FileSystem;
@@ -16,18 +17,18 @@ public SerialFormView()
 
         private void ButtonSelectSessionConfigFile_OnClick(object sender, RoutedEventArgs e)
         {
-            if (DataContext is IKittyConnectable pc)
+            if (DataContext is SerialFormViewModel vm)
             {
                 var path = SelectFileHelper.OpenFile(filter: "KiTTY Session|*.*");
                 if (path == null) return;
-                if (File.Exists(path)
-                    && KittyConfig.Read(path)?.Count > 0)
+                if (File.Exists(path) && KittyConfig.Read(path)?.Count > 0)
                 {
-                    pc.ExternalKittySessionConfigPath = path;
+                    vm.New.ExternalKittySessionConfigPath = path;
                 }
                 else
                 {
-                    pc.ExternalKittySessionConfigPath = "";
+                    vm.New.ExternalKittySessionConfigPath = "";
+                    MessageBoxHelper.Warning("Invalid KiTTY session config file.");
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.IO;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Controls;`
	`4`	`+using _1RM.Utils;`
`4`	`5`	`using _1RM.Utils.KiTTY;`
`5`	`6`	`using _1RM.Utils.KiTTY.Model;`
`6`	`7`	`using Shawn.Utils.Wpf.FileSystem;`
`@@ -16,18 +17,18 @@ public SerialFormView()`
`16`	`17`
`17`	`18`	`private void ButtonSelectSessionConfigFile_OnClick(object sender, RoutedEventArgs e)`
`18`	`19`	`{`
`19`		`- if (DataContext is IKittyConnectable pc)`
	`20`	`+ if (DataContext is SerialFormViewModel vm)`
`20`	`21`	`{`
`21`	`22`	`var path = SelectFileHelper.OpenFile(filter: "KiTTY Session\|.");`
`22`	`23`	`if (path == null) return;`
`23`		`- if (File.Exists(path)`
`24`		`- && KittyConfig.Read(path)?.Count > 0)`
	`24`	`+ if (File.Exists(path) && KittyConfig.Read(path)?.Count > 0)`
`25`	`25`	`{`
`26`		`- pc.ExternalKittySessionConfigPath = path;`
	`26`	`+ vm.New.ExternalKittySessionConfigPath = path;`
`27`	`27`	`}`
`28`	`28`	`else`
`29`	`29`	`{`
`30`		`- pc.ExternalKittySessionConfigPath = "";`
	`30`	`+ vm.New.ExternalKittySessionConfigPath = "";`
	`31`	`+ MessageBoxHelper.Warning("Invalid KiTTY session config file.");`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`	`}`