From 405d8377daa252edd6619e78b220ab35bf24cf27 Mon Sep 17 00:00:00 2001
From: next-autumn <next-autumn@google.com>
Date: Sat, 15 May 2021 11:58:05 +0800
Subject: [PATCH] save

---
 ProxySuper.WPF/App.xaml                       |  5 ++-
 ProxySuper.WPF/Controls/HostControl.xaml      | 45 +++++++++++++++----
 ProxySuper.WPF/MainWindow.xaml                |  1 +
 ProxySuper.WPF/Resources/Languages/en.xaml    | 10 ++++-
 ProxySuper.WPF/Resources/Languages/zh_cn.xaml |  9 ++++
 ProxySuper.WPF/Views/XrayEditorView.xaml      | 14 +++---
 6 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/ProxySuper.WPF/App.xaml b/ProxySuper.WPF/App.xaml
index bca6050..384ef4b 100644
--- a/ProxySuper.WPF/App.xaml
+++ b/ProxySuper.WPF/App.xaml
@@ -10,7 +10,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <!--Languages-->
                 <ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
-                
+
                 <!--components styles-->
                 <ResourceDictionary Source="/Resources/Styles/DataGridStyle.xaml" />
 
@@ -21,7 +21,8 @@
 
                     <Style TargetType="{x:Type Label}">
                         <Setter Property="VerticalAlignment" Value="Center" />
-                    </Style>                    
+                    </Style>
+
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/ProxySuper.WPF/Controls/HostControl.xaml b/ProxySuper.WPF/Controls/HostControl.xaml
index 6aeabdf..00ea36b 100644
--- a/ProxySuper.WPF/Controls/HostControl.xaml
+++ b/ProxySuper.WPF/Controls/HostControl.xaml
@@ -8,24 +8,53 @@
     <Grid>
         <GroupBox Padding="10" Header="Host">
             <Grid>
+                <Grid.Resources >
+                    <Style TargetType="Border" >
+                        <Setter Property="Padding" Value="5,5,5,5" />
+                    </Style>
+                </Grid.Resources>
                 <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
+                    <RowDefinition Height="36" />
+                    <RowDefinition Height="36" />
+                    <RowDefinition Height="36" />
+                    <RowDefinition Height="36" />
+                    <RowDefinition Height="36" />
                 </Grid.RowDefinitions>
 
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="60" />
+                    <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="auto" />
                 </Grid.ColumnDefinitions>
 
-                <Label Content="地址:" Grid.Row="0" Grid.Column="0" />
+
+                <Label Content="{DynamicResource HostTag}" Grid.Row="0" Grid.Column="0" />
                 <TextBox Grid.Row="0" Grid.Column="1"
-                         Width="200"
+                         Width="180"
+                         Height="28"
+                         Text="{Binding Host.Tag}"
+                         VerticalContentAlignment="Center" />
+
+                
+                <Label Content="{DynamicResource HostAddress}" Grid.Row="1" Grid.Column="0" />
+                <TextBox Grid.Row="1" Grid.Column="1"
+                         Width="180"
+                         Height="28"
                          Text="{Binding Host.Address}"
                          VerticalContentAlignment="Center" />
+
+                <Label Content="{DynamicResource HostUserName}" Grid.Row="2" Grid.Column="0" />
+                <TextBox Grid.Row="2" Grid.Column="1"
+                         Width="180"
+                         Height="28"
+                         Text="{Binding Host.UserName}"
+                         VerticalContentAlignment="Center" />
+
+                <Label Content="{DynamicResource HostPassword}" Grid.Row="3" Grid.Column="0" />
+                <TextBox Grid.Row="3" Grid.Column="1"
+                         Width="180"
+                         Height="28"
+                         Text="{Binding Host.Password}"
+                         VerticalContentAlignment="Center" />
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/ProxySuper.WPF/MainWindow.xaml b/ProxySuper.WPF/MainWindow.xaml
index fa3a093..236ff23 100644
--- a/ProxySuper.WPF/MainWindow.xaml
+++ b/ProxySuper.WPF/MainWindow.xaml
@@ -7,6 +7,7 @@
         xmlns:local="clr-namespace:ProxySuper.WPF"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
+        Icon="/Resources/ProxySU.ico"
         Title="ProxySU" Height="600" Width="1000">
     <Grid>
         
diff --git a/ProxySuper.WPF/Resources/Languages/en.xaml b/ProxySuper.WPF/Resources/Languages/en.xaml
index b3a6b32..da26afc 100644
--- a/ProxySuper.WPF/Resources/Languages/en.xaml
+++ b/ProxySuper.WPF/Resources/Languages/en.xaml
@@ -23,7 +23,13 @@
     <sys:String x:Key="MainDataGridColumnActionInstall">Install</sys:String>
     <sys:String x:Key="MainDataGridColumnActionEdit">Edit</sys:String>
     <sys:String x:Key="MainDataGridColumnActionDelete">Delete</sys:String>
-    
-    
+
+
     <!--Editor Window-->
+    <sys:String x:Key="HostTag">Tag</sys:String>
+    <sys:String x:Key="HostAddress">Address</sys:String>
+    <sys:String x:Key="HostUserName">UserName</sys:String>
+    <sys:String x:Key="HostPassword">Password</sys:String>
+    <sys:String x:Key="HostPort">Port</sys:String>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
index 11b2e75..3da6812 100644
--- a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
@@ -23,4 +23,13 @@
     <sys:String x:Key="MainDataGridColumnActionInstall">安装</sys:String>
     <sys:String x:Key="MainDataGridColumnActionEdit">编辑</sys:String>
     <sys:String x:Key="MainDataGridColumnActionDelete">删除</sys:String>
+
+
+    <!--Editor Window-->
+    <sys:String x:Key="HostTag">Tag</sys:String>
+    <sys:String x:Key="HostAddress">Address</sys:String>
+    <sys:String x:Key="HostUserName">UserName</sys:String>
+    <sys:String x:Key="HostPassword">Password</sys:String>
+    <sys:String x:Key="HostPort">Port</sys:String>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ProxySuper.WPF/Views/XrayEditorView.xaml b/ProxySuper.WPF/Views/XrayEditorView.xaml
index dab3ff4..ee63ae4 100644
--- a/ProxySuper.WPF/Views/XrayEditorView.xaml
+++ b/ProxySuper.WPF/Views/XrayEditorView.xaml
@@ -8,14 +8,18 @@
         xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
         mc:Ignorable="d"        
         WindowStartupLocation="CenterScreen"
+        Icon="/Resources/ProxySU.ico"
         Title="XrayEditorView" Height="600" Width="1000">
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="320" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
 
+        <StackPanel Grid.Column="0" Margin="10">
+            <ctrl:HostControl />
+        </StackPanel>
 
-        <GroupBox Header="Host" Margin="10" Padding="10">
-            <StackPanel>
-                <ctrl:HostControl />
-            </StackPanel>
-        </GroupBox>
+        <StackPanel Grid.Column="1"></StackPanel>
     </Grid>
 </views:MvxWindow>