From 321d2b04cbbc2dd6b72b1c47b764b54ff42e6c8b Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Thu, 25 Aug 2022 22:12:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 合并 `LinkStart` 和 `停止` 按钮 2. 禁止缩小界面 3. 修复一些语言界面日志显示不全的问题 4. 增加 `修改` 按钮宽度 5. 调整一些 UI 控件 --- src/MeoAsstGui/Helper/LogItemViewModel.cs | 2 +- .../UserControl/FightSettingsUserControl.xaml | 335 ++++++++++-------- .../ViewModels/TaskQueueViewModel.cs | 6 +- src/MeoAsstGui/Views/RootView.xaml | 4 +- src/MeoAsstGui/Views/TaskQueueView.xaml | 116 +++--- 5 files changed, 240 insertions(+), 223 deletions(-) diff --git a/src/MeoAsstGui/Helper/LogItemViewModel.cs b/src/MeoAsstGui/Helper/LogItemViewModel.cs index 8542272d9e..3f954cf61f 100644 --- a/src/MeoAsstGui/Helper/LogItemViewModel.cs +++ b/src/MeoAsstGui/Helper/LogItemViewModel.cs @@ -29,7 +29,7 @@ namespace MeoAsstGui /// The font weight. public LogItemViewModel(string content, string color = LogColor.Message, string weight = "Regular") { - Time = DateTime.Now.ToString("MM'-'dd' 'HH':'mm':'ss") + " "; + Time = DateTime.Now.ToString("MM'-'dd' 'HH':'mm':'ss"); this.Content = content; this.Color = color; this.Weight = weight; diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml index 50538dee83..27c82ddbc3 100644 --- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml @@ -10,176 +10,199 @@ xmlns:s="https://github.com/canton7/Stylet" xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui" d:DataContext="{d:DesignInstance {x:Type vm:TaskQueueViewModel}}" - d:DesignWidth="300" + d:DesignWidth="250" mc:Ignorable="d"> - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + - - - - - - - + Content="{DynamicResource UseOriginitePrime}" + IsChecked="{Binding UseStone}" + ToolTip="{DynamicResource CheckBoxesNotSaved}" + VerticalContentAlignment="Center" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +