From f42f210452b68758cae529302b130565aa3833a1 Mon Sep 17 00:00:00 2001 From: LeapwardKoex Date: Wed, 24 Apr 2024 22:49:02 +1200 Subject: [PATCH] Translate remaining text --- MaiTouchComConnector.cs | 13 +-- MainWindow.xaml | 79 +++++++------- MainWindow.xaml.cs | 23 +++- MainWindowViewModel.cs | 132 ++++++++++++++++++++++- Resources/Strings.Designer.cs | 193 ++++++++++++++++++++++++++++++++++ Resources/Strings.resx | 67 ++++++++++++ Resources/Strings.zh-CN.resx | 75 ++++++++++++- TouchPanel.xaml | 4 +- VirtualComPortManager.cs | 23 ++-- 9 files changed, 547 insertions(+), 62 deletions(-) diff --git a/MaiTouchComConnector.cs b/MaiTouchComConnector.cs index 780679e..46590ed 100644 --- a/MaiTouchComConnector.cs +++ b/MaiTouchComConnector.cs @@ -2,7 +2,7 @@ using System.Windows; namespace WpfMaiTouchEmulator; -internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState) +internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState, MainWindowViewModel viewModel) { private static SerialPort? serialPort; private bool isActiveMode; @@ -11,6 +11,7 @@ internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState private Thread? _pollThread; private bool _shouldReconnect = true; private readonly MaiTouchSensorButtonStateManager _buttonState = buttonState; + private readonly MainWindowViewModel _viewModel = viewModel; public Action? OnConnectStatusChange { @@ -41,7 +42,7 @@ internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState var virtualPort = "COM23"; // Adjust as needed try { - OnConnectStatusChange?.Invoke("Conecting..."); + OnConnectStatusChange?.Invoke(_viewModel.TxtComPortConnecting); serialPort = new SerialPort(virtualPort, 9600, Parity.None, 8, StopBits.One) { WriteTimeout = 100 @@ -49,7 +50,7 @@ internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState serialPort.DataReceived += SerialPort_DataReceived; serialPort.Open(); Logger.Info("Serial port opened successfully."); - OnConnectStatusChange?.Invoke("Connected to port"); + OnConnectStatusChange?.Invoke(_viewModel.TxtComPortConnected); _connected = true; _tokenSource = new CancellationTokenSource(); // Create a token source. @@ -64,12 +65,12 @@ internal class MaiTouchComConnector(MaiTouchSensorButtonStateManager buttonState OnConnectError?.Invoke(); Application.Current.Dispatcher.Invoke(() => { - MessageBox.Show(ex.Message, "Error connecting to COM port", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show(ex.Message, _viewModel.TxtErrorConnectingToPortHeader, MessageBoxButton.OK, MessageBoxImage.Error); }); - + Logger.Error("Error on starting polling", ex); Logger.Info("Disconnecting from COM port"); _connected = false; - OnConnectStatusChange?.Invoke("Not Connected"); + OnConnectStatusChange?.Invoke(_viewModel.LbConnectionStateNotConnected); if (serialPort?.IsOpen == true) { serialPort.DiscardInBuffer(); diff --git a/MainWindow.xaml b/MainWindow.xaml index d00452c..496243e 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -3,45 +3,52 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:WpfMaiTouchEmulator" mc:Ignorable="d" Closing="MainWindow_Closing" Title="MainWindow" Height="360" Width="500" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"> - -