diff --git a/source/Grabacr07.KanColleViewer/Models/Migration/_KanColleClientSettings.cs b/source/Grabacr07.KanColleViewer/Models/Migration/_KanColleClientSettings.cs index a61462d97..b4c47eee0 100644 --- a/source/Grabacr07.KanColleViewer/Models/Migration/_KanColleClientSettings.cs +++ b/source/Grabacr07.KanColleViewer/Models/Migration/_KanColleClientSettings.cs @@ -21,6 +21,7 @@ public class _KanColleClientSettings : IKanColleClientSettings public string ViewRangeCalcType { get; set; } public bool SqrtDoubleToInt { get; set; } public bool EnableAircraftFilter { get; set; } + public bool AutoTranslateEnable { get; set; } public bool CheckFlagshipIsRepairShip { get; set; } event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged diff --git a/source/Grabacr07.KanColleViewer/Models/Migration/_Settings.cs b/source/Grabacr07.KanColleViewer/Models/Migration/_Settings.cs index 881939794..edb83ff71 100644 --- a/source/Grabacr07.KanColleViewer/Models/Migration/_Settings.cs +++ b/source/Grabacr07.KanColleViewer/Models/Migration/_Settings.cs @@ -65,7 +65,8 @@ public static void Load() KanColleSettings.ReSortieCondition.Value = Current.KanColleClientSettings.ReSortieCondition; KanColleSettings.SqrtDoubleToInt.Value = Current.KanColleClientSettings.SqrtDoubleToInt; KanColleSettings.EnableAircraftFilter.Value = Current.KanColleClientSettings.EnableAircraftFilter; - } + KanColleSettings.AutoTranslateEnable.Value = Current.KanColleClientSettings.AutoTranslateEnable; + } if (Current.ProxySettings != null) { diff --git a/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs b/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs index bdfe196e0..f1bb175ff 100644 --- a/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs +++ b/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs @@ -30,6 +30,7 @@ public static class GeneralSettings /// /// 새로고침 설정 저장 /// + /// public static SerializableProperty RefreshConfirmationType { get; } = new SerializableProperty(GetKey(), Providers.Roaming, Models.ExitConfirmationType.InSortieOnly) { AutoSave = true }; diff --git a/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs b/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs index 9a07fe9c5..a4f6baf14 100644 --- a/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs +++ b/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs @@ -36,6 +36,9 @@ public class KanColleSettings : IKanColleClientSettings public static SerializableProperty EnableAircraftFilter { get; } = new SerializableProperty(GetKey(), Providers.Roaming, true); + public static SerializableProperty AutoTranslateEnable { get; } + = new SerializableProperty(GetKey(), Providers.Roaming, true); + /// /// 업데이트 알림을 활성화합니다 /// @@ -168,6 +171,8 @@ protected void RaisePropertyChanged([CallerMemberName] string propertyName = nul bool IKanColleClientSettings.EnableAircraftFilter => EnableAircraftFilter.Value; + bool IKanColleClientSettings.AutoTranslateEnable => AutoTranslateEnable.Value; + bool IKanColleClientSettings.CheckFlagshipIsRepairShip => CheckFlagshipIsNotRepairShip.Value; #endregion diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml index b3e7472f8..0d8a7fb55 100644 --- a/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml @@ -123,6 +123,10 @@ + diff --git a/source/Grabacr07.KanColleWrapper/IKanColleClientSettings.cs b/source/Grabacr07.KanColleWrapper/IKanColleClientSettings.cs index 1a54e39b0..40a4499f1 100644 --- a/source/Grabacr07.KanColleWrapper/IKanColleClientSettings.cs +++ b/source/Grabacr07.KanColleWrapper/IKanColleClientSettings.cs @@ -26,6 +26,7 @@ public interface IKanColleClientSettings : INotifyPropertyChanged bool SqrtDoubleToInt { get; } bool EnableAircraftFilter { get; } + bool AutoTranslateEnable { get; } /// /// 艦隊ステータスにおいて、旗艦が工作艦かどうかを確認するかどうかを示す値を取得します。 /// diff --git a/source/Grabacr07.KanColleWrapper/Models/WebTranslator.cs b/source/Grabacr07.KanColleWrapper/Models/WebTranslator.cs index 3d8167d0a..795a2e91d 100644 --- a/source/Grabacr07.KanColleWrapper/Models/WebTranslator.cs +++ b/source/Grabacr07.KanColleWrapper/Models/WebTranslator.cs @@ -17,6 +17,7 @@ public WebTranslator() static int count; public string RawTranslate(string orign, TranslateKind kind = TranslateKind.Naver) { + if (count > 25) return orign; switch (kind)