diff --git a/MainWindow.xaml b/MainWindow.xaml index 290f4b5..5da463f 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -7,7 +7,7 @@ xmlns:local="clr-namespace:DyeingComputer" xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}" - mc:Ignorable="d" KeyDown="W_KeyDown" + mc:Ignorable="d" Title="SUNLIGHT 838 b0.0.1 (2024/08/10)" Height="720" Width="1280" WindowState ="Maximized" diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 2c41b64..f8090de 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -177,27 +177,7 @@ namespace DyeingComputer break; } } - - private void W_KeyDown(object sender, KeyEventArgs e) //键盘监控 - { - if(e.Key == Key.N) - { - if (MainWindowViewModel.WORK_RUN == 2) - { - MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停 - }else if (MainWindowViewModel.WORK_RUN == 1) - { - MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show(Properties.Resources.StopProcess, "800", MessageBoxButton.OKCancel); - if (messageBoxResult == MessageBoxResult.OK) - { - MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为 - MainWindowViewModel.DIDETime = 0; - - } - } - } - } - + private void Image_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ((Image)sender).RenderTransform = new ScaleTransform(0.9,0.9); diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 72e3478..81120e6 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -132,6 +132,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 BathRatio 的本地化字符串。 + /// + public static string BathRatio { + get { + return ResourceManager.GetString("BathRatio", resourceCulture); + } + } + /// /// 查找类似 Beginning 的本地化字符串。 /// @@ -186,6 +195,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Client 的本地化字符串。 + /// + public static string Client { + get { + return ResourceManager.GetString("Client", resourceCulture); + } + } + /// /// 查找类似 ClothIntake 的本地化字符串。 /// @@ -195,6 +213,24 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 ClothSpecies 的本地化字符串。 + /// + public static string ClothSpecies { + get { + return ResourceManager.GetString("ClothSpecies", resourceCulture); + } + } + + /// + /// 查找类似 ClothWeight 的本地化字符串。 + /// + public static string ClothWeight { + get { + return ResourceManager.GetString("ClothWeight", resourceCulture); + } + } + /// /// 查找类似 ClothWheel 的本地化字符串。 /// @@ -213,6 +249,24 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 ColorName 的本地化字符串。 + /// + public static string ColorName { + get { + return ResourceManager.GetString("ColorName", resourceCulture); + } + } + + /// + /// 查找类似 ColorNumber 的本地化字符串。 + /// + public static string ColorNumber { + get { + return ResourceManager.GetString("ColorNumber", resourceCulture); + } + } + /// /// 查找类似 Compute 的本地化字符串。 /// @@ -1293,6 +1347,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 Total 的本地化字符串。 + /// + public static string Total { + get { + return ResourceManager.GetString("Total", resourceCulture); + } + } + /// /// 查找类似 Type 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index f82c5a9..9b8c26a 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -558,4 +558,25 @@ Shutdown + + Color Number + + + Color Name + + + Client + + + Cloth Weight + + + Cloth Species + + + Bath Ratio + + + Total + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index a46b904..736a45d 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -558,4 +558,25 @@ Shutdown + + ColorNumber + + + ColorName + + + Client + + + ClothWeight + + + ClothSpecies + + + BathRatio + + + Total + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index bff7bfa..3b42b6b 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -558,4 +558,25 @@ 关机 + + 颜色编号 + + + 颜色 + + + 客户 + + + 布重 + + + 布种 + + + 浴比 + + + 总量 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 77ff563..6e9ad93 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -550,12 +550,33 @@ 運行 - + 解鎖 - + 手動 - + 關機 + + + 顏色編號 + + + 顏色 + + + 客戶 + + + 布重 + + + 布種 + + + 浴比 + + + 總量 \ No newline at end of file diff --git a/View/HistoryRecordsView.xaml b/View/HistoryRecordsView.xaml index dc439dc..787b3e1 100644 --- a/View/HistoryRecordsView.xaml +++ b/View/HistoryRecordsView.xaml @@ -10,53 +10,55 @@ d:DataContext="{d:DesignInstance Type=viewmodel:HistoryRecordsViewModel}" d:DesignHeight="630" d:DesignWidth="1280"> - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/View/InOutView.xaml b/View/InOutView.xaml index b88e3bb..1604027 100644 --- a/View/InOutView.xaml +++ b/View/InOutView.xaml @@ -131,12 +131,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/View/ProgramgroupView.xaml b/View/ProgramgroupView.xaml index fd8104d..d5b0554 100644 --- a/View/ProgramgroupView.xaml +++ b/View/ProgramgroupView.xaml @@ -14,51 +14,53 @@