Merging UI overhaul and QOL-Enhancements

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
     #  run: tar --exclude='*.pdb' -caf AnnoMapEditor.zip -C ./Build/ *
 
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: AnnoMapEditor
         path: Build/AnnoMapEditor.exe

AnnoMapEditor.Tests/AnnoMapEditor.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

AnnoMapEditor/AnnoMapEditor.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <StartupObject>AnnoMapEditor.App</StartupObject>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>9</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <!-- <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute> -->
     <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>true</GenerateAssemblyInformationalVersionAttribute>
@@ -31,7 +31,7 @@
     <None Remove="Assets\maptype.png" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\app.ico" />
+    <Resource Include="Assets\app.ico" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Mods\Serialization\a7tinfo.xml">
@@ -89,20 +89,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Page Update="UI\Controls\IslandProperties\FixedIslandProperties.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Update="UI\Controls\MapTemplateProperties.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="UI\Controls\IslandProperties\RandomIslandProperties.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Update="UI\Controls\MapView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <Generator>MSBuild:Compile</Generator>

AnnoMapEditor/App.config

@@ -25,6 +25,9 @@
             <setting name="Xpath" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Quickstart" serializeAs="String">
+                <value>False</value>
+            </setting>
         </AnnoMapEditor.UserSettings>
     </userSettings>
 </configuration>

AnnoMapEditor/App.xaml

@@ -4,6 +4,24 @@
              xmlns:local="clr-namespace:AnnoMapEditor"
              StartupUri="UI/Windows/Start/StartWindow.xaml">
     <Application.Resources>
-        <ResourceDictionary Source="UI/Resources/Styles/Colors.xaml" />
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="UI/Resources/Styles/Colors.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/FontFamilies.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/Button.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/ToggleButton.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/TextBox.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/HintTextBox.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/Label.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/ComboBox.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/DropDownButton.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/FancyToggle.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/WindowControlButton.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/ToolbarButton.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/ContextMenu.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/ToolTip.xaml" />
+                <ResourceDictionary Source="UI/Resources/Styles/Scrollbar.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>

AnnoMapEditor/DataArchives/Assets/Models/SessionAsset.cs

@@ -131,6 +131,15 @@ public static SessionAsset DetectFromPath(string filePath)
                 return OldWorld;
         }
 
+        public static SessionAsset DetectFromGuid(long guid)
+        {
+            if (guid == SESSION_SUNKENTREASURES_GUID) return CapeTrelawney;
+            if (guid == SESSION_ARCTIC_GUID) return Arctic;
+            if (guid == SESSION_NEWWORLD_GUID) return NewWorld;
+            if (guid == SESSION_ENBESA_GUID) return Enbesa;
+            else return OldWorld;
+        }
+
 
         public override string ToString() => DisplayName;
     }

AnnoMapEditor/DataArchives/Assets/Repositories/AssetRepository.cs

@@ -126,7 +126,7 @@ public override async Task InitializeAsync()
             {
                 try
                 {
-                    assetsXmlStream = File.OpenRead(CachedAssetsXml);
+                    assetsXmlStream = await Task.Run(() => File.OpenRead(CachedAssetsXml));
                 }
                 catch (Exception e)
                 {
@@ -135,7 +135,7 @@ public override async Task InitializeAsync()
                 }
             }
 
-            var Xml = XDocument.Load(assetsXmlStream);
+            var Xml = await Task.Run(() => XDocument.Load(assetsXmlStream));
             var assets = Xml.XPathSelectElements(xpath);
 
             if (!validCache)
@@ -144,7 +144,7 @@ public override async Task InitializeAsync()
                 UserSettings.Default.Xpath = xpath; 
                 UserSettings.Default.Save();
                 assetsXmlStream.Dispose();
-                RenewCache(assets);
+                await Task.Run(() => RenewCache(assets));
             }
 
             var convertAssetTasks = assets.Select(assetElement =>
@@ -155,13 +155,16 @@ public override async Task InitializeAsync()
             });
             var assetList = await Task.WhenAll(convertAssetTasks);
 
-            foreach (var asset in assetList)
+            await Task.Run(() =>
             {
-                if (asset is not null)
+                foreach (var asset in assetList)
                 {
-                    _assets.Add(asset.GUID, asset);
+                    if (asset is not null)
+                    {
+                        _assets.Add(asset.GUID, asset);
+                    }
                 }
-            }
+            });
 
             _logger.LogInformation($"Finished Deserialising at {watch.Elapsed.TotalMilliseconds} ms.");
             _logger.LogInformation($"Resolving asset references...");

AnnoMapEditor/DataArchives/Assets/Repositories/FixedIslandRepository.cs

@@ -42,9 +42,9 @@ public override async Task InitializeAsync()
 
             var mapFilePaths = _dataArchive.Find("*.a7m");
 
-            var tasks = mapFilePaths.Select(mapFilePath => 
+            var tasks = mapFilePaths.Select(mapFilePath =>
             {
-                return Task.Run(() => LoadIslandAsset(mapFilePath));
+                return LoadIslandAssetAsync(mapFilePath);
             });
 
             var islandAssets = await Task.WhenAll(tasks);
@@ -58,15 +58,17 @@ public override async Task InitializeAsync()
             _logger.LogInformation($"Finished loading fixed islands. Loaded {_islands.Count} islands in {watch.Elapsed.TotalMilliseconds} ms.");
         }
 
-        public FixedIslandAsset LoadIslandAsset(String mapFilePath)
+        public async Task<FixedIslandAsset> LoadIslandAssetAsync(String mapFilePath)
         {
             // thumbnail
             string thumbnailPath = Path.Combine(
-                Path.GetDirectoryName(mapFilePath)!,
-                "_gamedata",
-                Path.GetFileNameWithoutExtension(mapFilePath),
-                "mapimage.png");
-            BitmapImage thumbnail = _dataArchive.TryLoadPng(thumbnailPath)
+                    Path.GetDirectoryName(mapFilePath)!,
+                    "_gamedata",
+                    Path.GetFileNameWithoutExtension(mapFilePath),
+                    "activemapimage.png"
+                );
+
+            BitmapImage thumbnail = await Task.Run(() => _dataArchive.TryLoadPng(thumbnailPath))
                 ?? throw new Exception($"Could not load island thumbnail '{thumbnailPath}'.");
 
             // open a7minfo

AnnoMapEditor/DataArchives/Assets/Repositories/IslandRepository.cs

@@ -62,7 +62,7 @@
 
         public bool TryGetByFilePath(string mapFilePath, [NotNullWhen(false)] out IslandAsset islandAsset)
 #pragma warning disable CS8762 // Parameter must have a non-null value when exiting in some condition.
             => _byFilePath.TryGetValue(mapFilePath, out islandAsset);
 #pragma warning restore CS8762 // Parameter must have a non-null value when exiting in some condition.
 
         public override Task InitializeAsync()
@@ -111,11 +111,8 @@
 
         public static IslandType DetectIslandTypeFromPath(string filePath)
         {
-            if (filePath.Contains("_d_"))
-                return IslandType.Decoration;
-
-            else
-                return IslandType.Normal;
+            string fileName = Path.GetFileNameWithoutExtension(filePath);
+            return IslandType.FromIslandFileName(fileName);
         }
 
         public static IslandSize DetectDefaultIslandSizeFromPath(string filePath)

AnnoMapEditor/DataArchives/DataArchiveFactory.cs

@@ -2,6 +2,7 @@
 using AnnoRDA;
 using AnnoRDA.Builder;
 using System;
