Merge pull request #5 from jonko0493/IconDisplay

Display icons in tab headers, bump Eto SDK to 2.7.3

azure-pipelines.yml

@@ -28,7 +28,7 @@ jobs:
 
   - task: DotNetCoreCLI@2
     inputs:
-      comand: 'test'
+      command: 'test'
       projects: $(Build.SourcesDirectory)/test/SerialLoops.Tests/SerialLoops.Tests.csproj
       publishTestResults: true
     displayName: Run tests

src/SerialLoops.Lib/Items/ItemDescription.cs

@@ -33,11 +33,11 @@ public enum ItemType
             Chess,
             Chibi,
             Dialogue_Config,
-            Event,
             Group_Selection,
             Map,
             Puzzle,
             Scenario,
+            Script,
             System_Texture,
             Topic,
             Transition,

src/SerialLoops.Lib/Items/EventItem.cs → src/SerialLoops.Lib/Items/ScriptItem.cs

@@ -2,13 +2,13 @@
 
 namespace SerialLoops.Lib.Items
 {
-    public class EventItem : Item
+    public class ScriptItem : Item
     {
         public EventFile Event { get; set; }
-        public EventItem(string name) : base(name, ItemType.Event)
+        public ScriptItem(string name) : base(name, ItemType.Script)
         {
         }
-        public EventItem(EventFile evt) : base(evt.Name[0..^1], ItemType.Event)
+        public ScriptItem(EventFile evt) : base(evt.Name[0..^1], ItemType.Script)
         {
             Event = evt;
         }

src/SerialLoops.Lib/Project.cs

@@ -10,7 +10,6 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Xml.Linq;
 
 namespace SerialLoops.Lib
 {
@@ -67,7 +66,7 @@ public void LoadArchives(ILogger log)
 
             Items.AddRange(_evt.Files
                 .Where(e => !new string[] { "CHESSS", "EVTTBLS", "TOPICS", "SCENARIOS", "TUTORIALS", "VOICEMAPS" }.Contains(e.Name))
-                .Select(e => new EventItem(e)));
+                .Select(e => new ScriptItem(e)));
             QMapFile qmap = _dat.Files.First(f => f.Name == "QMAPS").CastTo<QMapFile>();
             Items.AddRange(_dat.Files
                 .Where(d => qmap.QMaps.Select(q => q.Name.Replace(".", "")).Contains(d.Name))

src/SerialLoops/EditorTabsPanel.cs

@@ -1,5 +1,6 @@
 using Eto.Drawing;
 using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Editors;
 using SerialLoops.Lib;
 using SerialLoops.Lib.Items;
@@ -46,12 +47,10 @@ void InitializeComponent()
 
         public static Icon GetItemIcon(ItemDescription.ItemType type)
         {
-            //todo battle with this and figure out loading from a resx?
-            //return Icon.FromResource($"SerialLoops.Icons.{type}.png", Assembly.GetExecutingAssembly());
-            throw new NotImplementedException();
+            return Icon.FromResource($"SerialLoops.Icons.{type}.png").WithSize(16, 16);
         }
 
-        internal void OpenTab(ItemDescription item)
+        internal void OpenTab(ItemDescription item, ILogger log)
         {
             // If a tab page with the name and type exists, switch to it
             foreach (DocumentPage page in Tabs.Pages)
@@ -64,22 +63,21 @@ internal void OpenTab(ItemDescription item)
             }
 
             // Open a new editor for the item -- This is where the item can be loaded from the project files
-            DocumentPage newPage = CreateTab(item, _project);
+            DocumentPage newPage = CreateTab(item, _project, log);
             Tabs.Pages.Add(newPage);
             Tabs.SelectedPage = newPage;
-
         }
 
-        internal static DocumentPage CreateTab(ItemDescription item, Project project)
+        internal static DocumentPage CreateTab(ItemDescription item, Project project, ILogger log)
         {
             switch (item.Type)
             {
                 case ItemDescription.ItemType.Background:
-                    return new BackgroundEditor((BackgroundItem)project.Items.First(i => i.Name == item.Name));
+                    return new BackgroundEditor((BackgroundItem)project.Items.First(i => i.Name == item.Name), log);
                 case ItemDescription.ItemType.Map:
-                    return new MapEditor((MapItem)project.Items.First(i => i.Name == item.Name));
-                case ItemDescription.ItemType.Event:
-                    return new EventEditor((EventItem)project.Items.First(i => i.Name == item.Name));
+                    return new MapEditor((MapItem)project.Items.First(i => i.Name == item.Name), log);
+                case ItemDescription.ItemType.Script:
+                    return new ScriptEditor((ScriptItem)project.Items.First(i => i.Name == item.Name), log);
                 default:
                     throw new ArgumentException("Invalid item type");
             }

src/SerialLoops/Editors/BackgroundEditor.cs

@@ -1,17 +1,12 @@
-using Eto.Drawing;
-using Eto.Forms;
+using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib.Items;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SerialLoops.Editors
 {
     public class BackgroundEditor : Editor
     {
-        public BackgroundEditor(BackgroundItem item) : base(item)
+        public BackgroundEditor(BackgroundItem item, ILogger log) : base(item, log)
         {
         }
 

src/SerialLoops/Editors/Editor.cs

@@ -1,24 +1,34 @@
 using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib.Items;
+using System;
 
 namespace SerialLoops.Editors
 {
     public abstract class Editor : DocumentPage
     {
-
+        private ILogger _log;
         public ItemDescription Description { get; private set; }
 
-        public Editor(ItemDescription description)
+        public Editor(ItemDescription description, ILogger log)
         {
             Description = description;
+            _log = log;
             InitializeComponent();
         }
 
         void InitializeComponent()
         {
             Text = Description.Name;
             MinimumSize = EditorTabsPanel.EDITOR_BASE_SIZE;
-            //Image = EditorTabsPanel.GetItemIcon(Description.Type);
+            try
+            {
+                Image = EditorTabsPanel.GetItemIcon(Description.Type);
+            }
+            catch (Exception exc)
+            {
+                _log.LogWarning($"Failed to load icon.\n{exc.Message}\n\n{exc.StackTrace}");
+            }
             Padding = 10;
 
             Panel panel = GetEditorPanel();

src/SerialLoops/Editors/EventEditor.cs

@@ -1,15 +1,13 @@
 using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib.Items;
 
 namespace SerialLoops.Editors
 {
-    public class EventEditor : Editor
+    public class ScriptEditor : Editor
     {
-        private EventItem _event;
-
-        public EventEditor(EventItem item) : base(item)
+        public ScriptEditor(ScriptItem item, ILogger log) : base(item, log)
         {
-            _event = item;
         }
 
         public override Panel GetEditorPanel()
@@ -19,7 +17,7 @@ public override Panel GetEditorPanel()
                 Orientation = Orientation.Vertical,
                 Items =
                 {
-                    new Label { Text = "Dialogue Editor..todo" }
+                    new Label { Text = "Script Editor..todo" }
                 }
             };
         }

src/SerialLoops/Editors/MapEditor.cs

@@ -1,16 +1,13 @@
 using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib.Items;
 
 namespace SerialLoops.Editors
 {
     public class MapEditor : Editor
     {
-
-        private MapItem _map;
-
-        public MapEditor(MapItem map) : base(map)
+        public MapEditor(MapItem map, ILogger log) : base(map, log)
         {
-            _map = map;
         }
 
         public override Panel GetEditorPanel()

src/SerialLoops/ItemExplorerPanel.cs

@@ -1,5 +1,6 @@
 using Eto.Drawing;
 using Eto.Forms;
+using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib;
 using SerialLoops.Lib.Items;
 using System;
@@ -9,15 +10,16 @@ namespace SerialLoops
 {
     public class ItemExplorerPanel : Scrollable
     {
-
+        private ILogger _log;
         public static readonly Size ITEM_EXPLORER_BASE_SIZE = new(200, 420);
 
         private SectionListTreeGridView _items;
         private readonly Project _project;
         private readonly EditorTabsPanel _tabs;
 
-        public ItemExplorerPanel(Project project, EditorTabsPanel tabs)
+        public ItemExplorerPanel(Project project, EditorTabsPanel tabs, ILogger log)
         {
+            _log = log;
             _project = project;
             _tabs = tabs;
             InitializeComponent();
@@ -71,7 +73,7 @@ private void ItemList_ItemClicked(object sender, EventArgs e)
                 ItemDescription item = _project.FindItem(view.SelectedItem?.Text);
                 if (item != null)
                 {
-                    _tabs.OpenTab(item);
+                    _tabs.OpenTab(item, _log);
                 }
             }
         }

src/SerialLoops/MainForm.eto.cs

@@ -56,7 +56,7 @@ void InitializeComponent()
         private void OpenProjectView(Project project)
         {
             EditorTabsPanel tabs = new(project);
-            ItemExplorerPanel items = new(project, tabs);
+            ItemExplorerPanel items = new(project, tabs, _log);
             Title = $"{BASE_TITLE} - {project.Name}";
             Content = new StackLayout
             {

src/SerialLoops/SerialLoops.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Eto.Forms/2.7.1">
+<Project Sdk="Eto.Forms/2.7.3">
 
   <!--
     Set the BuildPlatform property to the Eto platform you wish to build for.
@@ -12,6 +12,20 @@
 
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Icons\Map.png" />
+    <None Remove="Icons\Script.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Icons\Script.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Icons\Map.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="7.0.1" />
   </ItemGroup>

test/SerialLoops.Tests/ItemTests.cs

@@ -6,9 +6,7 @@
 using SerialLoops.Lib.Items;
 using SkiaSharp;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace SerialLoops.Tests
 {
@@ -32,21 +30,18 @@ private static string[] EventFiles()
         [Parallelizable(ParallelScope.All)]
         public void EventItemCreationTest(string evtFile)
         {
-            EventFile evt = new();
-            evt.Name = $"{Path.GetFileNameWithoutExtension(evtFile)}S";
+            EventFile evt = new() { Name = $"{Path.GetFileNameWithoutExtension(evtFile)}S" };
             evt.Initialize(File.ReadAllBytes(evtFile), 0, _log);
-            EventItem eventItem = new(evt);
+            ScriptItem eventItem = new(evt);
 
             Assert.That(evt.Name[0..^1], Is.EqualTo(eventItem.Name));
         }
 
         [Test]
         public void BackgroundItemCreationTest()
         {
-            GraphicsFile grp1 = new();
-            GraphicsFile grp2 = new();
-            grp1.Name = "KBG00_128DNX";
-            grp2.Name = "KBG00BNS";
+            GraphicsFile grp1 = new() { Name = "KBG00_128DNX" };
+            GraphicsFile grp2 = new() { Name = "KBG00BNS" };
             grp1.Initialize(File.ReadAllBytes(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inputs", "graphics", "KBG00_128.bin")), 0, _log);
             grp2.Initialize(File.ReadAllBytes(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inputs", "graphics", "KBG00.bin")), 0, _log);
             BackgroundItem item = new($"BG_{grp2.Name}") { Graphic1 = grp1, Graphic2 = grp2, BackgroundType = BgType.KINETIC_SCREEN };