From 45189c775ab31df909340e8d4bc8ec2d66e2d3ee Mon Sep 17 00:00:00 2001
From: lwk <1140159554@qq.com>
Date: Thu, 26 Jan 2023 18:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9E=E6=8E=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |   6 +-
 .../UserControl/StartSettingsUserControl.xaml | 142 +++++++++---------
 2 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 2846e42d12..54544501e7 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -171,10 +171,10 @@
 
     <system:String x:Key="Timer">定时</system:String>
 
-    <system:String x:Key="LaunchOnSystemStartup">开机自动启动</system:String>
-    <system:String x:Key="RunTaskAfterLaunch">启动后直接运行</system:String>
+    <system:String x:Key="LaunchOnSystemStartup">开机自动启动MAA</system:String>
+    <system:String x:Key="RunTaskAfterLaunch">启动MAA后直接运行</system:String>
     <system:String x:Key="ClientType">客户端类型</system:String>
-    <system:String x:Key="OpenEmulatorAfterLaunch">启动后自动开启模拟器</system:String>
+    <system:String x:Key="OpenEmulatorAfterLaunch">启动MAA后自动开启模拟器</system:String>
     <system:String x:Key="MinimizingStartup">最小化启动模拟器</system:String>
     <system:String x:Key="WaitForEmulator">等待模拟器启动时间（秒）</system:String>
     <system:String x:Key="EmulatorPath">模拟器路径</system:String>
diff --git a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
index a6e3dc9134..5b008dead7 100644
--- a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
@@ -1,6 +1,7 @@
 <UserControl
     x:Class="MaaWpfGui.StartSettingsUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
@@ -17,86 +18,87 @@
             <ColumnDefinition Width="250" />
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" VerticalAlignment="Center">
-            <!--  TODO: fix margin on this  -->
+            <StackPanel
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Orientation="Vertical" Margin="0,20,0,0">
+                <CheckBox
+            Margin="20,10,10,10"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Block.TextAlignment="Center"
+            Content="{DynamicResource LaunchOnSystemStartup}"
+            IsChecked="{Binding StartSelf}" />
+                <CheckBox
+            Margin="20,10,10,10"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Block.TextAlignment="Center"
+            Content="{DynamicResource OpenEmulatorAfterLaunch}"
+            IsChecked="{Binding StartEmulator}" />
+                <CheckBox
+            Margin="20,10,10,10"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Block.TextAlignment="Center"
+            Content="{DynamicResource RunTaskAfterLaunch}"
+            IsChecked="{Binding RunDirectly}" />
+                <CheckBox
+            Margin="20,10,10,10"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Block.TextAlignment="Center"
+            Content="{DynamicResource MinimizingStartup}"
+            IsChecked="{Binding MinimizingStartup}" />
+            </StackPanel>
             <Grid Margin="10" HorizontalAlignment="Center">
-                <CheckBox
-                    Margin="10"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
-                    Block.TextAlignment="Center"
-                    Content="{DynamicResource LaunchOnSystemStartup}"
-                    IsChecked="{Binding StartSelf}" />
-                <CheckBox
-                    Margin="10,45,10,10"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
-                    Block.TextAlignment="Center"
-                    Content="{DynamicResource RunTaskAfterLaunch}"
-                    IsChecked="{Binding RunDirectly}" />
             </Grid>
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
-                <TextBlock
-                    Margin="3"
-                    Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource WaitForEmulator}" />
-                <TextBox
-                    Width="50"
-                    Margin="3"
-                    InputMethod.IsInputMethodEnabled="False"
-                    Text="{Binding EmulatorWaitSeconds}" />
-            </StackPanel>
+
         </StackPanel>
-        <StackPanel Grid.Column="1" VerticalAlignment="Center">
+        <StackPanel Grid.Column="1"  VerticalAlignment="Center" >
             <StackPanel
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Vertical">
-                <CheckBox
-                    Margin="20,10,10,10"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Block.TextAlignment="Center"
-                    Content="{DynamicResource OpenEmulatorAfterLaunch}"
-                    IsChecked="{Binding StartEmulator}" />
-                <CheckBox
-                    Margin="20,10,10,10"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    Block.TextAlignment="Center"
-                    Content="{DynamicResource MinimizingStartup}"
-                    IsChecked="{Binding MinimizingStartup}" />
-            </StackPanel>
-            <StackPanel
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Orientation="Horizontal"
+          Visibility="{c:Binding StartEmulator}">
                 <TextBlock
-                    Margin="10"
-                    Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource EmulatorPath}" />
+            Margin="0"
+            Block.TextAlignment="Center"
+            Style="{StaticResource TextBlockDefault}"
+            Text="{DynamicResource EmulatorPath}" VerticalAlignment="Center" />
                 <Button
-                    Margin="10"
-                    Command="{s:Action SelectEmulatorExec}"
-                    Content="{DynamicResource Select}" />
+            Command="{s:Action SelectEmulatorExec}"
+            Content="{DynamicResource Select}" Margin="10,0,0,0" />
             </StackPanel>
-            <TextBox Margin="10" Text="{Binding EmulatorPath}" />
+            <TextBox Margin="20,5,20,5" Text="{Binding EmulatorPath}" Visibility="{c:Binding StartEmulator}"/>
             <StackPanel
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Orientation="Horizontal">
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Orientation="Horizontal"
+          Visibility="{c:Binding StartEmulator}">
                 <TextBlock
-                    Margin="10"
-                    Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource AdditionCommand}" />
+            Block.TextAlignment="Center"
+            Style="{StaticResource TextBlockDefault}"
+            Text="{DynamicResource AdditionCommand}" Margin="0,5,0,0" />
+            </StackPanel>
+            <TextBox Margin="20,5,20,5" Text="{Binding EmulatorAddCommand}" Visibility="{c:Binding StartEmulator}"/>
+            <StackPanel
+          Margin="10"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center"
+          Orientation="Horizontal"
+          Visibility="{c:Binding RunDirectly}">
+                <TextBlock
+            Margin="3"
+            Block.TextAlignment="Center"
+            Style="{StaticResource TextBlockDefault}"
+            Text="{DynamicResource WaitForEmulator}" />
+                <TextBox
+            Width="50"
+            Margin="3"
+            InputMethod.IsInputMethodEnabled="False"
+            Text="{Binding EmulatorWaitSeconds}" />
             </StackPanel>
-            <TextBox Margin="10" Text="{Binding EmulatorAddCommand}" />
         </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file