+using System.Threading.Tasks;
 
 namespace AnnoMapEditor.DataArchives
 {
@@ -12,6 +13,11 @@ public class DataArchiveFactory : IDataArchiveFactory
         private static readonly string[] EXTENSION_WHITELIST = new[] { "*.a7tinfo", "*.png", "*.a7minfo", "*.a7t", "*.a7te", "assets.xml", "*.a7m", "*.dds" };
 
 
+        public async Task<IDataArchive> CreateDataArchiveAsync(string dataPath)
+        {
+            return await Task.Run(() => CreateDataArchive(dataPath));
+         }
+
         public IDataArchive CreateDataArchive(string dataPath)
         {
             // RdaDataArchive

AnnoMapEditor/DataArchives/DataManager.cs

@@ -64,22 +64,32 @@ private DataManager()
 
         public async Task TryInitializeAsync(string dataPath)
         {
+            if (dataPath.Length == 0)
+            {
+                UpdateStatus(false, false, "Empty Data String");
+                return;
+            }
+
             UpdateStatus(isInitializing: true, isInitialized: false);
             _logger.LogInformation($"Initializing DataManager at '{dataPath}'.");
 
             try
             {
+
                 DataArchiveFactory dataArchiveFactory = new();
-                _dataArchive = dataArchiveFactory.CreateDataArchive(dataPath);
+                _dataArchive = await dataArchiveFactory.CreateDataArchiveAsync(dataPath);
 
                 _assetRepository = new AssetRepository(_dataArchive);
-                _assetRepository.Register<RegionAsset>();
-                _assetRepository.Register<FertilityAsset>();
-                _assetRepository.Register<RandomIslandAsset>();
-                _assetRepository.Register<SlotAsset>();
-                _assetRepository.Register<MinimapSceneAsset>();
-                _assetRepository.Register<SessionAsset>();
-                _assetRepository.Register<MapTemplateAsset>();
+                await Task.Run(() =>
+                {
+                    _assetRepository.Register<RegionAsset>();
+                    _assetRepository.Register<FertilityAsset>();
+                    _assetRepository.Register<RandomIslandAsset>();
+                    _assetRepository.Register<SlotAsset>();
+                    _assetRepository.Register<MinimapSceneAsset>();
+                    _assetRepository.Register<SessionAsset>();
+                    _assetRepository.Register<MapTemplateAsset>();
+                });
                 await _assetRepository.InitializeAsync();
 
                 _fixedIslandRepository = new FixedIslandRepository(_dataArchive);
@@ -89,7 +99,7 @@ public async Task TryInitializeAsync(string dataPath)
                 await _islandRepository.InitializeAsync();
 
                 _mapGroupRepository = new MapGroupRepository(_dataArchive);
-                _mapGroupRepository.InitializeAsync();
+                await _mapGroupRepository.InitializeAsync();
             }
             catch (Exception ex)
             {

AnnoMapEditor/MapTemplates/Enums/IslandType.cs

@@ -17,7 +17,6 @@ public class IslandType
 
         public static readonly IEnumerable<IslandType> All = new[] { Normal, Starter, Decoration, ThirdParty, PirateIsland, Cliff };
 
-
         public readonly string Name;
 
         public readonly short? ElementValue;
@@ -59,6 +58,43 @@ public static IslandType FromElementValue(short? elementValue)
 
             return type;
         }
+        public static IslandType FromIslandFileName(string fileName)
+        {
+            switch (fileName)
+            {
+                case "moderate_3rdparty02_01":
+                case "colony01_3rdparty05_01":
+                case "moderate_3rdparty06_01":
+                case "moderate_3rdparty07_01":
+                case "moderate_3rdparty08_01":
+                case "colony03_3rdparty09_01":
+                case "colony03_d_18":
+                    return ThirdParty;
+                case "moderate_3rdparty03_01":
+                case "colony01_3rdparty04_01":
+                    return PirateIsland;
+                default:
+                    if (fileName.Contains("_d_") || fileName.Contains("_dst_") || fileName.Contains("_battlesite_")|| fileName.Contains("_encounter_")) return Decoration;
+                    return Normal;
+            }
+        }
+
+        public static string? DefaultIslandLabelFromFileName(string fileName)
+        {
+            return fileName switch
+            {
+                "moderate_3rdparty02_01" => "Sir Archibald Blake",
+                "colony01_3rdparty05_01" => "Isabel Sarmento",
+                "moderate_3rdparty06_01" => "Old Nate",
+                "colony03_d_18" => "Old Nate (Arctic)",
+                "moderate_3rdparty07_01" => "Eli Bleakworth",
+                "moderate_3rdparty08_01" => "Madame Kahina",
+                "colony03_3rdparty09_01" => "Qumaq",
+                "moderate_3rdparty03_01" => "Anne Harlow",
+                "colony01_3rdparty04_01" => "Jean La Fortune",
+                _ => null,
+            };
+        }
 
 
         public override string ToString() => Name;

AnnoMapEditor/MapTemplates/Enums/MapElementType.cs

@@ -1,5 +1,6 @@
 using AnnoMapEditor.Utilities;
 using System.Linq;
+using AnnoMapEditor.MapTemplates.Models;
 
 namespace AnnoMapEditor.MapTemplates.Enums
 {
@@ -35,5 +36,16 @@ public static MapElementType FromElementValue(int? elementValue)
 
             return mapElementType;
         }
+
+        public static MapElementType FromElement(MapElement mapElement)
+        {
+            return mapElement switch
+            {
+                FixedIslandElement => FixedIsland,
+                RandomIslandElement => PoolIsland,
+                StartingSpotElement => StartingSpot,
+                _ => FixedIsland
+            };
+        }
     }
 }

AnnoMapEditor/MapTemplates/Models/FixedIslandElement.cs

@@ -40,9 +40,7 @@ public bool RandomizeRotation
             get => _randomizeRotation;
             set {
                 SetProperty(ref _randomizeRotation, value);
-
-                if (!value && Rotation == null)
-                    Rotation = 0;
+                if (!value && Rotation == null) Rotation = 0;
             }
         }
         private bool _randomizeRotation = true;
@@ -70,7 +68,7 @@ public bool RandomizeFertilities
         public bool RandomizeSlots
         {
             get => _randomizeSlots;
-            set => SetProperty(ref _randomizeSlots, value);
+            set => SetProperty( ref _randomizeSlots, value);
         }
         private bool _randomizeSlots = true;
 

AnnoMapEditor/MapTemplates/Models/IslandElement.cs

@@ -1,6 +1,5 @@
 using Anno.FileDBModels.Anno1800.MapTemplate;
 using AnnoMapEditor.MapTemplates.Enums;
-using AnnoMapEditor.Utilities;
 using IslandType = AnnoMapEditor.MapTemplates.Enums.IslandType;
 
 namespace AnnoMapEditor.MapTemplates.Models
@@ -45,8 +44,7 @@ public IslandElement(IslandType islandType)
         {
             _islandType = islandType;
         }
-
-
+
         // ---- Serialization ----
 
         public IslandElement(Element sourceTemplate)