[0.0.5] 新機能追加、バグ修正

FairyZeta.FF14.ACT.Timeline.Core/Component/OverlayPreviewComponent.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FairyZeta.FF14.ACT.Timeline.Core.DataModel;
+
+namespace FairyZeta.FF14.ACT.Timeline.Core.Component
+{
+    /// <summary> オーバーレイ／プレビューコンポーネント
+    /// </summary>
+    public class OverlayPreviewComponent : _Component
+    {
+      /*--- Property/Field Definitions ------------------------------------------------------------------------------------------------------------------------------*/
+
+        /// <summary> オーバーレイデータモデル
+        /// </summary>
+        public OverlayDataModel OverlayDataModel { get; private set; }
+
+      /*--- Constructers --------------------------------------------------------------------------------------------------------------------------------------------*/
+
+        /// <summary> オーバーレイ／プレビューコンポーネント／コンストラクタ
+        /// </summary>
+        public OverlayPreviewComponent(CommonDataModel pCommonDM)
+            : base(pCommonDM)
+        {
+            this.initComponent();
+        }
+
+      /*--- Method: Initialization ----------------------------------------------------------------------------------------------------------------------------------*/
+
+        /// <summary> コンポーネントの初期化を実行します。
+        /// </summary>
+        /// <returns> 正常終了時 True </returns> 
+        private bool initComponent()
+        {
+            return true;
+        }
+
+      /*--- Method: public ------------------------------------------------------------------------------------------------------------------------------------------*/
+
+      /*--- Method: private -----------------------------------------------------------------------------------------------------------------------------------------*/
+
+    }
+}

FairyZeta.FF14.ACT.Timeline.Core/Component/OverlayViewComponent.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Prism.Commands;
+using FairyZeta.FF14.ACT.Timeline.Core.ObjectModel;
 using FairyZeta.FF14.ACT.Timeline.Core.DataModel;
 using FairyZeta.FF14.ACT.Timeline.Core.Module;
 using FairyZeta.Framework;
@@ -28,6 +29,10 @@ public class OverlayViewComponent : _Component
         /// </summary>
         public OverlayManageModule OverlayManageModule { get; set; }
 
+        /// <summary> プレビューオブジェクトモデル
+        /// </summary>
+        public OverlayPreviewObjectModel OverlayPreviewObjectModel { get; set; }
+
         /// <summary> ダイアログ管理モデル
         /// </summary>
         public DialogManageObjectModel DialogManage { get; private set; }
@@ -198,6 +203,7 @@ private bool initComponent()
             this.OverlayControlModule = new OverlayControlModule();
             this.OverlayManageModule = new OverlayManageModule();
             this.DialogManage = new DialogManageObjectModel();
+            this.OverlayPreviewObjectModel = new OverlayPreviewObjectModel();
             return true;
         }
 
@@ -365,6 +371,7 @@ private void _FontEditEndExecute()
         {
             this.OverlayDataModel.OverlayCustomTempData.ChangeTargetFontInfo = null;
             this.OverlayDataModel.OverlayCustomTempData.BaseFontCustomVisibility = false;
+            this.OverlayDataModel.FontData.SaveChangedTarget = true;
         }
         #endregion 
 

FairyZeta.FF14.ACT.Timeline.Core/Component/TimelineComponent.cs

@@ -58,6 +58,17 @@ public DelegateCommand TimelineLoadCommand
         }
         #endregion 
 
+        #region #- [Command] DelegateCommand.TimelineUnloadCommand - ＜タイムラインアンロードコマンド＞ -----
+        /// <summary> タイムラインアンロードコマンド＜コマンド＞ </summary>
+        private DelegateCommand _TimelineUnloadCommand;
+        /// <summary> タイムラインアンロードコマンド＜コマンド＞ </summary>
+        public DelegateCommand TimelineUnloadCommand
+        {
+            get { return _TimelineUnloadCommand = _TimelineUnloadCommand ?? new DelegateCommand(this._TimelineUnloadExecute, this._CanTimelineUnloadExecute); }
+        }
+        #endregion 
+
+
       #endregion
 
       /*--- Constructers --------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -316,7 +327,6 @@ public void TimelineAutoLoadEvent(object sender, EventArgs e)
 
       /*--- Method: private -----------------------------------------------------------------------------------------------------------------------------------------*/
 
-
         #region #- [Method] CanExecute,Execute @ TimerControlCommand - ＜タイマー操作コマンド＞ -----
         /// <summary> 実行可能確認＜タイマー操作コマンド＞ </summary>
         /// <param name="para"> コマンドパラメーター </param>
