From 66c834e8be9a17b77164c8b1abe7d72bada37561 Mon Sep 17 00:00:00 2001 From: Alex <15199219+muskit@users.noreply.github.com> Date: Tue, 19 Aug 2025 17:03:56 -0700 Subject: [PATCH] move source files --- {Assets => src/Assets}/imgs/banner_dark.png | Bin {Assets => src/Assets}/imgs/banner_light.png | Bin {Assets => src/Assets}/imgs/jacket-placeholder.png | Bin {Data => src/Data}/Database.cs | 0 {Data => src/Data}/Song/Consts.cs | 0 {Data => src/Data}/Song/Song.cs | 0 .../MercuryConverter.csproj | 4 ++-- MercuryConverter.sln => src/MercuryConverter.sln | 0 Program.cs => src/Program.cs | 0 {UI => src/UI}/App.axaml | 0 {UI => src/UI}/App.axaml.cs | 0 {UI => src/UI}/Dialogs/DataScanning.axaml | 0 {UI => src/UI}/Dialogs/DataScanning.axaml.cs | 7 +++---- {UI => src/UI}/Dialogs/Welcome.axaml | 0 {UI => src/UI}/Dialogs/Welcome.axaml.cs | 0 {UI => src/UI}/MainWindow.axaml | 0 {UI => src/UI}/MainWindow.axaml.cs | 0 {UI => src/UI}/Overrides/Expander.axaml | 0 {UI => src/UI}/Views/Selection/Selection.axaml | 0 {UI => src/UI}/Views/Selection/Selection.axaml.cs | 0 app.manifest => src/app.manifest | 0 21 files changed, 5 insertions(+), 6 deletions(-) rename {Assets => src/Assets}/imgs/banner_dark.png (100%) rename {Assets => src/Assets}/imgs/banner_light.png (100%) rename {Assets => src/Assets}/imgs/jacket-placeholder.png (100%) rename {Data => src/Data}/Database.cs (100%) rename {Data => src/Data}/Song/Consts.cs (100%) rename {Data => src/Data}/Song/Song.cs (100%) rename MercuryConverter.csproj => src/MercuryConverter.csproj (90%) rename MercuryConverter.sln => src/MercuryConverter.sln (100%) rename Program.cs => src/Program.cs (100%) rename {UI => src/UI}/App.axaml (100%) rename {UI => src/UI}/App.axaml.cs (100%) rename {UI => src/UI}/Dialogs/DataScanning.axaml (100%) rename {UI => src/UI}/Dialogs/DataScanning.axaml.cs (97%) rename {UI => src/UI}/Dialogs/Welcome.axaml (100%) rename {UI => src/UI}/Dialogs/Welcome.axaml.cs (100%) rename {UI => src/UI}/MainWindow.axaml (100%) rename {UI => src/UI}/MainWindow.axaml.cs (100%) rename {UI => src/UI}/Overrides/Expander.axaml (100%) rename {UI => src/UI}/Views/Selection/Selection.axaml (100%) rename {UI => src/UI}/Views/Selection/Selection.axaml.cs (100%) rename app.manifest => src/app.manifest (100%) diff --git a/Assets/imgs/banner_dark.png b/src/Assets/imgs/banner_dark.png similarity index 100% rename from Assets/imgs/banner_dark.png rename to src/Assets/imgs/banner_dark.png diff --git a/Assets/imgs/banner_light.png b/src/Assets/imgs/banner_light.png similarity index 100% rename from Assets/imgs/banner_light.png rename to src/Assets/imgs/banner_light.png diff --git a/Assets/imgs/jacket-placeholder.png b/src/Assets/imgs/jacket-placeholder.png similarity index 100% rename from Assets/imgs/jacket-placeholder.png rename to src/Assets/imgs/jacket-placeholder.png diff --git a/Data/Database.cs b/src/Data/Database.cs similarity index 100% rename from Data/Database.cs rename to src/Data/Database.cs diff --git a/Data/Song/Consts.cs b/src/Data/Song/Consts.cs similarity index 100% rename from Data/Song/Consts.cs rename to src/Data/Song/Consts.cs diff --git a/Data/Song/Song.cs b/src/Data/Song/Song.cs similarity index 100% rename from Data/Song/Song.cs rename to src/Data/Song/Song.cs diff --git a/MercuryConverter.csproj b/src/MercuryConverter.csproj similarity index 90% rename from MercuryConverter.csproj rename to src/MercuryConverter.csproj index 9d049a0..684364a 100644 --- a/MercuryConverter.csproj +++ b/src/MercuryConverter.csproj @@ -33,7 +33,7 @@ - - + + diff --git a/MercuryConverter.sln b/src/MercuryConverter.sln similarity index 100% rename from MercuryConverter.sln rename to src/MercuryConverter.sln diff --git a/Program.cs b/src/Program.cs similarity index 100% rename from Program.cs rename to src/Program.cs diff --git a/UI/App.axaml b/src/UI/App.axaml similarity index 100% rename from UI/App.axaml rename to src/UI/App.axaml diff --git a/UI/App.axaml.cs b/src/UI/App.axaml.cs similarity index 100% rename from UI/App.axaml.cs rename to src/UI/App.axaml.cs diff --git a/UI/Dialogs/DataScanning.axaml b/src/UI/Dialogs/DataScanning.axaml similarity index 100% rename from UI/Dialogs/DataScanning.axaml rename to src/UI/Dialogs/DataScanning.axaml diff --git a/UI/Dialogs/DataScanning.axaml.cs b/src/UI/Dialogs/DataScanning.axaml.cs similarity index 97% rename from UI/Dialogs/DataScanning.axaml.cs rename to src/UI/Dialogs/DataScanning.axaml.cs index 24523c7..2a8f09c 100644 --- a/UI/Dialogs/DataScanning.axaml.cs +++ b/src/UI/Dialogs/DataScanning.axaml.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -8,14 +7,14 @@ using Avalonia.Interactivity; using Avalonia.Platform.Storage; using Avalonia.Threading; using MercuryConverter.Data; -using UAssetAPI; -using UAssetAPI.UnrealTypes; namespace MercuryConverter.UI.Dialogs; public partial class DataScanning : UserControl { public static DataScanning? Instance { get; private set; } + + public DataScanning() { Instance = this; @@ -66,7 +65,7 @@ public partial class DataScanning : UserControl Dispatcher.UIThread.Post(() => { ScanStatus.Text = "select your data folder..."; - ScanPath.IsVisible = false; + ScanPath.IsVisible = true; ScanInfo.IsVisible = false; ButtonGroup.IsVisible = false; ProgressAnimation.IsVisible = true; diff --git a/UI/Dialogs/Welcome.axaml b/src/UI/Dialogs/Welcome.axaml similarity index 100% rename from UI/Dialogs/Welcome.axaml rename to src/UI/Dialogs/Welcome.axaml diff --git a/UI/Dialogs/Welcome.axaml.cs b/src/UI/Dialogs/Welcome.axaml.cs similarity index 100% rename from UI/Dialogs/Welcome.axaml.cs rename to src/UI/Dialogs/Welcome.axaml.cs diff --git a/UI/MainWindow.axaml b/src/UI/MainWindow.axaml similarity index 100% rename from UI/MainWindow.axaml rename to src/UI/MainWindow.axaml diff --git a/UI/MainWindow.axaml.cs b/src/UI/MainWindow.axaml.cs similarity index 100% rename from UI/MainWindow.axaml.cs rename to src/UI/MainWindow.axaml.cs diff --git a/UI/Overrides/Expander.axaml b/src/UI/Overrides/Expander.axaml similarity index 100% rename from UI/Overrides/Expander.axaml rename to src/UI/Overrides/Expander.axaml diff --git a/UI/Views/Selection/Selection.axaml b/src/UI/Views/Selection/Selection.axaml similarity index 100% rename from UI/Views/Selection/Selection.axaml rename to src/UI/Views/Selection/Selection.axaml diff --git a/UI/Views/Selection/Selection.axaml.cs b/src/UI/Views/Selection/Selection.axaml.cs similarity index 100% rename from UI/Views/Selection/Selection.axaml.cs rename to src/UI/Views/Selection/Selection.axaml.cs diff --git a/app.manifest b/src/app.manifest similarity index 100% rename from app.manifest rename to src/app.manifest