diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml b/src/ST.Client.Desktop.Avalonia.App/App.axaml
index d3ed5c068..932726398 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml
@@ -22,7 +22,7 @@
-
+
diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index ed4c70d66..750777303 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -173,7 +173,7 @@ namespace System.Application.UI
compositeDisposable.Add(ProxyService.Current.Dispose);
compositeDisposable.Add(AuthService.Current.SaveEditNameAuthenticators);
compositeDisposable.Add(SteamConnectService.Current.Dispose);
- compositeDisposable.Add(IASFService.Instance.StopArchiSteamFarm);
+ compositeDisposable.Add(IArchiSteamFarmService.Instance.Stop);
if (GeneralSettings.IsStartupAppMinimized.Value)
{
Program.IsMinimize = true;
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml
index e9607c3b3..144748e73 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml
@@ -11,9 +11,7 @@
-
-
-
+ avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Fonts#WenQuanYi Micro Hei
0,0,0,2
0,0,0,2
15,10,15,8
@@ -83,7 +81,7 @@
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-
-
+ -->
+
+
-
-
-
-
-
+
+
-
-
+
+
+
-
+
@@ -89,9 +97,8 @@
-
-
+
+
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlusPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlusPage.axaml.cs
index 5576f054e..516b52669 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlusPage.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlusPage.axaml.cs
@@ -6,56 +6,68 @@ using System.Collections.Generic;
using System.Properties;
using System.Application.Services;
using System.IO;
+using AvaloniaEdit;
+using AvaloniaEdit.Highlighting;
namespace System.Application.UI.Views.Pages
{
public class ArchiSteamFarmPlusPage : ReactiveUserControl
{
- readonly TextBox commandTextbox;
+ private readonly TextEditor _textEditor;
public ArchiSteamFarmPlusPage()
{
InitializeComponent();
- var selectAsfPath = this.FindControl