@@ -365,5 +375,21 @@ private void _TimelineLoadExecute()
             this.TimelineLoad();
         }
         #endregion 
+
+        #region #- [Method] CanExecute,Execute @ TimelineUnloadCommand - ＜タイムラインアンロードコマンド＞ -----
+        /// <summary> 実行可能確認＜タイムラインアンロードコマンド＞ </summary>
+        /// <returns> 実行可能: ture / 実行不可能: false </returns>
+        private bool _CanTimelineUnloadExecute()
+        {
+            return true;
+        }
+
+        /// <summary> コマンド実行＜タイムラインアンロードコマンド＞ </summary>
+        private void _TimelineUnloadExecute()
+        {
+            this.TimelineCreateModule.TimelineDataClear(base.CommonDataModel, this.TimelineObjectModel);
+            this.TimelineCreateModule.TimelineFunctionEnabledChange(base.CommonDataModel);
+        }
+        #endregion 
     }
 }

FairyZeta.FF14.ACT.Timeline.Core/Data/AppCommonData.cs

@@ -63,6 +63,17 @@ public string TimelineLoadErrorMsg
         }
         #endregion
 
+        #region #- [Property] string.TimelineViewStatusMsg - ＜タイムライン表示状態メッセージ＞ -----
+        /// <summary> タイムライン表示状態メッセージ </summary>
+        private string _TimelineViewStatusMsg;
+        /// <summary> タイムライン表示状態メッセージ </summary>    
+        public string TimelineViewStatusMsg
+        {
+            get { return _TimelineViewStatusMsg; }
+            set { this.SetProperty(ref this._TimelineViewStatusMsg, value); }
+        }
+        #endregion
+
         /// <summary> 現在オープンしている画面のIntPtrList
         /// </summary>
         public List<IntPtr> ViewIntPtrList { get; private set; }

FairyZeta.FF14.ACT.Timeline.Core/Data/AppEnableManageData.cs

@@ -110,6 +110,16 @@ public bool TimelineTrackerEnabled
             }
         }
         #endregion
+        #region #- [Property] bool.TimelineUnloadEnabled - ＜タイムラインアンロードの有効状態＞ -----
+        /// <summary> タイムラインアンロードの有効状態 </summary>
+        private bool _TimelineUnloadEnabled;
+        /// <summary> タイムラインアンロードの有効状態 </summary>    
+        public bool TimelineUnloadEnabled
+        {
+            get { return _TimelineUnloadEnabled; }
+            set { this.SetProperty(ref this._TimelineUnloadEnabled, value); }
+        }
+        #endregion
 
       /*--- Constructers --------------------------------------------------------------------------------------------------------------------------------------------*/
 

FairyZeta.FF14.ACT.Timeline.Core/Data/OverlayBarSettingsData.cs

