Merge pull request #447 from wbonbon/master

added a checkbox to toggle sharlayan-resource

Author: wbonbon

source/@MasterVersion.txt

@@ -1 +1 @@
-v10.4.9
+v10.4.10

source/ACT.Hojoring.Common/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.4.0.9")]
-[assembly: AssemblyFileVersion("10.4.0.9")]
+[assembly: AssemblyVersion("10.4.0.10")]
+[assembly: AssemblyFileVersion("10.4.0.10")]

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/Config/Settings.Defaults.cs

@@ -47,6 +47,7 @@ public partial class Settings :
             { nameof(Settings.EnableMultiLineMaching), false },
             { nameof(Settings.MaxFPS), 30 },
             { nameof(Settings.IsEnabledPolon), false },
+            { nameof(Settings.IsUseCustomSharlayan), false },
 
             { nameof(Settings.LPSViewVisible), false },
             { nameof(Settings.LPSViewX), 0 },

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/Config/Settings.cs

@@ -576,6 +576,13 @@ public bool IsEnabledPolon
             }
         }
 
+        private bool isUseCustomSharlayan = false;
+        public bool IsUseCustomSharlayan
+        {
+            get => this.isUseCustomSharlayan;
+            set => this.SetProperty(ref this.isUseCustomSharlayan, value);
+        }
+
         private void PolonTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             lock (this.polonTimer)
@@ -802,6 +809,7 @@ public void Load()
                             {
                                 instance = data;
                                 instance.isLoaded = true;
+                                FFXIV.Framework.Config.Instance.IsUseCustomSharlayan = instance.IsUseCustomSharlayan;
                             }
                         }
                     }

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/Config/Views/OptionsMiscView.xaml

@@ -67,5 +67,6 @@
   <StackPanel>
     <CheckBox Margin="0 15 0 0" Content="{DynamicResource Options_MinimizeOnStart}" IsChecked="{Binding Config.IsMinimizeOnStart, Mode=TwoWay}" />
     <CheckBox Margin="0 10 0 0" Content="{DynamicResource Options_Polon}" IsChecked="{Binding Config.IsEnabledPolon, Mode=TwoWay}" />
-  </StackPanel>
+    <CheckBox Margin="0 10 0 0" Content="{DynamicResource Options_use_custom_sharlayan}" IsChecked="{Binding Config.IsUseCustomSharlayan, Mode=TwoWay}" />
+    </StackPanel>
 </UserControl>

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/strings/Strings.SpeSpe.en-US.xaml

@@ -230,6 +230,7 @@ This trigger is enabled when "HEALER1" contains "me (player)".</system:String>
 
   <system:String x:Key="Options_MinimizeOnStart">Minimize on start ACT</system:String>
   <system:String x:Key="Options_Polon">Sounds "Polon♪" every 15 seconds</system:String>
+  <system:String x:Key="Options_use_custom_sharlayan">Using Custom Sharlayan resource (ACT must be restart to apply)</system:String>
 
   <system:String x:Key="Info_Placeholders">Placeholders</system:String>
   <system:String x:Key="Info_Triggers">Active triggers</system:String>

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/strings/Strings.SpeSpe.ja-JP.xaml

@@ -230,6 +230,7 @@ HEALER1 に me（自分）が含まれる場合にこのトリガが有効にな
 
   <system:String x:Key="Options_MinimizeOnStart">ACTを最小化して起動する</system:String>
   <system:String x:Key="Options_Polon">15秒ごとにポロン♪と鳴らす</system:String>
+  <system:String x:Key="Options_use_custom_sharlayan">独自のsharlayan resourceを使う (適用するにはACTの再起動が必要です)</system:String>
 
   <system:String x:Key="Info_Placeholders">有効なプレースホルダ</system:String>
   <system:String x:Key="Info_Triggers">アクティブなトリガ</system:String>

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/strings/Strings.SpeSpe.ko-KR.xaml

@@ -228,6 +228,7 @@
 
   <system:String x:Key="Options_MinimizeOnStart">ACT 시작 시 최소화</system:String>
   <system:String x:Key="Options_Polon">15초마다 "포롱♪" 알림음 재생</system:String>
+  <system:String x:Key="Options_use_custom_sharlayan">Using Custom Sharlayan resource (ACT must be restart to apply)</system:String>
 
   <system:String x:Key="Info_Placeholders">대체식</system:String>
   <system:String x:Key="Info_Triggers">활성화된 트리거</system:String>

source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/resources/strings/Strings.SpeSpe.zh-CN.xaml

@@ -228,6 +228,7 @@
 
   <system:String x:Key="Options_MinimizeOnStart">启动ACT时最小化</system:String>
   <system:String x:Key="Options_Polon">15秒"Polon♪"一下</system:String>
+  <system:String x:Key="Options_use_custom_sharlayan">Using Custom Sharlayan resource (ACT must be restart to apply)</system:String>
 
   <system:String x:Key="Info_Placeholders">占位符</system:String>
   <system:String x:Key="Info_Triggers">活动触发器</system:String>

source/FFXIV.Framework/FFXIV.Framework/Config.cs

@@ -359,6 +359,14 @@ public bool IsEnabledSharlayan
             set => this.SetProperty(ref this.isEnabledSharlayan, value);
         }
 
+        private bool isUseCustomSharlayan = true;
+
+        public bool IsUseCustomSharlayan
+        {
+            get => this.isUseCustomSharlayan;
+            set => this.SetProperty(ref this.isUseCustomSharlayan, value);
+        }
+
         private bool isSimplifiedInCombat = false;
 
         public bool IsSimplifiedInCombat