[v0.0.7.2] アウトライン描画の選択機能追加、オートセーブの変更

FairyZeta · May 31, 2016 · 641b990 · 641b990
1 parent bdff2cf
commit 641b990
Show file tree

Hide file tree

Showing 10 changed files with 1,293 additions and 207 deletions.
diff --git a/FairyZeta.FF14.ACT.Timeline.Core/Component/OverlayManageComponent.cs b/FairyZeta.FF14.ACT.Timeline.Core/Component/OverlayManageComponent.cs
@@ -260,7 +260,8 @@ public bool SetupComponent(bool pAllOverlayOpen)
         public bool AutoProcessStart()
         {
             // オーバーレイ自動管理の開始
-            this.AppCommonTimerModule.SecTimer01.Tick += new EventHandler(this.OverlayAutoSaveEvent);
+            this.AppCommonTimerModule.MinTimer01.Tick += new EventHandler(this.OverlayAutoSaveEvent);
+            this.AppCommonTimerModule.MinTimer01.Start();
             //this.AppCommonTimerModule.SecTimer01.Tick += new EventHandler(this.OverlayAutoHideEvent);
             this.AppCommonTimerModule.SecTimer01.Tick += new EventHandler(this.OverlayAutoTopMostEvent);
             this.AppCommonTimerModule.SecTimer01.Start();
@@ -275,15 +276,24 @@ public bool AutoProcessEnd()
         {
             // オーバーレイ自動管理の終了
             this.AppCommonTimerModule.SecTimer01.Stop();
-            this.AppCommonTimerModule.SecTimer01.Tick -= new EventHandler(this.OverlayAutoSaveEvent);
-            //this.AppCommonTimerModule.SecTimer01.Tick -= new EventHandler(this.OverlayAutoHideEvent);
             this.AppCommonTimerModule.SecTimer01.Tick -= new EventHandler(this.OverlayAutoTopMostEvent);
 
+            this.AppCommonTimerModule.MinTimer01.Stop();
+            this.AppCommonTimerModule.MinTimer01.Tick -= new EventHandler(this.OverlayAutoSaveEvent);
+
             return true;
         }
 
       /*--- Method: public ------------------------------------------------------------------------------------------------------------------------------------------*/
 
+        /// <summary> コンポーネント終了の処理を実行します。
+        /// </summary>
+        public void ComponentShutdown()
+        {
+            // オートセーブ強制起動
+            this.OverlayAutoSaveEvent(null, null);
+        }
+
         /// <summary> [TimerEvent] オーバーレイデータの自動セーブを実行します。
         /// </summary>
         /// <param name="o"> タイマーオブジェクト </param>
@@ -292,13 +302,10 @@ public void OverlayAutoSaveEvent(object o, EventArgs e)
         {
             if (this.CommonDataModel.ApplicationData == null) return;
 
-            var targets = this.OverlayManageDataModel.OverlayViewComponentCollection.Where(d => d.OverlayDataModel.SaveChangedTarget);
-            if (targets.Count() == 0) return;
-
             List<OverlayDataModel> dataModelList = new List<OverlayDataModel>();
-            foreach(var item in targets)
+            foreach (var data in this.OverlayManageDataModel.OverlayViewComponentCollection)
             {
-                dataModelList.Add(item.OverlayDataModel);
+                dataModelList.Add(data.OverlayDataModel);
             }
 
             this.OverlayManageModule.OverlayDataModelSave(this.CommonDataModel.ApplicationData, dataModelList);

diff --git a/FairyZeta.FF14.ACT.Timeline.Core/Component/TimelineComponent.cs b/FairyZeta.FF14.ACT.Timeline.Core/Component/TimelineComponent.cs
@@ -178,6 +178,12 @@ public bool AutoProcessEnd()
 
       /*--- Method: public ------------------------------------------------------------------------------------------------------------------------------------------*/
 
+        /// <summary> コンポーネント終了の処理を実行します。
+        /// </summary>
+        public void ComponentShutdown()
+        {
+        }
+
         /// <summary> タイムラインロードを実行します。
         /// </summary>
         public void TimelineLoad()

diff --git a/FairyZeta.FF14.ACT.Timeline.Core/Module/AppCommonTimerModule.cs b/FairyZeta.FF14.ACT.Timeline.Core/Module/AppCommonTimerModule.cs
@@ -15,7 +15,10 @@ public class AppCommonTimerModule : _Module
 
         /// <summary> アプリケーション起動後1秒毎に処理するタイマー
         /// </summary>
-        public  DispatcherTimer SecTimer01 { get; private set; }
+        public DispatcherTimer SecTimer01 { get; private set; }
+        /// <summary> アプリケーション起動後1分毎に処理するタイマー
+        /// </summary>
+        public DispatcherTimer MinTimer01 { get; private set; }
 
       /*--- Constructers --------------------------------------------------------------------------------------------------------------------------------------------*/
 
@@ -36,6 +39,8 @@ private bool initModule()
         {
             this.SecTimer01 = new DispatcherTimer();
             SecTimer01.Interval = new TimeSpan(0, 0, 1);
+            this.MinTimer01 = new DispatcherTimer();
+            MinTimer01.Interval = new TimeSpan(0, 1, 0);
 
             return true;
         }

diff --git a/FairyZeta.FF14.ACT.Timeline.Core/WPF/TemplateStyle/StandardTimelineResource.xaml b/FairyZeta.FF14.ACT.Timeline.Core/WPF/TemplateStyle/StandardTimelineResource.xaml
diff --git a/FairyZeta.FF14.ACT.Timeline.Core/WPF/ViewModels/PluginApplicationViewModel.cs b/FairyZeta.FF14.ACT.Timeline.Core/WPF/ViewModels/PluginApplicationViewModel.cs
@@ -130,8 +130,11 @@ public void ApplicationExit()
             this.CommonComponent.AutoProcessEnd();
             this.TimelineComponent.AutoProcessEnd();
             this.OverlayManageComponent.AutoProcessEnd();
-
+            // シャットダウン処理の実行
             this.CommonComponent.ComponentShutdown();
+            this.TimelineComponent.ComponentShutdown();
+            this.OverlayManageComponent.ComponentShutdown();
+
         }
 
       /*--- Method: public ------------------------------------------------------------------------------------------------------------------------------------------*/

diff --git a/FairyZeta.FF14.ACT.Timeline.Core/WPF/Views/OutlineTextCustomView.xaml b/FairyZeta.FF14.ACT.Timeline.Core/WPF/Views/OutlineTextCustomView.xaml
@@ -55,9 +55,10 @@
                     <TextBlock Text="Outline Level " Width="100"/>
                     <fCtrl:DoubleUpDownControl ChangedValue="{Binding OutlineTextData.OutlineThickness, Mode=TwoWay}"
                                                MinValue="0" MaxValue="10" UpValue="0.1" DownValue="-0.1"/>
-                    <Slider Width="200" Minimum="0" Maximum="3" VerticalAlignment="Center" Margin="10 0"
+                    <Slider Width="200" Minimum="0" Maximum="5" VerticalAlignment="Center" Margin="10 0"
                             Value="{Binding OutlineTextData.OutlineThickness}"/>
                 </StackPanel>
+                <CheckBox Content="Outline Drawing Reverse (OnRender is Outline -> MainText)" IsChecked="{Binding OutlineTextData.DrawingReverseMode}" Margin="10 5"/>
 
                 <CheckBox Content="Shadow Enabled" IsChecked="{Binding OutlineTextData.ShadowEnabled}" Margin="10 5"/>
                 <StackPanel>