add button to save and fix bugs

NyagekiFumenProject · Oct 27, 2024 · cc3a138 · cc3a138
1 parent c4ea81d
commit cc3a138
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/...itor/Modules/FumenEditorRenderControlViewer/Views/FumenEditorRenderControlViewerView.xaml b/...itor/Modules/FumenEditorRenderControlViewer/Views/FumenEditorRenderControlViewerView.xaml
@@ -7,8 +7,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:jas="clr-namespace:WPF.JoshSmith.ServiceProviders.UI"
     xmlns:local="clr-namespace:OngekiFumenEditor.Modules.FumenEditorRenderControlViewer.Views"
+    xmlns:markup="clr-namespace:OngekiFumenEditor.UI.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:res="clr-namespace:OngekiFumenEditor.Properties" xmlns:markup="clr-namespace:OngekiFumenEditor.UI.Markup"
+    xmlns:res="clr-namespace:OngekiFumenEditor.Properties"
     xmlns:vm="clr-namespace:OngekiFumenEditor.Modules.FumenEditorRenderControlViewer.ViewModels"
     d:DesignHeight="800"
     d:DesignWidth="300"
@@ -43,8 +44,11 @@
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal">
             <ToolBar>
-                <Button cal:Message.Attach="[Event Click] = [Action ResetDefault()]" Content="{markup:Translate [ResetDefault]}">
-                </Button>
+                <Button cal:Message.Attach="[Event Click] = [Action ResetDefault()]" Content="{markup:Translate [ResetDefault]}" />
+                <Button
+                    Margin="5,0"
+                    cal:Message.Attach="[Event Click] = [Action Save()]"
+                    Content="{markup:Translate [Save]}" />
             </ToolBar>
         </StackPanel>
         <ListView

diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Base/RenderTargetOrderVisible.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Base/RenderTargetOrderVisible.cs
@@ -7,6 +7,11 @@
 
 namespace OngekiFumenEditor.Modules.FumenVisualEditor.Base
 {
+    public class RenderTargetOrderVisibleConfig
+    {
+        public Dictionary<string, RenderTargetOrderVisible> map = new();
+    }
+
     public class RenderTargetOrderVisible
     {
         public int Order { get; set; }

diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.Drawing.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.Drawing.cs
@@ -179,13 +179,13 @@ public void LoadRenderOrderVisible()
                 target.Visible = target.DefaultVisible;
             }
         }
-        Log.LogError($"loaded.");
+        Log.LogInfo($"loaded.");
     }
 
     public void SaveRenderOrderVisible()
     {
         var targets = drawTargets.Values.SelectMany(x => x).Distinct().ToArray();
-        var map = targets.ToDictionary(x => x, x => new RenderTargetOrderVisible()
+        var map = targets.ToDictionary(x => x.GetType().Name, x => new RenderTargetOrderVisible()
         {
             Order = x.CurrentRenderOrder,
             Visible = x.Visible
@@ -196,7 +196,7 @@ public void SaveRenderOrderVisible()
             var json = JsonSerializer.Serialize(map);
             EditorGlobalSetting.Default.RenderTargetOrderVisibleMap = json;
             EditorGlobalSetting.Default.Save();
-            Log.LogError($"saved.");
+            Log.LogInfo($"saved.");
         }
         catch (Exception e)
         {