@@ -17,12 +17,28 @@ public class OverlayBarSettingsData : _Data
     {
         /*--- Property/Field Definitions ------------------------------------------------------------------------------------------------------------------------------*/
 
+        #region #- [Property] bool.BindOnColorChenged - ＜バインド用カラー変更フラグ＞ -----
+        /// <summary> バインド用カラー変更フラグ </summary>
+        private Color _BindOnColorChenged;
+        /// <summary> バインド用カラー変更フラグ </summary>    
+        [XmlIgnore]
+        public Color BindOnColorChenged
+        {
+            get { return _BindOnColorChenged; }
+            set { this.SetProperty(ref this._BindOnColorChenged, value); }
+        }
+        #endregion
+
         /// <summary> (バインド用)カスタム配色プロパティ </summary>    
         [XmlIgnore]
         public Color EditBindColor
         {
             get { return this.getEditTargetColor(); }
-            set { this.setEditTargetColor(value); }
+            set 
+            {
+                this.setEditTargetColor(value);
+                this.BindOnColorChenged = value;
+            }
         }
 
         #region #- [Property] ColorEditTarget.ColorEditTarget - ＜カラー変更ターゲット＞ -----

FairyZeta.FF14.ACT.Timeline.Core/Data/OverlayColorSettingsData.cs

@@ -19,7 +19,10 @@ public class OverlayColorSettingsData : _Data
         public Color EditBindColor
         {
             get { return this.getEditTargetColor(); }
-            set { this.setEditTargetColor(value); }
+            set 
+            { 
+                this.setEditTargetColor(value);
+            }
         }
 
         #region #- [Property] ColorEditTarget.ColorEditTarget - ＜カラー変更ターゲット＞ -----

FairyZeta.FF14.ACT.Timeline.Core/DataModel/CommonDataModel.cs

@@ -107,17 +107,25 @@ public bool OverlayPassVisibility
             {
                 // ACTのShowボタン状態
                 if (!this.PluginSettingsData.ActCheckBoxValue)
+                {
+                    this.AppCommonData.TimelineViewStatusMsg = " - ActCheckBox False.";
                     return false;
+                }
                 // ウィンドウのアクティブ状態
                 //if (!this.AppStatusData.ActRelationWindowActive)
                 //    return false;
                 // タイムラインロード状況
                 if (this.PluginSettingsData.AutoTimelineVisibilityEnabled)
                 {
                     if (this.AppStatusData.TimelineLoadStatus != TimelineLoadStatus.Success)
+                    {
+                        this.AppCommonData.TimelineViewStatusMsg = " - Timeline Non Loaded.";
                         return false;
+                    }
                 }
 
+                this.AppCommonData.TimelineViewStatusMsg = " - All Green.";
+
                 return true;
 
             }

FairyZeta.FF14.ACT.Timeline.Core/DataModel/OverlayDataModel.cs

@@ -11,6 +11,7 @@ namespace FairyZeta.FF14.ACT.Timeline.Core.DataModel
 {
     /// <summary> タイムライン／オーバーレイデータモデル
     /// </summary>
+    [Serializable]
     public class OverlayDataModel : _DataModel
     {
       /*--- Property/Field Definitions ------------------------------------------------------------------------------------------------------------------------------*/
@@ -47,16 +48,29 @@ public bool SaveChangedTarget
         [XmlIgnore]
         public ObservableCollection<OverlayType> OverlayTypeCollection { get; private set; }
 
-        #region #- [Property] Version.DataVersion - ＜データバージョン＞ -----
+        /// <summary> データバージョン(str) </summary>
+        public string DataVersionStr { get; set; }
+
         /// <summary> データバージョン </summary>
-        private Version _DataVersion;
-        /// <summary> データバージョン </summary>    
+        [XmlIgnore]
         public Version DataVersion
         {
-            get { return _DataVersion; }
-            set { this.SetProperty(ref this._DataVersion, value); }
+            get
+            {
+                if (string.IsNullOrWhiteSpace(this.DataVersionStr))
+                {
+                    return new Version(0, 0, 0, 0);
+                }
+                else
+                {
+                    return new Version(this.DataVersionStr);
+                }
+            }
+            set
+            {
+                this.DataVersionStr = value.ToString();
+            }
         }
-        #endregion
 
         #region #- [Property] OverlayWindowData.OverlayWindowData - ＜新オーバーレイ画面データ＞ -----
         /// <summary> 新オーバーレイ画面データ </summary>
@@ -219,8 +233,6 @@ public OverlayDataModel()
         /// <returns> 正常終了時 True </returns> 
         private bool initDataModel()
         {
-            this.DataVersion = new Version(0, 0, 0, 0);
-
             this.OverlayWindowData = new OverlayWindowData();
             this.OverlayOptionData = new OverlayOptionData();
             this.OverlayTypeCollection = new ObservableCollection<OverlayType>();

FairyZeta.FF14.ACT.Timeline.Core/FairyZeta.FF14.ACT.Timeline.Core.csproj

@@ -100,6 +100,7 @@
   <ItemGroup>
     <Compile Include="AppConst.cs" />
     <Compile Include="Component\CommonComponent.cs" />
+    <Compile Include="Component\OverlayPreviewComponent.cs" />
     <Compile Include="Component\TimelineComponent.cs" />
     <Compile Include="Component\OverlayViewComponent.cs">
       <SubType>Code</SubType>
@@ -141,6 +142,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Module\AutoUpdateCheckModule.cs" />
+    <Compile Include="ObjectModel\OverlayPreviewObjectModel.cs" />
     <Compile Include="ObjectModel\PluginHistoryObjectModel.cs" />
     <Compile Include="ObjectModel\TimelineAlertObjectModel.cs" />
     <Compile Include="Data\TimelineAnchorData.cs" />
@@ -224,6 +226,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="WPF\ViewModels\OverlayManageWindowViewModel.cs" />
+    <Compile Include="WPF\ViewModels\OverlayPreviewViewModel.cs" />
     <Compile Include="WPF\ViewModels\OverlayWindowViewModel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -252,6 +255,9 @@
     <Compile Include="WPF\Views\OverlayManageWindow.xaml.cs">
       <DependentUpon>OverlayManageWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="WPF\Views\OverlayPreview.xaml.cs">
+      <DependentUpon>OverlayPreview.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WPF\Views\OverlayStandardTimelineCustomView.xaml.cs">
       <DependentUpon>OverlayStandardTimelineCustomView.xaml</DependentUpon>
     </Compile>
@@ -405,6 +411,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="WPF\Views\OverlayPreview.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="WPF\Views\OverlayStandardTimelineCustomView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

FairyZeta.FF14.ACT.Timeline.Core/Module/OverlayManageModule.cs

@@ -112,7 +112,19 @@ public void OverlayDataModelLoad(CommonDataModel pCommonDataModel, TimelineCompo
             foreach (var data in dataList)
             {
                 OverlayViewComponent component = new OverlayViewComponent(pCommonDataModel);
-
+
+                // データ補正の実行
+                if ( data.DataVersion < new Version(0, 0, 5, 0))
+                {
+                    data.FontData.TitleBar_BaseFontInfo.Size = data.OverlayGenericSettingsData.TitleBarFontSize;
+                    data.FontData.Header_BaseFontInfo.Size = data.OverlayGenericSettingsData.HeaderFontSize;
+                    data.FontData.Content_BaseFontInfo.Size = data.OverlayGenericSettingsData.ContentFontSize;
+                    data.FontData.Content_ActiveFontInfo.Size = data.OverlayGenericSettingsData.ContentFontSize;
+                }
+
+                // バージョン設定
+                data.DataVersion = pCommonDataModel.ApplicationData.ApplicationVersion;
+
                 component.OverlayDataModel = data;
 
                 component.OverlayDataModel.OverlayViewData.TimelineViewSource = new CollectionViewSource() { Source = pTimelineComponent.TimelineObjectModel.ActivityCollection };
@@ -121,21 +133,6 @@ public void OverlayDataModelLoad(CommonDataModel pCommonDataModel, TimelineCompo
 
                 pOverlayManageDataModel.OverlayViewComponentCollection.Add(component);
 
-                // データ補正の実行
-                if (component.OverlayDataModel.DataVersion < new Version(0, 0, 5, 0))
-                {
-                    component.OverlayDataModel.FontData.TitleBar_BaseFontInfo.Size
-                        = component.OverlayDataModel.OverlayGenericSettingsData.TitleBarFontSize;
-                    component.OverlayDataModel.FontData.Header_BaseFontInfo.Size
-                        = component.OverlayDataModel.OverlayGenericSettingsData.HeaderFontSize;
-                    component.OverlayDataModel.FontData.Content_BaseFontInfo.Size
-                        = component.OverlayDataModel.OverlayGenericSettingsData.ContentFontSize;
-                    component.OverlayDataModel.FontData.Content_ActiveFontInfo.Size
-                        = component.OverlayDataModel.OverlayGenericSettingsData.ContentFontSize;
-                }
-
-                // バージョン設定
-                component.OverlayDataModel.DataVersion = pCommonDataModel.ApplicationData.ApplicationVersion;
 
                 pCommonDataModel.ViewCollection.Add(component);
             }

FairyZeta.FF14.ACT.Timeline.Core/Module/TimelineControlModule.cs

@@ -222,7 +222,7 @@ public void TimerFunctionEnabledChange(CommonDataModel pCommonDM)
                     pCommonDM.AppEnableManageData.TimelinePauseEnabled = false;
                     pCommonDM.AppEnableManageData.TimelineRewindEnabled = true;
                     pCommonDM.AppEnableManageData.TimelineTrackerEnabled = true;
-
+                    pCommonDM.AppEnableManageData.TimelineUnloadEnabled = true;
                     break;
 
                 case TimerStatus.Run:
@@ -234,6 +234,7 @@ public void TimerFunctionEnabledChange(CommonDataModel pCommonDM)
                     pCommonDM.AppEnableManageData.TimelinePauseEnabled = true;
                     pCommonDM.AppEnableManageData.TimelineRewindEnabled = true;
                     pCommonDM.AppEnableManageData.TimelineTrackerEnabled = false;
+                    pCommonDM.AppEnableManageData.TimelineUnloadEnabled = false;
 
                     break;
 
@@ -251,6 +252,7 @@ public void TimerFunctionEnabledChange(CommonDataModel pCommonDM)
                     pCommonDM.AppEnableManageData.TimelinePauseEnabled = false;
                     pCommonDM.AppEnableManageData.TimelineRewindEnabled = true;
                     pCommonDM.AppEnableManageData.TimelineTrackerEnabled = true;
+                    pCommonDM.AppEnableManageData.TimelineUnloadEnabled = true;
 
                     break;
             }