diff --git a/SMT.Console/Program.cs b/SMT.Console/Program.cs new file mode 100644 index 0000000..3751555 --- /dev/null +++ b/SMT.Console/Program.cs @@ -0,0 +1,2 @@ +// See https://aka.ms/new-console-template for more information +Console.WriteLine("Hello, World!"); diff --git a/SMT.Console/SMT.Console.csproj b/SMT.Console/SMT.Console.csproj new file mode 100644 index 0000000..f02677b --- /dev/null +++ b/SMT.Console/SMT.Console.csproj @@ -0,0 +1,10 @@ + + + + Exe + net7.0 + enable + enable + + + diff --git a/core/Configuration.cs b/SMT.Core/Configuration.cs similarity index 86% rename from core/Configuration.cs rename to SMT.Core/Configuration.cs index 77eeea6..1a45068 100644 --- a/core/Configuration.cs +++ b/SMT.Core/Configuration.cs @@ -1,4 +1,4 @@ -namespace SoulsModTranslator.core; +namespace SMT.core; public static class Configuration { diff --git a/core/DB.cs b/SMT.Core/DB.cs similarity index 95% rename from core/DB.cs rename to SMT.Core/DB.cs index ee1f106..fda5d8c 100644 --- a/core/DB.cs +++ b/SMT.Core/DB.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SoulsModTranslator.core; +namespace SMT.core; public class DB { diff --git a/core/DBTool.cs b/SMT.Core/DBTool.cs similarity index 98% rename from core/DBTool.cs rename to SMT.Core/DBTool.cs index f5dfca6..c2e74da 100644 --- a/core/DBTool.cs +++ b/SMT.Core/DBTool.cs @@ -5,7 +5,7 @@ using System.Text.Json.Serialization; using NLog; -namespace SoulsModTranslator.core; +namespace SMT.core; public static class DbTool { diff --git a/core/Glossary.cs b/SMT.Core/Glossary.cs similarity index 98% rename from core/Glossary.cs rename to SMT.Core/Glossary.cs index 7d8a322..12ebf8b 100644 --- a/core/Glossary.cs +++ b/SMT.Core/Glossary.cs @@ -2,11 +2,9 @@ using System.IO; using System.Text.Json; using System.Text.RegularExpressions; -using System.Windows.Documents; -using System.Windows.Shapes; using NLog; -namespace SoulsModTranslator.core; +namespace SMT.core; public class Glossary { diff --git a/core/LangFile.cs b/SMT.Core/LangFile.cs similarity index 98% rename from core/LangFile.cs rename to SMT.Core/LangFile.cs index 23d248b..9e325d0 100644 --- a/core/LangFile.cs +++ b/SMT.Core/LangFile.cs @@ -3,7 +3,7 @@ using NLog; using SoulsFormats; -namespace SoulsModTranslator.core; +namespace SMT.core; public class LangFile { diff --git a/SMT.Core/SMT.Core.csproj b/SMT.Core/SMT.Core.csproj new file mode 100644 index 0000000..5ec24bc --- /dev/null +++ b/SMT.Core/SMT.Core.csproj @@ -0,0 +1,22 @@ + + + + enable + net7.0-windows + enable + enable + + + + + SoulsFormats.dll + + + + + + + + + + diff --git a/SoulsFormats.dll b/SMT.Core/SoulsFormats.dll similarity index 100% rename from SoulsFormats.dll rename to SMT.Core/SoulsFormats.dll diff --git a/core/TextExporter.cs b/SMT.Core/TextExporter.cs similarity index 99% rename from core/TextExporter.cs rename to SMT.Core/TextExporter.cs index 87cbdae..d140c84 100644 --- a/core/TextExporter.cs +++ b/SMT.Core/TextExporter.cs @@ -2,7 +2,7 @@ using NLog; using NPOI.XSSF.UserModel; -namespace SoulsModTranslator.core; +namespace SMT.core; public static class TextExporter { diff --git a/core/TextImporter.cs b/SMT.Core/TextImporter.cs similarity index 94% rename from core/TextImporter.cs rename to SMT.Core/TextImporter.cs index 7b6927e..7fc2a15 100644 --- a/core/TextImporter.cs +++ b/SMT.Core/TextImporter.cs @@ -1,8 +1,6 @@ -using System.IO; -using Microsoft.VisualBasic.Logging; -using NPOI.XSSF.UserModel; +using NPOI.XSSF.UserModel; -namespace SoulsModTranslator.core; +namespace SMT.core; public class TextImporter { diff --git a/core/Translator.cs b/SMT.Core/Translator.cs similarity index 99% rename from core/Translator.cs rename to SMT.Core/Translator.cs index e2317df..1d4e3ae 100644 --- a/core/Translator.cs +++ b/SMT.Core/Translator.cs @@ -1,12 +1,11 @@ using System.Diagnostics; using System.IO; -using System.Windows.Forms.Design; using NLog; using NPOI.SS.Formula; using NPOI.SS.Formula.Functions; using SoulsFormats; -namespace SoulsModTranslator.core; +namespace SMT.core; public class ExportResult { diff --git a/core/Utils.cs b/SMT.Core/Utils.cs similarity index 98% rename from core/Utils.cs rename to SMT.Core/Utils.cs index 1778677..54ad861 100644 --- a/core/Utils.cs +++ b/SMT.Core/Utils.cs @@ -3,7 +3,7 @@ using System.Text.Json; using System.Text.RegularExpressions; -namespace SoulsModTranslator.core; +namespace SMT.core; public static class Utils { diff --git a/App.xaml b/SMT.WPF/App.xaml similarity index 100% rename from App.xaml rename to SMT.WPF/App.xaml diff --git a/App.xaml.cs b/SMT.WPF/App.xaml.cs similarity index 100% rename from App.xaml.cs rename to SMT.WPF/App.xaml.cs diff --git a/AssemblyInfo.cs b/SMT.WPF/AssemblyInfo.cs similarity index 100% rename from AssemblyInfo.cs rename to SMT.WPF/AssemblyInfo.cs diff --git a/MainWindow.xaml b/SMT.WPF/MainWindow.xaml similarity index 99% rename from MainWindow.xaml rename to SMT.WPF/MainWindow.xaml index 2a36605..5a702a8 100644 --- a/MainWindow.xaml +++ b/SMT.WPF/MainWindow.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for MainWindow.xaml @@ -65,6 +65,7 @@ private static void ShowTaskResult(bool success, string succMsg, string failMsg) System.Windows.Clipboard.SetText(prompt + text); Utils.OpenURL("https://www.bilibili.com/video/BV17p421Q7qJ/"); + } } diff --git a/SoulsModTranslator.csproj b/SMT.WPF/SMT.WPF.csproj similarity index 90% rename from SoulsModTranslator.csproj rename to SMT.WPF/SMT.WPF.csproj index ca6f86c..9b03f36 100644 --- a/SoulsModTranslator.csproj +++ b/SMT.WPF/SMT.WPF.csproj @@ -13,13 +13,12 @@ - + - - SoulsFormats.dll - + - + + diff --git a/SoulsModTranslator.csproj.user b/SMT.WPF/SMT.WPF.csproj.user similarity index 100% rename from SoulsModTranslator.csproj.user rename to SMT.WPF/SMT.WPF.csproj.user diff --git a/db/darksouls3.json b/SMT.WPF/db/darksouls3.json similarity index 100% rename from db/darksouls3.json rename to SMT.WPF/db/darksouls3.json diff --git a/db/eldenring.json b/SMT.WPF/db/eldenring.json similarity index 100% rename from db/eldenring.json rename to SMT.WPF/db/eldenring.json diff --git a/db/eldenring_with_dlc.json b/SMT.WPF/db/eldenring_with_dlc.json similarity index 100% rename from db/eldenring_with_dlc.json rename to SMT.WPF/db/eldenring_with_dlc.json diff --git a/db/sekiro.json b/SMT.WPF/db/sekiro.json similarity index 100% rename from db/sekiro.json rename to SMT.WPF/db/sekiro.json diff --git a/glossaries/eldenring.json b/SMT.WPF/glossaries/eldenring.json similarity index 100% rename from glossaries/eldenring.json rename to SMT.WPF/glossaries/eldenring.json diff --git a/icon.ico b/SMT.WPF/icon.ico similarity index 100% rename from icon.ico rename to SMT.WPF/icon.ico diff --git a/oo2core_6_win64.dll b/SMT.WPF/oo2core_6_win64.dll similarity index 100% rename from oo2core_6_win64.dll rename to SMT.WPF/oo2core_6_win64.dll diff --git a/publish.py b/SMT.WPF/publish.py similarity index 100% rename from publish.py rename to SMT.WPF/publish.py diff --git a/SoulsModTranslator.sln b/SoulsModTranslator.sln index a2714f1..b852f4d 100644 --- a/SoulsModTranslator.sln +++ b/SoulsModTranslator.sln @@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34622.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoulsModTranslator", "SoulsModTranslator.csproj", "{D379C4A1-B6A7-4285-8B54-264ED790B32E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.Core", "SMT.Core\SMT.Core.csproj", "{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.Console", "SMT.Console\SMT.Console.csproj", "{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.WPF", "SMT.WPF\SMT.WPF.csproj", "{36BEFF02-74CD-4A7A-A008-B53EC51D9719}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +15,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D379C4A1-B6A7-4285-8B54-264ED790B32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D379C4A1-B6A7-4285-8B54-264ED790B32E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D379C4A1-B6A7-4285-8B54-264ED790B32E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D379C4A1-B6A7-4285-8B54-264ED790B32E}.Release|Any CPU.Build.0 = Release|Any CPU + {8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Release|Any CPU.Build.0 = Release|Any CPU + {1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Release|Any CPU.Build.0 = Release|Any CPU + {36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SoulsModTranslator.sln.DotSettings.user b/SoulsModTranslator.sln.DotSettings.user deleted file mode 100644 index 2f04ffc..0000000 --- a/SoulsModTranslator.sln.DotSettings.user +++ /dev/null @@ -1,6 +0,0 @@ - - <AssemblyExplorer> - <Assembly Path="C:\Users\xhy\.nuget\packages\panuon.wpf.ui\1.2.1.2\lib\net7.0-windows\Panuon.WPF.UI.dll" /> - <Assembly Path="C:\Users\xhy\.nuget\packages\adonisui.classictheme\1.17.1\lib\net5.0-windows7.0\AdonisUI.ClassicTheme.dll" /> - <Assembly Path="C:\Users\xhy\.nuget\packages\adonisui\1.17.1\lib\net5.0-windows7.0\AdonisUI.dll" /> -</AssemblyExplorer> \ No newline at end of file