From e4bd5a916756e9dabeccfdf19566c8f69065853f Mon Sep 17 00:00:00 2001
From: autumn <lhf939@gmail.com>
Date: Thu, 2 Sep 2021 18:56:01 +0800
Subject: [PATCH] =?UTF-8?q?naiveproxy=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProxySuper.Core/Models/Record.cs               |  2 +-
 ProxySuper.WPF/ProxySuper.WPF.csproj           | 18 +++++++++---------
 .../NaiveProxyConfigView.xaml}                 |  4 ++--
 .../NaiveProxyConfigView.xaml.cs}              |  4 ++--
 .../NaiveProxyEditorView.xaml}                 |  4 ++--
 .../NaiveProxyEditorView.xaml.cs}              |  4 ++--
 .../NaiveProxyInstallView.xaml}                |  4 ++--
 .../NaiveProxyInstallView.xaml.cs}             |  4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoConfigView.xaml => NaiveProxy/NaiveProxyConfigView.xaml} (93%)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoConfigView.xaml.cs => NaiveProxy/NaiveProxyConfigView.xaml.cs} (70%)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoEditorView.xaml => NaiveProxy/NaiveProxyEditorView.xaml} (96%)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoEditorView.xaml.cs => NaiveProxy/NaiveProxyEditorView.xaml.cs} (70%)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoInstallView.xaml => NaiveProxy/NaiveProxyInstallView.xaml} (96%)
 rename ProxySuper.WPF/Views/{NaiveProto/NaiveProtoInstallView.xaml.cs => NaiveProxy/NaiveProxyInstallView.xaml.cs} (85%)

diff --git a/ProxySuper.Core/Models/Record.cs b/ProxySuper.Core/Models/Record.cs
index 0363a9b..b48001e 100644
--- a/ProxySuper.Core/Models/Record.cs
+++ b/ProxySuper.Core/Models/Record.cs
@@ -42,7 +42,7 @@ namespace ProxySuper.Core.Models
         [JsonProperty("trojanGoSettings")]
         public TrojanGoSettings TrojanGoSettings { get; set; }
 
-        [JsonProperty("naiveProtoSettings")]
+        [JsonProperty("naiveProxySettings")]
         public NaiveProxySettings NaiveProxySettings { get; set; }
 
         [JsonProperty("brook")]
diff --git a/ProxySuper.WPF/ProxySuper.WPF.csproj b/ProxySuper.WPF/ProxySuper.WPF.csproj
index d10a899..bc4d57b 100644
--- a/ProxySuper.WPF/ProxySuper.WPF.csproj
+++ b/ProxySuper.WPF/ProxySuper.WPF.csproj
@@ -144,14 +144,14 @@
     <Compile Include="Views\MTProxyGo\MTProxyGoInstallView.xaml.cs">
       <DependentUpon>MTProxyGoInstallView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProto\NaiveProtoConfigView.xaml.cs">
-      <DependentUpon>NaiveProtoConfigView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProxy\NaiveProxyConfigView.xaml.cs">
+      <DependentUpon>NaiveProxyConfigView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProto\NaiveProtoEditorView.xaml.cs">
-      <DependentUpon>NaiveProtoEditorView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProxy\NaiveProxyEditorView.xaml.cs">
+      <DependentUpon>NaiveProxyEditorView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\NaiveProto\NaiveProtoInstallView.xaml.cs">
-      <DependentUpon>NaiveProtoInstallView.xaml</DependentUpon>
+    <Compile Include="Views\NaiveProxy\NaiveProxyInstallView.xaml.cs">
+      <DependentUpon>NaiveProxyInstallView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\ShareLinkView.xaml.cs">
       <DependentUpon>ShareLinkView.xaml</DependentUpon>
@@ -299,15 +299,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProto\NaiveProtoConfigView.xaml">
+    <Page Include="Views\NaiveProxy\NaiveProxyConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProto\NaiveProtoEditorView.xaml">
+    <Page Include="Views\NaiveProxy\NaiveProxyEditorView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\NaiveProto\NaiveProtoInstallView.xaml">
+    <Page Include="Views\NaiveProxy\NaiveProxyInstallView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml
similarity index 93%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml
index ab48e08..3603b25 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml
@@ -1,4 +1,4 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoConfigView"
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyConfigView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="NaiveProxyConfigView" Height="450" Width="800">
+        Title="NaiveProxy配置" Height="450" Width="800">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="140" />
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
similarity index 70%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
index bf2ece3..bcd9f4d 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoConfigView.xaml.cs
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
@@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// NaiveProxyConfigView.xaml 的交互逻辑
     /// </summary>
-    public partial class NaiveProtoConfigView : MvxWindow
+    public partial class NaiveProxyConfigView : MvxWindow
     {
-        public NaiveProtoConfigView()
+        public NaiveProxyConfigView()
         {
             InitializeComponent();
         }
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
similarity index 96%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
index cbd2b58..b764166 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
@@ -1,4 +1,4 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProtoEditorView"
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxyEditorView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -11,7 +11,7 @@
         BorderBrush="#eee"
         Icon="/Resources/ProxySU.ico"
         WindowStartupLocation="CenterScreen"
-        Title="NaiveProxy" Height="600" Width="1000">
+        Title="NaiveProxy编辑配置" Height="600" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="310" />
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
similarity index 70%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
index a4c4ae0..4a948bd 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoEditorView.xaml.cs
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
@@ -5,9 +5,9 @@ namespace ProxySuper.WPF.Views
     /// <summary>
     /// NaiveProxyEditorView.xaml 的交互逻辑
     /// </summary>
-    public partial class NaiveProtoEditorView : MvxWindow
+    public partial class NaiveProxyEditorView : MvxWindow
     {
-        public NaiveProtoEditorView()
+        public NaiveProxyEditorView()
         {
             InitializeComponent();
         }
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml
similarity index 96%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml
index 0798cd3..a2dfd4e 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml
@@ -1,4 +1,4 @@
-<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProtoInstallView"
+<views:MvxWindow x:Class="ProxySuper.WPF.Views.NaiveProxy.NaiveProxyInstallView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -8,7 +8,7 @@
         xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="TrojanGoInstallView" Height="600" Width="1000">
+        Title="TrojanGo安装" Height="600" Width="1000">
     <StackPanel>
         <ctrl:ProgressControl />
 
diff --git a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
similarity index 85%
rename from ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs
rename to ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
index 62da6f2..da77f21 100644
--- a/ProxySuper.WPF/Views/NaiveProto/NaiveProtoInstallView.xaml.cs
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
@@ -18,9 +18,9 @@ namespace ProxySuper.WPF.Views.NaiveProxy
     /// <summary>
     /// NaiveProxyInstallViewModel.xaml 的交互逻辑
     /// </summary>
-    public partial class NaiveProtoInstallView : MvxWindow
+    public partial class NaiveProxyInstallView : MvxWindow
     {
-        public NaiveProtoInstallView()
+        public NaiveProxyInstallView()
         {
             InitializeComponent();
         }