diff --git a/App.xaml b/App.xaml
index 940e78c..67983ca 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,8 +2,14 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WpfMaiTouchEmulator"
+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
StartupUri="MainWindow.xaml">
-
+
+
+
+
+
+
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 6d7686a..4da9091 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -3,61 +3,112 @@
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:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
Closing="MainWindow_Closing"
- Title="MainWindow" Height="400" Width="587" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Background="AliceBlue"
+ Title="MainWindow" Height="750" Width="500" WindowStartupLocation="CenterScreen">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MainWindowViewModel.cs b/MainWindowViewModel.cs
index e6058c6..664e0eb 100644
--- a/MainWindowViewModel.cs
+++ b/MainWindowViewModel.cs
@@ -8,84 +8,92 @@ namespace WpfMaiTouchEmulator;
public class MainWindowViewModel : INotifyPropertyChanged
{
// Language
- public string LbAutoPortConnecting
+ public string? LbAutoPortConnecting
{
get; set;
}
- public string LbAutoSensorPositioning
+ public string? LbAutoSensorPositioning
{
get; set;
}
- public string LbButtonState
+ public string? LbButtonState
{
get; set;
}
- public string LbConnectionState
+ public string? LbConnectionState
{
get; set;
}
- public string LbConnectionStateNotConnected
+ public string? LbConnectionStateNotConnected
{
get; set;
}
- public string LbConnectToPort
+ public string? LbConnectToPort
{
get; set;
}
- public string LbDebugMode
+ public string? LbDebugMode
{
get; set;
}
- public string LbExitWithSinmai
+ public string? LbExitWithSinmai
{
get; set;
}
- public string LbEmulateRingButtons
+ public string? LbEmulateRingButtons
{
get; set;
}
- public string LbInstallComPort
+ public string? LbInstallComPort
{
get; set;
}
- public string LbLanguageDropdown
+ public string? LbLanguageDropdown
{
get; set;
}
- public string LbBorderSettings
+ public string? LbBorderSettings
{
get; set;
}
- public string LbBorderDisabled
+ public string? LbSettings
{
get; set;
}
- public string LbBorderSolid
+ public string? LbComPort
{
get; set;
}
- public string LbBorderRainbow
+ public string? LbBorderDisabled
{
get; set;
}
- public string LbListComPorts
+ public string? LbBorderSolid
{
get; set;
}
- public string LbReceivedData
+ public string? LbBorderRainbow
{
get; set;
}
- public string LbRecievedData
+ public string? LbListComPorts
+ {
+ get; set;
+ }
+ public string? LbReceivedData
+ {
+ get; set;
+ }
+ public string? LbRecievedData
{
get;
private set;
}
- public string LbSentData
+ public string? LbSentData
{
get; set;
}
- public string LbUninstallComPort
+ public string? LbUninstallComPort
{
get; set;
}
@@ -334,7 +342,9 @@ public class MainWindowViewModel : INotifyPropertyChanged
LbInstallComPort = resourceManager.GetString("lbInstallComPort");
LbLanguageDropdown = resourceManager.GetString("lbLanguageDropdown");
+ LbComPort = resourceManager.GetString("LbComPort");
LbBorderSettings = resourceManager.GetString("LbBorderSettings");
+ LbSettings = resourceManager.GetString("LbSettings");
LbBorderDisabled = resourceManager.GetString("LbBorderDisabled");
LbBorderSolid = resourceManager.GetString("LbBorderSolid");
LbBorderRainbow = resourceManager.GetString("LbBorderRainbow");
diff --git a/Resources/Strings.Designer.cs b/Resources/Strings.Designer.cs
index 22125a5..2c5fcc6 100644
--- a/Resources/Strings.Designer.cs
+++ b/Resources/Strings.Designer.cs
@@ -124,7 +124,7 @@ namespace WpfMaiTouchEmulator.Resources {
}
///
- /// Looks up a localized string similar to Solid (#AARRGGBB).
+ /// Looks up a localized string similar to Solid.
///
internal static string LbBorderSolid {
get {
@@ -141,6 +141,15 @@ namespace WpfMaiTouchEmulator.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to COM Port.
+ ///
+ internal static string LbComPort {
+ get {
+ return ResourceManager.GetString("LbComPort", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Connection state.
///
@@ -276,6 +285,15 @@ namespace WpfMaiTouchEmulator.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Settings.
+ ///
+ internal static string LbSettings {
+ get {
+ return ResourceManager.GetString("LbSettings", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Drag.
///
diff --git a/Resources/Strings.ja-JP.resx b/Resources/Strings.ja-JP.resx
index 850b972..f175f30 100644
--- a/Resources/Strings.ja-JP.resx
+++ b/Resources/Strings.ja-JP.resx
@@ -139,11 +139,14 @@
境界線設定
- 単色(#AARRGGBB)
+ 単色
ボタン状態
+
+ COMポート
+
接続状態
@@ -189,6 +192,9 @@
送信データ
+
+ 設定
+
ドラッグ
diff --git a/Resources/Strings.resx b/Resources/Strings.resx
index 7c38ce8..c7f55b2 100644
--- a/Resources/Strings.resx
+++ b/Resources/Strings.resx
@@ -139,11 +139,14 @@
Border Settings
- Solid (#AARRGGBB)
+ Solid
Button State
+
+ COM Port
+
Connection state
@@ -189,6 +192,9 @@
Sent
+
+ Settings
+
Drag
diff --git a/Resources/Strings.zh-CN.resx b/Resources/Strings.zh-CN.resx
index 3800ccf..0d43a3b 100644
--- a/Resources/Strings.zh-CN.resx
+++ b/Resources/Strings.zh-CN.resx
@@ -139,11 +139,14 @@
境界線設定
- 纯色(#AARRGGBB)
+ 纯色
按钮状态
+
+ COM端口
+
连接状态
@@ -189,6 +192,9 @@
已发送数据
+
+ 设置
+
拖动
diff --git a/WpfMaiTouchEmulator.csproj b/WpfMaiTouchEmulator.csproj
index 3107519..8669750 100644
--- a/WpfMaiTouchEmulator.csproj
+++ b/WpfMaiTouchEmulator.csproj
@@ -21,6 +21,7 @@
+