diff --git a/.gitmodules b/.gitmodules index 467f35a2..a4757181 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "DICUI.Library/Aaru/CICMMetadata"] - path = DICUI.Library/Aaru/CICMMetadata +[submodule "MPF.Library/Aaru/CICMMetadata"] + path = MPF.Library/Aaru/CICMMetadata url = https://github.com/claunia/CICMMetadata \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 1d41a633..a9f0f730 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/DICUI/bin/Debug/netcoreapp3.1/DICUI.dll", + "program": "${workspaceFolder}/MPF/bin/Debug/netcoreapp3.1/MPF.dll", "args": [], - "cwd": "${workspaceFolder}/DICUI", + "cwd": "${workspaceFolder}/MPF", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console "console": "internalConsole", "stopAtEntry": false diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7cb24f0b..0d20f645 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/DICUI/DICUI.csproj", + "${workspaceFolder}/MPF/MPF.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/DICUI/DICUI.csproj", + "${workspaceFolder}/MPF/MPF.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -32,7 +32,7 @@ "args": [ "watch", "run", - "${workspaceFolder}/DICUI/DICUI.csproj", + "${workspaceFolder}/MPF/MPF.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], diff --git a/CHANGELIST.md b/CHANGELIST.md index 755c61eb..b5e21354 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,3 +1,6 @@ +### WIP (xxxx-xx-xx) +- Rename DICUI to Media Preservation Frontend (MPF) + ### 1.18 (2020-11-10) - Add more information extraction and generation for Aaru - Remove instances of CD Check from copy protection (again, sorry) diff --git a/LICENSE b/LICENSE index 1cf68dca..b7d6f7c1 100644 --- a/LICENSE +++ b/LICENSE @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - DICUI Copyright (C) 2018 ReignStumble + MPF Copyright (C) 2018 ReignStumble This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/DICUI.Avalonia/App.axaml b/MPF.Avalonia/App.axaml similarity index 89% rename from DICUI.Avalonia/App.axaml rename to MPF.Avalonia/App.axaml index c1a2b88f..089e3e5a 100644 --- a/DICUI.Avalonia/App.axaml +++ b/MPF.Avalonia/App.axaml @@ -1,6 +1,6 @@  + x:Class="MPF.Avalonia.App"> diff --git a/DICUI.Avalonia/App.axaml.cs b/MPF.Avalonia/App.axaml.cs similarity index 95% rename from DICUI.Avalonia/App.axaml.cs rename to MPF.Avalonia/App.axaml.cs index 40ee8f77..79026b3d 100644 --- a/DICUI.Avalonia/App.axaml.cs +++ b/MPF.Avalonia/App.axaml.cs @@ -2,7 +2,7 @@ using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class App : Application { diff --git a/DICUI.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs similarity index 90% rename from DICUI.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs index 2eb67000..4c12c3f8 100644 --- a/DICUI.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the Category combo box diff --git a/DICUI.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs similarity index 90% rename from DICUI.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs index a874a28a..fea63378 100644 --- a/DICUI.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the Internal Program combo box diff --git a/DICUI.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs similarity index 93% rename from DICUI.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs index 0f9160b3..3af33019 100644 --- a/DICUI.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs @@ -1,8 +1,8 @@ using Avalonia.Media; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the System combo box diff --git a/DICUI.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs similarity index 89% rename from DICUI.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs index 7216b1fc..33287019 100644 --- a/DICUI.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the Language combo box diff --git a/DICUI.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs similarity index 86% rename from DICUI.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs index 4dbc4abc..9e4c08d3 100644 --- a/DICUI.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the MediaType combo box diff --git a/DICUI.Avalonia/ComboBoxItems/RegionComboBoxItem.cs b/MPF.Avalonia/ComboBoxItems/RegionComboBoxItem.cs similarity index 89% rename from DICUI.Avalonia/ComboBoxItems/RegionComboBoxItem.cs rename to MPF.Avalonia/ComboBoxItems/RegionComboBoxItem.cs index 2309b43a..8bae4dc9 100644 --- a/DICUI.Avalonia/ComboBoxItems/RegionComboBoxItem.cs +++ b/MPF.Avalonia/ComboBoxItems/RegionComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Represents a single item in the Region combo box diff --git a/DICUI.Avalonia/Constants.cs b/MPF.Avalonia/Constants.cs similarity index 96% rename from DICUI.Avalonia/Constants.cs rename to MPF.Avalonia/Constants.cs index a78d14d6..f9d37507 100644 --- a/DICUI.Avalonia/Constants.cs +++ b/MPF.Avalonia/Constants.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using DICUI.Data; +using MPF.Data; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Variables for UI elements diff --git a/DICUI.Avalonia/DiscInformationWindow.axaml b/MPF.Avalonia/DiscInformationWindow.axaml similarity index 99% rename from DICUI.Avalonia/DiscInformationWindow.axaml rename to MPF.Avalonia/DiscInformationWindow.axaml index 52e22e14..1ea3ed5d 100644 --- a/DICUI.Avalonia/DiscInformationWindow.axaml +++ b/MPF.Avalonia/DiscInformationWindow.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="705" Width="515.132" Height="705" - x:Class="DICUI.Avalonia.DiscInformationWindow" Icon="Icon.ico" CanResize="False" + x:Class="MPF.Avalonia.DiscInformationWindow" Icon="Icon.ico" CanResize="False" Title="Disc Information" Closed="OnClosed"> diff --git a/DICUI.Avalonia/DiscInformationWindow.axaml.cs b/MPF.Avalonia/DiscInformationWindow.axaml.cs similarity index 99% rename from DICUI.Avalonia/DiscInformationWindow.axaml.cs rename to MPF.Avalonia/DiscInformationWindow.axaml.cs index 474a86b1..7a99fa7f 100644 --- a/DICUI.Avalonia/DiscInformationWindow.axaml.cs +++ b/MPF.Avalonia/DiscInformationWindow.axaml.cs @@ -6,9 +6,9 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.Media; -using DICUI.Web; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class DiscInformationWindow : Window { diff --git a/DICUI.Avalonia/EnumDescriptionConverter.cs b/MPF.Avalonia/EnumDescriptionConverter.cs similarity index 92% rename from DICUI.Avalonia/EnumDescriptionConverter.cs rename to MPF.Avalonia/EnumDescriptionConverter.cs index 24eb49e1..181310b5 100644 --- a/DICUI.Avalonia/EnumDescriptionConverter.cs +++ b/MPF.Avalonia/EnumDescriptionConverter.cs @@ -1,10 +1,10 @@ using System; using System.Globalization; using Avalonia.Data.Converters; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI.Avalonia +namespace MPF.Avalonia { /// /// Used to provide a converter to XAML files to render comboboxes with enum values diff --git a/DICUI.Avalonia/Icon.ico b/MPF.Avalonia/Icon.ico similarity index 100% rename from DICUI.Avalonia/Icon.ico rename to MPF.Avalonia/Icon.ico diff --git a/DICUI.Avalonia/LogWindow.axaml b/MPF.Avalonia/LogWindow.axaml similarity index 94% rename from DICUI.Avalonia/LogWindow.axaml rename to MPF.Avalonia/LogWindow.axaml index 92e52a96..a5cd057c 100644 --- a/DICUI.Avalonia/LogWindow.axaml +++ b/MPF.Avalonia/LogWindow.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:DICUI.Avalonia" + xmlns:local="clr-namespace:MPF.Avalonia" mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="350" Width="600" Height="350" - x:Class="DICUI.Avalonia.LogWindow" Icon="Icon.ico" CanResize="False" + x:Class="MPF.Avalonia.LogWindow" Icon="Icon.ico" CanResize="False" Title="Log Window"> diff --git a/DICUI.Avalonia/LogWindow.axaml.cs b/MPF.Avalonia/LogWindow.axaml.cs similarity index 98% rename from DICUI.Avalonia/LogWindow.axaml.cs rename to MPF.Avalonia/LogWindow.axaml.cs index 85684c8a..c2927b69 100644 --- a/DICUI.Avalonia/LogWindow.axaml.cs +++ b/MPF.Avalonia/LogWindow.axaml.cs @@ -5,7 +5,7 @@ using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using Avalonia.Media; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class LogWindow : Window { diff --git a/DICUI.Avalonia/DICUI.Avalonia.csproj b/MPF.Avalonia/MPF.Avalonia.csproj similarity index 90% rename from DICUI.Avalonia/DICUI.Avalonia.csproj rename to MPF.Avalonia/MPF.Avalonia.csproj index 99967adb..ee07f9a0 100644 --- a/DICUI.Avalonia/DICUI.Avalonia.csproj +++ b/MPF.Avalonia/MPF.Avalonia.csproj @@ -5,12 +5,12 @@ WinExe Icon.ico true - DICUI - DICUI.Avalonia + MPF + MPF.Avalonia Frontend for various dumping programs Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2020 - https://github.com/SabreTools/DICUI + https://github.com/SabreTools/MPF 1.18 1.18 1.18 @@ -33,7 +33,7 @@ - + diff --git a/DICUI.Avalonia/MainWindow.axaml b/MPF.Avalonia/MainWindow.axaml similarity index 97% rename from DICUI.Avalonia/MainWindow.axaml rename to MPF.Avalonia/MainWindow.axaml index a909fedf..ae777b51 100644 --- a/DICUI.Avalonia/MainWindow.axaml +++ b/MPF.Avalonia/MainWindow.axaml @@ -2,10 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:DICUI.Avalonia" + xmlns:local="clr-namespace:MPF.Avalonia" mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450" Width="600" Height="450" - x:Class="DICUI.Avalonia.MainWindow" Icon="Icon.ico" CanResize="False" - Title="DICUI" WindowStartupLocation="CenterScreen" + x:Class="MPF.Avalonia.MainWindow" Icon="Icon.ico" CanResize="False" + Title="MPF" WindowStartupLocation="CenterScreen" PositionChanged="MainWindowLocationChanged" Activated="MainWindowActivated" Closing="MainWindowClosing"> diff --git a/DICUI.Avalonia/MainWindow.axaml.cs b/MPF.Avalonia/MainWindow.axaml.cs similarity index 99% rename from DICUI.Avalonia/MainWindow.axaml.cs rename to MPF.Avalonia/MainWindow.axaml.cs index 45f6d261..b90a0d73 100644 --- a/DICUI.Avalonia/MainWindow.axaml.cs +++ b/MPF.Avalonia/MainWindow.axaml.cs @@ -9,11 +9,11 @@ using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using BurnOutSharp; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class MainWindow : Window { diff --git a/DICUI.Avalonia/MessageBox.axaml b/MPF.Avalonia/MessageBox.axaml similarity index 89% rename from DICUI.Avalonia/MessageBox.axaml rename to MPF.Avalonia/MessageBox.axaml index c134a199..5f49b8fd 100644 --- a/DICUI.Avalonia/MessageBox.axaml +++ b/MPF.Avalonia/MessageBox.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" Icon="Icon.ico" - x:Class="DICUI.Avalonia.MessageBox" SizeToContent="WidthAndHeight" CanResize="False"> + x:Class="MPF.Avalonia.MessageBox" SizeToContent="WidthAndHeight" CanResize="False"> diff --git a/DICUI.Avalonia/MessageBox.axaml.cs b/MPF.Avalonia/MessageBox.axaml.cs similarity index 98% rename from DICUI.Avalonia/MessageBox.axaml.cs rename to MPF.Avalonia/MessageBox.axaml.cs index d0d0ccc5..79d87296 100644 --- a/DICUI.Avalonia/MessageBox.axaml.cs +++ b/MPF.Avalonia/MessageBox.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; // https://stackoverflow.com/questions/55706291/how-to-show-a-message-box-in-avaloniaui-beta -namespace DICUI.Avalonia +namespace MPF.Avalonia { public enum MessageBoxButtons { diff --git a/DICUI.Avalonia/OptionsWindow.axaml b/MPF.Avalonia/OptionsWindow.axaml similarity index 98% rename from DICUI.Avalonia/OptionsWindow.axaml rename to MPF.Avalonia/OptionsWindow.axaml index 34d17e25..cbc9463f 100644 --- a/DICUI.Avalonia/OptionsWindow.axaml +++ b/MPF.Avalonia/OptionsWindow.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:DICUI.Avalonia" + xmlns:local="clr-namespace:MPF.Avalonia" mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="600" Width="515.132" Height="600" - x:Class="DICUI.Avalonia.OptionsWindow" Icon="Icon.ico" CanResize="False" + x:Class="MPF.Avalonia.OptionsWindow" Icon="Icon.ico" CanResize="False" Title="Options"> diff --git a/DICUI.Avalonia/OptionsWindow.axaml.cs b/MPF.Avalonia/OptionsWindow.axaml.cs similarity index 98% rename from DICUI.Avalonia/OptionsWindow.axaml.cs rename to MPF.Avalonia/OptionsWindow.axaml.cs index b35c6e9c..55f51bbf 100644 --- a/DICUI.Avalonia/OptionsWindow.axaml.cs +++ b/MPF.Avalonia/OptionsWindow.axaml.cs @@ -5,11 +5,11 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class OptionsWindow : Window { diff --git a/DICUI.Avalonia/Program.cs b/MPF.Avalonia/Program.cs similarity index 96% rename from DICUI.Avalonia/Program.cs rename to MPF.Avalonia/Program.cs index 38da7006..007c9110 100644 --- a/DICUI.Avalonia/Program.cs +++ b/MPF.Avalonia/Program.cs @@ -3,7 +3,7 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Logging.Serilog; -namespace DICUI.Avalonia +namespace MPF.Avalonia { class Program { diff --git a/DICUI.Avalonia/UIOptions.cs b/MPF.Avalonia/UIOptions.cs similarity index 98% rename from DICUI.Avalonia/UIOptions.cs rename to MPF.Avalonia/UIOptions.cs index b20e6c0f..588308a7 100644 --- a/DICUI.Avalonia/UIOptions.cs +++ b/MPF.Avalonia/UIOptions.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Configuration; -using DICUI.Data; +using MPF.Data; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class UIOptions { diff --git a/DICUI.Avalonia/ViewModels.cs b/MPF.Avalonia/ViewModels.cs similarity index 99% rename from DICUI.Avalonia/ViewModels.cs rename to MPF.Avalonia/ViewModels.cs index 8c08156d..4a174167 100644 --- a/DICUI.Avalonia/ViewModels.cs +++ b/MPF.Avalonia/ViewModels.cs @@ -1,7 +1,7 @@ using System; using Avalonia.Media; -namespace DICUI.Avalonia +namespace MPF.Avalonia { public class OptionsViewModel { diff --git a/DICUI.Avalonia/nuget.config b/MPF.Avalonia/nuget.config similarity index 100% rename from DICUI.Avalonia/nuget.config rename to MPF.Avalonia/nuget.config diff --git a/DICUI.Check/App.config b/MPF.Check/App.config similarity index 100% rename from DICUI.Check/App.config rename to MPF.Check/App.config diff --git a/DICUI.Check/DICUI.Check.csproj b/MPF.Check/MPF.Check.csproj similarity index 83% rename from DICUI.Check/DICUI.Check.csproj rename to MPF.Check/MPF.Check.csproj index d4e5c9de..be598466 100644 --- a/DICUI.Check/DICUI.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -4,12 +4,12 @@ net472;net48;netcoreapp3.1 Exe true - DICUI Check - DICUI.Check + MPF Check + MPF.Check Validator for various dumping programs Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2020 - https://github.com/SabreTools/DICUI + https://github.com/SabreTools/MPF 1.18 1.18 1.18 @@ -32,9 +32,9 @@ - + {51ab0928-13f9-44bf-a407-b6957a43a056} - DICUI.Library + MPF.Library diff --git a/DICUI.Check/Program.cs b/MPF.Check/Program.cs similarity index 97% rename from DICUI.Check/Program.cs rename to MPF.Check/Program.cs index b0db43f5..380ea900 100644 --- a/DICUI.Check/Program.cs +++ b/MPF.Check/Program.cs @@ -1,11 +1,11 @@ using System; using System.IO; using BurnOutSharp; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Check +namespace MPF.Check { public class Program { @@ -177,7 +177,7 @@ namespace DICUI.Check } /// - /// Display help for DICUI.Check + /// Display help for MPF.Check /// /// Error string to prefix the help text with private static void DisplayHelp(string error = null) @@ -186,7 +186,7 @@ namespace DICUI.Check Console.WriteLine(error); Console.WriteLine("Usage:"); - Console.WriteLine("DICUI.Check.exe [options] ..."); + Console.WriteLine("MPF.Check.exe [options] ..."); Console.WriteLine(); Console.WriteLine("Standalone Options:"); Console.WriteLine("-h, -? Show this help text"); diff --git a/DICUI.Check/launchSettings.json b/MPF.Check/launchSettings.json similarity index 74% rename from DICUI.Check/launchSettings.json rename to MPF.Check/launchSettings.json index aea1803c..229d90e6 100644 --- a/DICUI.Check/launchSettings.json +++ b/MPF.Check/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "DICUI.Check": { + "MPF.Check": { "commandName": "Project" } } diff --git a/DICUI.Library/Aaru/CICMMetadata b/MPF.Library/Aaru/CICMMetadata similarity index 100% rename from DICUI.Library/Aaru/CICMMetadata rename to MPF.Library/Aaru/CICMMetadata diff --git a/DICUI.Library/Aaru/Constants.cs b/MPF.Library/Aaru/Constants.cs similarity index 99% rename from DICUI.Library/Aaru/Constants.cs rename to MPF.Library/Aaru/Constants.cs index 8891a4ec..1bd7fa8f 100644 --- a/DICUI.Library/Aaru/Constants.cs +++ b/MPF.Library/Aaru/Constants.cs @@ -1,4 +1,4 @@ -namespace DICUI.Aaru +namespace MPF.Aaru { /// /// Top-level commands for Aaru diff --git a/DICUI.Library/Aaru/Converters.cs b/MPF.Library/Aaru/Converters.cs similarity index 99% rename from DICUI.Library/Aaru/Converters.cs rename to MPF.Library/Aaru/Converters.cs index d8f5a3da..631ae31f 100644 --- a/DICUI.Library/Aaru/Converters.cs +++ b/MPF.Library/Aaru/Converters.cs @@ -1,6 +1,6 @@ -using DICUI.Data; +using MPF.Data; -namespace DICUI.Aaru +namespace MPF.Aaru { public static class Converters { diff --git a/DICUI.Library/Aaru/Enumerations.cs b/MPF.Library/Aaru/Enumerations.cs similarity index 99% rename from DICUI.Library/Aaru/Enumerations.cs rename to MPF.Library/Aaru/Enumerations.cs index cada05b5..ac70e975 100644 --- a/DICUI.Library/Aaru/Enumerations.cs +++ b/MPF.Library/Aaru/Enumerations.cs @@ -1,4 +1,4 @@ -namespace DICUI.Aaru +namespace MPF.Aaru { /// /// Supported Aaru commands diff --git a/DICUI.Library/Aaru/Parameters.cs b/MPF.Library/Aaru/Parameters.cs similarity index 99% rename from DICUI.Library/Aaru/Parameters.cs rename to MPF.Library/Aaru/Parameters.cs index f8e8c3bb..510bf0cf 100644 --- a/DICUI.Library/Aaru/Parameters.cs +++ b/MPF.Library/Aaru/Parameters.cs @@ -7,13 +7,13 @@ using System.Text.RegularExpressions; using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; -using DICUI.CueSheets; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.CueSheets; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; using Schemas; -namespace DICUI.Aaru +namespace MPF.Aaru { /// /// Represents a generic set of Aaru parameters diff --git a/DICUI.Library/AssemblyInfo.cs b/MPF.Library/AssemblyInfo.cs similarity index 70% rename from DICUI.Library/AssemblyInfo.cs rename to MPF.Library/AssemblyInfo.cs index ce6ad6dd..c6ca6aa9 100644 --- a/DICUI.Library/AssemblyInfo.cs +++ b/MPF.Library/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; // Anything marked as internal can be used by the test methods -[assembly: InternalsVisibleTo("DICUI.Test")] \ No newline at end of file +[assembly: InternalsVisibleTo("MPF.Test")] \ No newline at end of file diff --git a/DICUI.Library/CleanRIp/Parameters.cs b/MPF.Library/CleanRIp/Parameters.cs similarity index 99% rename from DICUI.Library/CleanRIp/Parameters.cs rename to MPF.Library/CleanRIp/Parameters.cs index c6f6b861..67ec187f 100644 --- a/DICUI.Library/CleanRIp/Parameters.cs +++ b/MPF.Library/CleanRIp/Parameters.cs @@ -1,10 +1,10 @@ using System; using System.IO; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.CleanRip +namespace MPF.CleanRip { /// /// Represents a generic set of CleanRip parameters diff --git a/DICUI.Library/CueSheets/CueFile.cs b/MPF.Library/CueSheets/CueFile.cs similarity index 99% rename from DICUI.Library/CueSheets/CueFile.cs rename to MPF.Library/CueSheets/CueFile.cs index db3f2eff..c211b455 100644 --- a/DICUI.Library/CueSheets/CueFile.cs +++ b/MPF.Library/CueSheets/CueFile.cs @@ -4,7 +4,7 @@ using System.IO; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// The audio or data file’s filetype diff --git a/DICUI.Library/CueSheets/CueIndex.cs b/MPF.Library/CueSheets/CueIndex.cs similarity index 99% rename from DICUI.Library/CueSheets/CueIndex.cs rename to MPF.Library/CueSheets/CueIndex.cs index 7a5c010b..9bda23ba 100644 --- a/DICUI.Library/CueSheets/CueIndex.cs +++ b/MPF.Library/CueSheets/CueIndex.cs @@ -4,7 +4,7 @@ using System.Linq; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// Represents a single INDEX in a TRACK diff --git a/DICUI.Library/CueSheets/CueSheet.cs b/MPF.Library/CueSheets/CueSheet.cs similarity index 99% rename from DICUI.Library/CueSheets/CueSheet.cs rename to MPF.Library/CueSheets/CueSheet.cs index 6eae8101..1bd7022a 100644 --- a/DICUI.Library/CueSheets/CueSheet.cs +++ b/MPF.Library/CueSheets/CueSheet.cs @@ -8,7 +8,7 @@ using System.Text.RegularExpressions; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// Represents a single cuesheet diff --git a/DICUI.Library/CueSheets/CueTrack.cs b/MPF.Library/CueSheets/CueTrack.cs similarity index 99% rename from DICUI.Library/CueSheets/CueTrack.cs rename to MPF.Library/CueSheets/CueTrack.cs index 7158b171..a5b29b3e 100644 --- a/DICUI.Library/CueSheets/CueTrack.cs +++ b/MPF.Library/CueSheets/CueTrack.cs @@ -5,7 +5,7 @@ using System.IO; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// Track datatype diff --git a/DICUI.Library/CueSheets/PostGap.cs b/MPF.Library/CueSheets/PostGap.cs similarity index 99% rename from DICUI.Library/CueSheets/PostGap.cs rename to MPF.Library/CueSheets/PostGap.cs index b48296da..7a1e1800 100644 --- a/DICUI.Library/CueSheets/PostGap.cs +++ b/MPF.Library/CueSheets/PostGap.cs @@ -4,7 +4,7 @@ using System.Linq; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// Represents POSTGAP information of a track diff --git a/DICUI.Library/CueSheets/PreGap.cs b/MPF.Library/CueSheets/PreGap.cs similarity index 99% rename from DICUI.Library/CueSheets/PreGap.cs rename to MPF.Library/CueSheets/PreGap.cs index d1644a02..5c54e77f 100644 --- a/DICUI.Library/CueSheets/PreGap.cs +++ b/MPF.Library/CueSheets/PreGap.cs @@ -4,7 +4,7 @@ using System.Linq; /// /// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf /// -namespace DICUI.CueSheets +namespace MPF.CueSheets { /// /// Represents PREGAP information of a track diff --git a/DICUI.Library/DD/Constants.cs b/MPF.Library/DD/Constants.cs similarity index 97% rename from DICUI.Library/DD/Constants.cs rename to MPF.Library/DD/Constants.cs index e6d3cdca..b675770f 100644 --- a/DICUI.Library/DD/Constants.cs +++ b/MPF.Library/DD/Constants.cs @@ -1,4 +1,4 @@ -namespace DICUI.DD +namespace MPF.DD { /// /// Top-level commands for DD diff --git a/DICUI.Library/DD/Converters.cs b/MPF.Library/DD/Converters.cs similarity index 98% rename from DICUI.Library/DD/Converters.cs rename to MPF.Library/DD/Converters.cs index 509e2dac..38e2fb40 100644 --- a/DICUI.Library/DD/Converters.cs +++ b/MPF.Library/DD/Converters.cs @@ -1,6 +1,6 @@ -using DICUI.Data; +using MPF.Data; -namespace DICUI.DD +namespace MPF.DD { public static class Converters { diff --git a/DICUI.Library/DD/Enumerations.cs b/MPF.Library/DD/Enumerations.cs similarity index 96% rename from DICUI.Library/DD/Enumerations.cs rename to MPF.Library/DD/Enumerations.cs index 29a307e1..a4968d36 100644 --- a/DICUI.Library/DD/Enumerations.cs +++ b/MPF.Library/DD/Enumerations.cs @@ -1,4 +1,4 @@ -namespace DICUI.DD +namespace MPF.DD { /// /// Supported DD commands diff --git a/DICUI.Library/DD/Parameters.cs b/MPF.Library/DD/Parameters.cs similarity index 99% rename from DICUI.Library/DD/Parameters.cs rename to MPF.Library/DD/Parameters.cs index 505ed9eb..1600daa3 100644 --- a/DICUI.Library/DD/Parameters.cs +++ b/MPF.Library/DD/Parameters.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.DD +namespace MPF.DD { /// /// Represents a generic set of DD parameters diff --git a/DICUI.Library/Data/BaseParameters.cs b/MPF.Library/Data/BaseParameters.cs similarity index 99% rename from DICUI.Library/Data/BaseParameters.cs rename to MPF.Library/Data/BaseParameters.cs index 409623b5..d85d5ec8 100644 --- a/DICUI.Library/Data/BaseParameters.cs +++ b/MPF.Library/Data/BaseParameters.cs @@ -4,10 +4,10 @@ using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; using System.Threading.Tasks; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Data +namespace MPF.Data { public abstract class BaseParameters { diff --git a/DICUI.Library/Data/Constants.cs b/MPF.Library/Data/Constants.cs similarity index 99% rename from DICUI.Library/Data/Constants.cs rename to MPF.Library/Data/Constants.cs index 40257773..c1a54e8a 100644 --- a/DICUI.Library/Data/Constants.cs +++ b/MPF.Library/Data/Constants.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace DICUI.Data +namespace MPF.Data { /// /// Constant values for UI diff --git a/DICUI.Library/Data/Enumerations.cs b/MPF.Library/Data/Enumerations.cs similarity index 99% rename from DICUI.Library/Data/Enumerations.cs rename to MPF.Library/Data/Enumerations.cs index 7403604c..8686f5ba 100644 --- a/DICUI.Library/Data/Enumerations.cs +++ b/MPF.Library/Data/Enumerations.cs @@ -1,6 +1,6 @@ using System; -namespace DICUI.Data +namespace MPF.Data { /// /// Drive type for dumping diff --git a/DICUI.Library/Data/Options.cs b/MPF.Library/Data/Options.cs similarity index 99% rename from DICUI.Library/Data/Options.cs rename to MPF.Library/Data/Options.cs index 1ca2d48f..72d60a5f 100644 --- a/DICUI.Library/Data/Options.cs +++ b/MPF.Library/Data/Options.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; -namespace DICUI.Data +namespace MPF.Data { public class Options : IDictionary { diff --git a/DICUI.Library/DiscImageCreator/Constants.cs b/MPF.Library/DiscImageCreator/Constants.cs similarity index 98% rename from DICUI.Library/DiscImageCreator/Constants.cs rename to MPF.Library/DiscImageCreator/Constants.cs index 3abd8f5f..d6e6a142 100644 --- a/DICUI.Library/DiscImageCreator/Constants.cs +++ b/MPF.Library/DiscImageCreator/Constants.cs @@ -1,4 +1,4 @@ -namespace DICUI.DiscImageCreator +namespace MPF.DiscImageCreator { /// /// Top-level commands for DiscImageCreator diff --git a/DICUI.Library/DiscImageCreator/Converters.cs b/MPF.Library/DiscImageCreator/Converters.cs similarity index 99% rename from DICUI.Library/DiscImageCreator/Converters.cs rename to MPF.Library/DiscImageCreator/Converters.cs index 37da83e7..ee80b0eb 100644 --- a/DICUI.Library/DiscImageCreator/Converters.cs +++ b/MPF.Library/DiscImageCreator/Converters.cs @@ -1,6 +1,6 @@ -using DICUI.Data; +using MPF.Data; -namespace DICUI.DiscImageCreator +namespace MPF.DiscImageCreator { public static class Converters { diff --git a/DICUI.Library/DiscImageCreator/Enumerations.cs b/MPF.Library/DiscImageCreator/Enumerations.cs similarity index 97% rename from DICUI.Library/DiscImageCreator/Enumerations.cs rename to MPF.Library/DiscImageCreator/Enumerations.cs index a170c62c..76968fe4 100644 --- a/DICUI.Library/DiscImageCreator/Enumerations.cs +++ b/MPF.Library/DiscImageCreator/Enumerations.cs @@ -1,4 +1,4 @@ -namespace DICUI.DiscImageCreator +namespace MPF.DiscImageCreator { /// /// Supported DiscImageCreator commands diff --git a/DICUI.Library/DiscImageCreator/Parameters.cs b/MPF.Library/DiscImageCreator/Parameters.cs similarity index 99% rename from DICUI.Library/DiscImageCreator/Parameters.cs rename to MPF.Library/DiscImageCreator/Parameters.cs index 5878a372..f6ce09ef 100644 --- a/DICUI.Library/DiscImageCreator/Parameters.cs +++ b/MPF.Library/DiscImageCreator/Parameters.cs @@ -4,12 +4,12 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using BurnOutSharp.External.psxt001z; -using DICUI.CueSheets; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.CueSheets; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.DiscImageCreator +namespace MPF.DiscImageCreator { /// /// Represents a generic set of DiscImageCreator parameters diff --git a/DICUI.Library/DICUI.Library.csproj b/MPF.Library/MPF.Library.csproj similarity index 93% rename from DICUI.Library/DICUI.Library.csproj rename to MPF.Library/MPF.Library.csproj index 4442bb1a..50bf2393 100644 --- a/DICUI.Library/DICUI.Library.csproj +++ b/MPF.Library/MPF.Library.csproj @@ -2,12 +2,12 @@ net472;net48;netcoreapp3.1 - DICUI Library - DICUI.Library - Library code for DICUI and DICUI.Check + MPF Library + MPF.Library + Library code for MPF and MPF.Check Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2020 - https://github.com/SabreTools/DICUI + https://github.com/SabreTools/MPF 1.18 1.18 1.18 diff --git a/DICUI.Library/UmdImageCreator/Parameters.cs b/MPF.Library/UmdImageCreator/Parameters.cs similarity index 99% rename from DICUI.Library/UmdImageCreator/Parameters.cs rename to MPF.Library/UmdImageCreator/Parameters.cs index e0f0c2f3..61d31f6f 100644 --- a/DICUI.Library/UmdImageCreator/Parameters.cs +++ b/MPF.Library/UmdImageCreator/Parameters.cs @@ -1,10 +1,10 @@ using System; using System.IO; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.UmdImageCreator +namespace MPF.UmdImageCreator { /// /// Represents a generic set of UmdImageCreator parameters diff --git a/DICUI.Library/Utilities/Converters.cs b/MPF.Library/Utilities/Converters.cs similarity index 99% rename from DICUI.Library/Utilities/Converters.cs rename to MPF.Library/Utilities/Converters.cs index 8c58dc49..a699d7cd 100644 --- a/DICUI.Library/Utilities/Converters.cs +++ b/MPF.Library/Utilities/Converters.cs @@ -1,14 +1,14 @@ using System; using System.IO; -using DICUI.Data; -using DICUI.Web; +using MPF.Data; +using MPF.Web; #if NET_FRAMEWORK using IMAPI2; #endif using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace DICUI.Utilities +namespace MPF.Utilities { public static class Converters { diff --git a/DICUI.Library/Utilities/Drive.cs b/MPF.Library/Utilities/Drive.cs similarity index 98% rename from DICUI.Library/Utilities/Drive.cs rename to MPF.Library/Utilities/Drive.cs index deded218..f4c6febf 100644 --- a/DICUI.Library/Utilities/Drive.cs +++ b/MPF.Library/Utilities/Drive.cs @@ -1,7 +1,7 @@ using System.IO; -using DICUI.Data; +using MPF.Data; -namespace DICUI.Utilities +namespace MPF.Utilities { /// /// Represents information for a single drive diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/MPF.Library/Utilities/DumpEnvironment.cs similarity index 99% rename from DICUI.Library/Utilities/DumpEnvironment.cs rename to MPF.Library/Utilities/DumpEnvironment.cs index 8305b69d..7a437d7a 100644 --- a/DICUI.Library/Utilities/DumpEnvironment.cs +++ b/MPF.Library/Utilities/DumpEnvironment.cs @@ -7,11 +7,11 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using BurnOutSharp; -using DICUI.Data; -using DICUI.Web; +using MPF.Data; +using MPF.Web; using Newtonsoft.Json; -namespace DICUI.Utilities +namespace MPF.Utilities { /// /// Represents the state of all settings to be used during dumping diff --git a/DICUI.Library/Utilities/Extensions.cs b/MPF.Library/Utilities/Extensions.cs similarity index 97% rename from DICUI.Library/Utilities/Extensions.cs rename to MPF.Library/Utilities/Extensions.cs index 266dc710..710e0953 100644 --- a/DICUI.Library/Utilities/Extensions.cs +++ b/MPF.Library/Utilities/Extensions.cs @@ -1,6 +1,6 @@ -using DICUI.Data; +using MPF.Data; -namespace DICUI.Utilities +namespace MPF.Utilities { public static class Extensions { diff --git a/DICUI.Library/Utilities/IniFile.cs b/MPF.Library/Utilities/IniFile.cs similarity index 99% rename from DICUI.Library/Utilities/IniFile.cs rename to MPF.Library/Utilities/IniFile.cs index 62bff5a4..f1c66175 100644 --- a/DICUI.Library/Utilities/IniFile.cs +++ b/MPF.Library/Utilities/IniFile.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace DICUI.Utilities +namespace MPF.Utilities { public class IniFile : IDictionary { diff --git a/DICUI.Library/Utilities/Result.cs b/MPF.Library/Utilities/Result.cs similarity index 98% rename from DICUI.Library/Utilities/Result.cs rename to MPF.Library/Utilities/Result.cs index a6d314ae..cc8328a6 100644 --- a/DICUI.Library/Utilities/Result.cs +++ b/MPF.Library/Utilities/Result.cs @@ -1,4 +1,4 @@ -namespace DICUI.Utilities +namespace MPF.Utilities { /// /// Generic success/failure result object, with optional message diff --git a/DICUI.Library/Utilities/Tools.cs b/MPF.Library/Utilities/Tools.cs similarity index 97% rename from DICUI.Library/Utilities/Tools.cs rename to MPF.Library/Utilities/Tools.cs index 52e67eca..084a6660 100644 --- a/DICUI.Library/Utilities/Tools.cs +++ b/MPF.Library/Utilities/Tools.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using DICUI.Web; +using MPF.Web; -namespace DICUI.Utilities +namespace MPF.Utilities { public static class Tools { @@ -73,7 +73,7 @@ namespace DICUI.Utilities #region Versioning /// - /// Check for a new DICUI version + /// Check for a new MPF version /// /// /// Bool representing if the values are different. diff --git a/DICUI.Library/Utilities/Validators.cs b/MPF.Library/Utilities/Validators.cs similarity index 99% rename from DICUI.Library/Utilities/Validators.cs rename to MPF.Library/Utilities/Validators.cs index ca7bb3b8..09f62752 100644 --- a/DICUI.Library/Utilities/Validators.cs +++ b/MPF.Library/Utilities/Validators.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Management; using System.Threading.Tasks; using BurnOutSharp; -using DICUI.Data; +using MPF.Data; #if NET_FRAMEWORK using IMAPI2; #endif -namespace DICUI.Utilities +namespace MPF.Utilities { public static class Validators { diff --git a/DICUI.Library/Web/Enumerations.cs b/MPF.Library/Web/Enumerations.cs similarity index 99% rename from DICUI.Library/Web/Enumerations.cs rename to MPF.Library/Web/Enumerations.cs index 15aa0900..216cd078 100644 --- a/DICUI.Library/Web/Enumerations.cs +++ b/MPF.Library/Web/Enumerations.cs @@ -1,4 +1,4 @@ -namespace DICUI.Web +namespace MPF.Web { /// /// List of all disc categories diff --git a/DICUI.Library/Web/Extensions.cs b/MPF.Library/Web/Extensions.cs similarity index 99% rename from DICUI.Library/Web/Extensions.cs rename to MPF.Library/Web/Extensions.cs index 3950935e..3611a916 100644 --- a/DICUI.Library/Web/Extensions.cs +++ b/MPF.Library/Web/Extensions.cs @@ -1,4 +1,4 @@ -namespace DICUI.Web +namespace MPF.Web { /// /// Information pertaining to Redump systems diff --git a/DICUI.Library/Web/RedumpWebClient.cs b/MPF.Library/Web/RedumpWebClient.cs similarity index 99% rename from DICUI.Library/Web/RedumpWebClient.cs rename to MPF.Library/Web/RedumpWebClient.cs index b943609c..e8b3ede6 100644 --- a/DICUI.Library/Web/RedumpWebClient.cs +++ b/MPF.Library/Web/RedumpWebClient.cs @@ -6,10 +6,10 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading; -using DICUI.Utilities; +using MPF.Utilities; using Newtonsoft.Json.Linq; -namespace DICUI.Web +namespace MPF.Web { // https://stackoverflow.com/questions/1777221/using-cookiecontainer-with-webclient-class public class RedumpWebClient : WebClient @@ -364,14 +364,14 @@ namespace DICUI.Web } /// - /// Get the latest version of DICUI from GitHub and the release URL + /// Get the latest version of MPF from GitHub and the release URL /// public (string tag, string url) GetRemoteVersionAndUrl() { Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:64.0) Gecko/20100101 Firefox/64.0"; // TODO: Figure out a better way than having this hardcoded... - string url = "https://api.github.com/repos/SabreTools/DICUI/releases/latest"; + string url = "https://api.github.com/repos/SabreTools/MPF/releases/latest"; string latestReleaseJsonString = DownloadString(url); var latestReleaseJson = JObject.Parse(latestReleaseJsonString); string latestTag = latestReleaseJson["tag_name"].ToString(); diff --git a/DICUI.Library/Web/SubmissionInfo.cs b/MPF.Library/Web/SubmissionInfo.cs similarity index 99% rename from DICUI.Library/Web/SubmissionInfo.cs rename to MPF.Library/Web/SubmissionInfo.cs index d64fbca7..9cb99c15 100644 --- a/DICUI.Library/Web/SubmissionInfo.cs +++ b/MPF.Library/Web/SubmissionInfo.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace DICUI.Web +namespace MPF.Web { public class SubmissionInfo { diff --git a/DICUI.Test/DICUI.Test.csproj b/MPF.Test/MPF.Test.csproj similarity index 88% rename from DICUI.Test/DICUI.Test.csproj rename to MPF.Test/MPF.Test.csproj index bd5e58c5..7053935d 100644 --- a/DICUI.Test/DICUI.Test.csproj +++ b/MPF.Test/MPF.Test.csproj @@ -6,13 +6,13 @@ - + {51ab0928-13f9-44bf-a407-b6957a43a056} - DICUI.Library + MPF.Library - + {7b1b75eb-8940-466f-bd51-76471a57f9be} - DICUI + MPF diff --git a/DICUI.Test/ResultTest.cs b/MPF.Test/ResultTest.cs similarity index 95% rename from DICUI.Test/ResultTest.cs rename to MPF.Test/ResultTest.cs index 3fa02e4a..db13ff51 100644 --- a/DICUI.Test/ResultTest.cs +++ b/MPF.Test/ResultTest.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; +using MPF.Utilities; using Xunit; -namespace DICUI.Test +namespace MPF.Test { public class ResultTest { diff --git a/DICUI.Test/UI/AllowedSpeedsTest.cs b/MPF.Test/UI/AllowedSpeedsTest.cs similarity index 92% rename from DICUI.Test/UI/AllowedSpeedsTest.cs rename to MPF.Test/UI/AllowedSpeedsTest.cs index fb7dbbad..154b6037 100644 --- a/DICUI.Test/UI/AllowedSpeedsTest.cs +++ b/MPF.Test/UI/AllowedSpeedsTest.cs @@ -1,8 +1,8 @@ using System.Linq; -using DICUI.Data; +using MPF.Data; using Xunit; -namespace DICUI.Test.Data +namespace MPF.Test.Data { public class UIElementsTest { diff --git a/DICUI.Test/Utilities/ConvertersTest.cs b/MPF.Test/Utilities/ConvertersTest.cs similarity index 98% rename from DICUI.Test/Utilities/ConvertersTest.cs rename to MPF.Test/Utilities/ConvertersTest.cs index 55d1c6eb..64bec001 100644 --- a/DICUI.Test/Utilities/ConvertersTest.cs +++ b/MPF.Test/Utilities/ConvertersTest.cs @@ -1,9 +1,9 @@ using System; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Xunit; -namespace DICUI.Test.Utilities +namespace MPF.Test.Utilities { public class ConvertersTest { diff --git a/DICUI.Test/Utilities/DumpEnvironmentTest.cs b/MPF.Test/Utilities/DumpEnvironmentTest.cs similarity index 98% rename from DICUI.Test/Utilities/DumpEnvironmentTest.cs rename to MPF.Test/Utilities/DumpEnvironmentTest.cs index ff11a705..6b913f1f 100644 --- a/DICUI.Test/Utilities/DumpEnvironmentTest.cs +++ b/MPF.Test/Utilities/DumpEnvironmentTest.cs @@ -1,9 +1,9 @@ using System.IO; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Xunit; -namespace DICUI.Test +namespace MPF.Test { public class DumpEnvironmentTest { diff --git a/DICUI.Test/Utilities/KnownSystemExtensionsTest.cs b/MPF.Test/Utilities/KnownSystemExtensionsTest.cs similarity index 93% rename from DICUI.Test/Utilities/KnownSystemExtensionsTest.cs rename to MPF.Test/Utilities/KnownSystemExtensionsTest.cs index 5e3f8643..a2049e5c 100644 --- a/DICUI.Test/Utilities/KnownSystemExtensionsTest.cs +++ b/MPF.Test/Utilities/KnownSystemExtensionsTest.cs @@ -1,9 +1,9 @@ using System; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Xunit; -namespace DICUI.Test.Utilities +namespace MPF.Test.Utilities { public class KnownSystemExtensionsTest { diff --git a/DICUI.Test/Utilities/MediaTypeExtensionsTest.cs b/MPF.Test/Utilities/MediaTypeExtensionsTest.cs similarity index 94% rename from DICUI.Test/Utilities/MediaTypeExtensionsTest.cs rename to MPF.Test/Utilities/MediaTypeExtensionsTest.cs index 8629b0bd..aee60e63 100644 --- a/DICUI.Test/Utilities/MediaTypeExtensionsTest.cs +++ b/MPF.Test/Utilities/MediaTypeExtensionsTest.cs @@ -1,8 +1,8 @@ -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Xunit; -namespace DICUI.Test.Utilities +namespace MPF.Test.Utilities { public class MediaTypeExtensionsTest { diff --git a/DICUI.Test/Utilities/ParametersTest.cs b/MPF.Test/Utilities/ParametersTest.cs similarity index 97% rename from DICUI.Test/Utilities/ParametersTest.cs rename to MPF.Test/Utilities/ParametersTest.cs index e091bcdc..4a602c8b 100644 --- a/DICUI.Test/Utilities/ParametersTest.cs +++ b/MPF.Test/Utilities/ParametersTest.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; -using DICUI.Data; -using DICUI.DiscImageCreator; -using DICUI.Utilities; +using MPF.Data; +using MPF.DiscImageCreator; +using MPF.Utilities; using Xunit; -namespace DICUI.Test.Utilities +namespace MPF.Test.Utilities { public class ParametersTest { diff --git a/DICUI.Test/Utilities/ValidatorsTest.cs b/MPF.Test/Utilities/ValidatorsTest.cs similarity index 95% rename from DICUI.Test/Utilities/ValidatorsTest.cs rename to MPF.Test/Utilities/ValidatorsTest.cs index 6a8c7568..9ba0426b 100644 --- a/DICUI.Test/Utilities/ValidatorsTest.cs +++ b/MPF.Test/Utilities/ValidatorsTest.cs @@ -1,9 +1,9 @@ using System; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; using Xunit; -namespace DICUI.Test.Utilities +namespace MPF.Test.Utilities { public class ValidatorsTest { diff --git a/DICUI.sln b/MPF.sln similarity index 78% rename from DICUI.sln rename to MPF.sln index 3fb7f628..9695cc50 100644 --- a/DICUI.sln +++ b/MPF.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI", "DICUI\DICUI.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF", "MPF\MPF.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Test", "DICUI.Test\DICUI.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Test", "MPF.Test\MPF.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Library", "DICUI.Library\DICUI.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Library", "MPF.Library\MPF.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Check", "MPF.Check\MPF.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}" ProjectSection(SolutionItems) = preProject @@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Avalonia", "DICUI.Avalonia\DICUI.Avalonia.csproj", "{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPF.Avalonia", "MPF.Avalonia\MPF.Avalonia.csproj", "{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DICUI/App.xaml b/MPF/App.xaml similarity index 77% rename from DICUI/App.xaml rename to MPF/App.xaml index b9f57038..2721ed26 100644 --- a/DICUI/App.xaml +++ b/MPF/App.xaml @@ -1,7 +1,7 @@ - diff --git a/DICUI/App.xaml.cs b/MPF/App.xaml.cs similarity index 90% rename from DICUI/App.xaml.cs rename to MPF/App.xaml.cs index 4f140534..b009e6e3 100644 --- a/DICUI/App.xaml.cs +++ b/MPF/App.xaml.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace DICUI +namespace MPF { /// /// Interaction logic for App.xaml diff --git a/DICUI/AssemblyInfo.cs b/MPF/AssemblyInfo.cs similarity index 70% rename from DICUI/AssemblyInfo.cs rename to MPF/AssemblyInfo.cs index ce6ad6dd..c6ca6aa9 100644 --- a/DICUI/AssemblyInfo.cs +++ b/MPF/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; // Anything marked as internal can be used by the test methods -[assembly: InternalsVisibleTo("DICUI.Test")] \ No newline at end of file +[assembly: InternalsVisibleTo("MPF.Test")] \ No newline at end of file diff --git a/DICUI/ComboBoxItems/CategoryComboBoxItem.cs b/MPF/ComboBoxItems/CategoryComboBoxItem.cs similarity index 91% rename from DICUI/ComboBoxItems/CategoryComboBoxItem.cs rename to MPF/ComboBoxItems/CategoryComboBoxItem.cs index 582f2bc3..492d2455 100644 --- a/DICUI/ComboBoxItems/CategoryComboBoxItem.cs +++ b/MPF/ComboBoxItems/CategoryComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI +namespace MPF { /// /// Represents a single item in the Category combo box diff --git a/DICUI/ComboBoxItems/InternalProgramComboBoxItem.cs b/MPF/ComboBoxItems/InternalProgramComboBoxItem.cs similarity index 92% rename from DICUI/ComboBoxItems/InternalProgramComboBoxItem.cs rename to MPF/ComboBoxItems/InternalProgramComboBoxItem.cs index 0b1f23b3..9998ce31 100644 --- a/DICUI/ComboBoxItems/InternalProgramComboBoxItem.cs +++ b/MPF/ComboBoxItems/InternalProgramComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI +namespace MPF { /// /// Represents a single item in the Internal Program combo box diff --git a/DICUI/ComboBoxItems/KnownSystemComboBoxItem.cs b/MPF/ComboBoxItems/KnownSystemComboBoxItem.cs similarity index 94% rename from DICUI/ComboBoxItems/KnownSystemComboBoxItem.cs rename to MPF/ComboBoxItems/KnownSystemComboBoxItem.cs index df5add00..e3307ee9 100644 --- a/DICUI/ComboBoxItems/KnownSystemComboBoxItem.cs +++ b/MPF/ComboBoxItems/KnownSystemComboBoxItem.cs @@ -1,8 +1,8 @@ using System.Windows.Media; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI +namespace MPF { /// /// Represents a single item in the System combo box diff --git a/DICUI/ComboBoxItems/LanguageComboBoxItem.cs b/MPF/ComboBoxItems/LanguageComboBoxItem.cs similarity index 91% rename from DICUI/ComboBoxItems/LanguageComboBoxItem.cs rename to MPF/ComboBoxItems/LanguageComboBoxItem.cs index 4f84012e..913e3916 100644 --- a/DICUI/ComboBoxItems/LanguageComboBoxItem.cs +++ b/MPF/ComboBoxItems/LanguageComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI +namespace MPF { /// /// Represents a single item in the Language combo box diff --git a/DICUI/ComboBoxItems/MediaTypeComboBoxItem.cs b/MPF/ComboBoxItems/MediaTypeComboBoxItem.cs similarity index 87% rename from DICUI/ComboBoxItems/MediaTypeComboBoxItem.cs rename to MPF/ComboBoxItems/MediaTypeComboBoxItem.cs index 6f8f57ef..b0a6cd73 100644 --- a/DICUI/ComboBoxItems/MediaTypeComboBoxItem.cs +++ b/MPF/ComboBoxItems/MediaTypeComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI +namespace MPF { /// /// Represents a single item in the MediaType combo box diff --git a/DICUI/ComboBoxItems/RegionComboBoxItem.cs b/MPF/ComboBoxItems/RegionComboBoxItem.cs similarity index 90% rename from DICUI/ComboBoxItems/RegionComboBoxItem.cs rename to MPF/ComboBoxItems/RegionComboBoxItem.cs index 76e3c380..9fa78ee0 100644 --- a/DICUI/ComboBoxItems/RegionComboBoxItem.cs +++ b/MPF/ComboBoxItems/RegionComboBoxItem.cs @@ -1,7 +1,7 @@ -using DICUI.Utilities; -using DICUI.Web; +using MPF.Utilities; +using MPF.Web; -namespace DICUI +namespace MPF { /// /// Represents a single item in the Region combo box diff --git a/DICUI/Constants.cs b/MPF/Constants.cs similarity index 98% rename from DICUI/Constants.cs rename to MPF/Constants.cs index 1123f2d6..afc5fce5 100644 --- a/DICUI/Constants.cs +++ b/MPF/Constants.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Media; -namespace DICUI +namespace MPF { /// /// Variables for UI elements diff --git a/DICUI/EnumDescriptionConverter.cs b/MPF/EnumDescriptionConverter.cs similarity index 93% rename from DICUI/EnumDescriptionConverter.cs rename to MPF/EnumDescriptionConverter.cs index 3c90ffc6..fd72783f 100644 --- a/DICUI/EnumDescriptionConverter.cs +++ b/MPF/EnumDescriptionConverter.cs @@ -1,10 +1,10 @@ using System; using System.Globalization; using System.Windows.Data; -using DICUI.Data; -using DICUI.Utilities; +using MPF.Data; +using MPF.Utilities; -namespace DICUI +namespace MPF { /// /// Used to provide a converter to XAML files to render comboboxes with enum values diff --git a/DICUI/Icon.ico b/MPF/Icon.ico similarity index 100% rename from DICUI/Icon.ico rename to MPF/Icon.ico diff --git a/DICUI/DICUI.csproj b/MPF/MPF.csproj similarity index 85% rename from DICUI/DICUI.csproj rename to MPF/MPF.csproj index d0400097..9cd81bd4 100644 --- a/DICUI/DICUI.csproj +++ b/MPF/MPF.csproj @@ -7,12 +7,12 @@ true Icon.ico true - DICUI - DICUI + MPF + MPF Frontend for various dumping programs Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2020 - https://github.com/SabreTools/DICUI + https://github.com/SabreTools/MPF 1.18 1.18 1.18 @@ -32,9 +32,9 @@ - + {51ab0928-13f9-44bf-a407-b6957a43a056} - DICUI.Library + MPF.Library diff --git a/DICUI/UIOptions.cs b/MPF/UIOptions.cs similarity index 99% rename from DICUI/UIOptions.cs rename to MPF/UIOptions.cs index 9f121d8b..ee0fa014 100644 --- a/DICUI/UIOptions.cs +++ b/MPF/UIOptions.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Configuration; -using DICUI.Data; +using MPF.Data; -namespace DICUI +namespace MPF { public class UIOptions { diff --git a/DICUI/ViewModels.cs b/MPF/ViewModels.cs similarity index 99% rename from DICUI/ViewModels.cs rename to MPF/ViewModels.cs index 7473aa7a..f5a52636 100644 --- a/DICUI/ViewModels.cs +++ b/MPF/ViewModels.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Media; -using DICUI.Windows; +using MPF.Windows; -namespace DICUI +namespace MPF { public class OptionsViewModel { diff --git a/DICUI/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml similarity index 99% rename from DICUI/Windows/DiscInformationWindow.xaml rename to MPF/Windows/DiscInformationWindow.xaml index 223299ee..410cad75 100644 --- a/DICUI/Windows/DiscInformationWindow.xaml +++ b/MPF/Windows/DiscInformationWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/DICUI/Windows/DiscInformationWindow.xaml.cs b/MPF/Windows/DiscInformationWindow.xaml.cs similarity index 99% rename from DICUI/Windows/DiscInformationWindow.xaml.cs rename to MPF/Windows/DiscInformationWindow.xaml.cs index d773e0ae..f83d9538 100644 --- a/DICUI/Windows/DiscInformationWindow.xaml.cs +++ b/MPF/Windows/DiscInformationWindow.xaml.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Windows; using System.Windows.Media; -using DICUI.Web; +using MPF.Web; -namespace DICUI.Windows +namespace MPF.Windows { /// /// Interaction logic for DiscInformationWindow.xaml diff --git a/DICUI/Windows/LogWindow.xaml b/MPF/Windows/LogWindow.xaml similarity index 97% rename from DICUI/Windows/LogWindow.xaml rename to MPF/Windows/LogWindow.xaml index 3ef1a2f5..d718e4a6 100644 --- a/DICUI/Windows/LogWindow.xaml +++ b/MPF/Windows/LogWindow.xaml @@ -1,7 +1,7 @@ - diff --git a/DICUI/Windows/LogWindow.xaml.cs b/MPF/Windows/LogWindow.xaml.cs similarity index 99% rename from DICUI/Windows/LogWindow.xaml.cs rename to MPF/Windows/LogWindow.xaml.cs index c437ced1..329ee3dc 100644 --- a/DICUI/Windows/LogWindow.xaml.cs +++ b/MPF/Windows/LogWindow.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Documents; using System.Windows.Interop; using System.Windows.Media; -namespace DICUI.Windows +namespace MPF.Windows { public partial class LogWindow : Window { diff --git a/DICUI/Windows/MainWindow.xaml b/MPF/Windows/MainWindow.xaml similarity index 97% rename from DICUI/Windows/MainWindow.xaml rename to MPF/Windows/MainWindow.xaml index 86152588..99d6ac2f 100644 --- a/DICUI/Windows/MainWindow.xaml +++ b/MPF/Windows/MainWindow.xaml @@ -1,11 +1,11 @@ - diff --git a/DICUI/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs similarity index 99% rename from DICUI/Windows/MainWindow.xaml.cs rename to MPF/Windows/MainWindow.xaml.cs index 75b74f79..6be8889e 100644 --- a/DICUI/Windows/MainWindow.xaml.cs +++ b/MPF/Windows/MainWindow.xaml.cs @@ -7,11 +7,11 @@ using System.Windows; using System.Windows.Controls; using WinForms = System.Windows.Forms; using BurnOutSharp; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; -namespace DICUI.Windows +namespace MPF.Windows { public partial class MainWindow : Window { diff --git a/DICUI/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml similarity index 99% rename from DICUI/Windows/OptionsWindow.xaml rename to MPF/Windows/OptionsWindow.xaml index 11b9d22c..790fab3f 100644 --- a/DICUI/Windows/OptionsWindow.xaml +++ b/MPF/Windows/OptionsWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/DICUI/Windows/OptionsWindow.xaml.cs b/MPF/Windows/OptionsWindow.xaml.cs similarity index 98% rename from DICUI/Windows/OptionsWindow.xaml.cs rename to MPF/Windows/OptionsWindow.xaml.cs index 1d9280e4..ae2c7ab6 100644 --- a/DICUI/Windows/OptionsWindow.xaml.cs +++ b/MPF/Windows/OptionsWindow.xaml.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Windows; using System.Windows.Forms; -using DICUI.Data; -using DICUI.Utilities; -using DICUI.Web; +using MPF.Data; +using MPF.Utilities; +using MPF.Web; using Button = System.Windows.Controls.Button; using TextBox = System.Windows.Controls.TextBox; -namespace DICUI.Windows +namespace MPF.Windows { /// /// Interaction logic for OptionsWindow.xaml diff --git a/README.md b/README.md index 5965633c..d820ef8a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# DICUI +# Media Preservation Frontend (MPF) DiscImageCreator/Aaru UI in C# -[![Build status](https://ci.appveyor.com/api/projects/status/3ldav3v0c373jeqa?svg=true)](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts) +[![Build status](https://ci.appveyor.com/api/projects/status/3ldav3v0c373jeqa?svg=true)](https://ci.appveyor.com/project/mnadareski/DICUI/build/artifacts) This is a community project, so if you have some time and knowledge to give, we'll be glad to add you as a contributor to this project. If you have any suggestions, issues, bugs, or crashes, please look at the [Issues](https://github.com/SabreTools/DICUI/issues) page first to see if it has been reported before and try out the latest AppVeyor WIP build below to see if it has already been addressed. If it hasn't, please open an issue that's as descriptive as you can be. Help me make this a better program for everyone :) @@ -11,13 +11,13 @@ This is a community project, so if you have some time and knowledge to give, we' For those who would rather use the most recent stable build, download the latest release here: [Releases Page](https://github.com/SabreTools/DICUI/releases) -For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts) +For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/DICUI/build/artifacts) ## System Requirements Even though this is written in C#, this program can only be used on Windows systems due to one of the base programs, DiscImageCreator, being Windows-only. There is some preliminary support for Linux underway, and we will try to integrate with that when the time comes. -- Windows 7 (newest version of Windows recommended) or Mono-compatible Linux environment (DICUI.Check only) +- Windows 7 (newest version of Windows recommended) or Mono-compatible Linux environment (MPF.Check only) - .NET Framework 4.7.2, .NET Framework 4.8, or .NET Core 3.1 Runtimes (.NET Core 3.1 is mostly functional due to a dependency issues but may be unstable in some situations) - 1 GB of free RAM - As much hard drive space as the amount of discs you will be dumping (20+ GB recommended) @@ -30,11 +30,11 @@ For all additional information, including information about the individual compo ## Changelist -A list of all changes in each stable release and current WIP builds can now be found [here](https://github.com/SabreTools/DICUI/blob/master/CHANGELIST.md). +A list of all changes in each stable release and current WIP builds can now be found [here](https://github.com/SabreTools/MPF/blob/master/CHANGELIST.md). ## External Libraries -DICUI uses some external libraries to assist with additional information gathering after the dumping process. +MPF uses some external libraries to assist with additional information gathering after the dumping process. - **BurnOutSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/BurnOutSharp) - **UnshieldSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/UnshieldSharp) @@ -50,7 +50,7 @@ Here are the talented people who have contributed to the project so far: ## Notable Testers -These are the tireless individuals who have dedicated countless hours to help test the many features of DICUI and have worked with the development team closely: +These are the tireless individuals who have dedicated countless hours to help test the many features of MPF and have worked with the development team closely: - **Dizzzy/user7** - Concept, ideas, tester - **Kludge** - Primary stress tester diff --git a/appveyor.yml b/appveyor.yml index c79041ed..f1eee8f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ before_build: # build step build: verbosity: minimal - project: DICUI.sln + project: MPF.sln # post-build step after_build: @@ -40,80 +40,80 @@ after_build: - ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/5253259/DiscImageCreator_20200921.zip - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net472\Programs\Aaru * -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net48\Programs\Aaru * -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Aaru * -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\Aaru * -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\Aaru * -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF\bin\Debug\net472\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF\bin\Debug\net48\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF\bin\Debug\netcoreapp3.1\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF.Avalonia\bin\Debug\net472\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF.Avalonia\bin\Debug\net48\Programs\Aaru * +- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oMPF.Avalonia\bin\Debug\netcoreapp3.1\Programs\Aaru * -- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net472\Programs\DD * -- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net48\Programs\DD * -- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\DD * -- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\DD * -- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\DD * -- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net472\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net48\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\netcoreapp3.1\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF.Avalonia\bin\Debug\net472\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF.Avalonia\bin\Debug\net48\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF.Avalonia\bin\Debug\netcoreapp3.1\Programs\DD * -- 7z e DiscImageCreator_20200921.zip -oDICUI\bin\Debug\net472\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20200921.zip -oDICUI\bin\Debug\net48\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20200921.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20200921.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20200921.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20200921.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF\bin\Debug\net472\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF\bin\Debug\net48\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF.Avalonia\bin\Debug\net472\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF.Avalonia\bin\Debug\net48\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20200921.zip -oMPF.Avalonia\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\* -- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net472 * -- mkdir DICUI\bin\Debug\net472\Programs\Subdump -- mv DICUI\bin\Debug\net472\subdump_fua_0x28.exe DICUI\bin\Debug\net472\Programs\Subdump\subdump.exe -- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net48 * -- mkdir DICUI\bin\Debug\net48\Programs\Subdump -- mv DICUI\bin\Debug\net48\subdump_fua_0x28.exe DICUI\bin\Debug\net48\Programs\Subdump\subdump.exe -- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.1 * -- mkdir DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump -- mv DICUI\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe -- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\net472 * -- mkdir DICUI.Avalonia\bin\Debug\net472\Programs\Subdump -- mv DICUI.Avalonia\bin\Debug\net472\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\net472\Programs\Subdump\subdump.exe -- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\net48 * -- mkdir DICUI.Avalonia\bin\Debug\net48\Programs\Subdump -- mv DICUI.Avalonia\bin\Debug\net48\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\net48\Programs\Subdump\subdump.exe -- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1 * -- mkdir DICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump -- mv DICUI.Avalonia\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net472 * +- mkdir MPF\bin\Debug\net472\Programs\Subdump +- mv MPF\bin\Debug\net472\subdump_fua_0x28.exe MPF\bin\Debug\net472\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48 * +- mkdir MPF\bin\Debug\net48\Programs\Subdump +- mv MPF\bin\Debug\net48\subdump_fua_0x28.exe MPF\bin\Debug\net48\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\netcoreapp3.1 * +- mkdir MPF\bin\Debug\netcoreapp3.1\Programs\Subdump +- mv MPF\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe MPF\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF.Avalonia\bin\Debug\net472 * +- mkdir MPF.Avalonia\bin\Debug\net472\Programs\Subdump +- mv MPF.Avalonia\bin\Debug\net472\subdump_fua_0x28.exe MPF.Avalonia\bin\Debug\net472\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF.Avalonia\bin\Debug\net48 * +- mkdir MPF.Avalonia\bin\Debug\net48\Programs\Subdump +- mv MPF.Avalonia\bin\Debug\net48\subdump_fua_0x28.exe MPF.Avalonia\bin\Debug\net48\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF.Avalonia\bin\Debug\netcoreapp3.1 * +- mkdir MPF.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump +- mv MPF.Avalonia\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe MPF.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe -- cd DICUI\bin\Debug -- 7z a DICUI_net472.zip net472\* -- 7z a DICUI_net48.zip net48\* -- 7z a DICUI_netcoreapp3.1.zip netcoreapp3.1\* +- cd MPF\bin\Debug +- 7z a MPF_net472.zip net472\* +- 7z a MPF_net48.zip net48\* +- 7z a MPF_netcoreapp3.1.zip netcoreapp3.1\* -- cd ..\..\..\DICUI.Avalonia\bin\Debug -- 7z a DICUI-Avalonia_net472.zip net472\* -- 7z a DICUI-Avalonia_net48.zip net48\* -- 7z a DICUI-Avalonia_netcoreapp3.1.zip netcoreapp3.1\* +- cd ..\..\..\MPF.Avalonia\bin\Debug +- 7z a MPF-Avalonia_net472.zip net472\* +- 7z a MPF-Avalonia_net48.zip net48\* +- 7z a MPF-Avalonia_netcoreapp3.1.zip netcoreapp3.1\* -- cd ..\..\..\DICUI.Check\bin\Debug -- 7z a DICUI-Check_net472.zip net472\* -- 7z a DICUI-Check_net48.zip net48\* -- 7z a DICUI-Check_netcoreapp3.1.zip netcoreapp3.1\* +- cd ..\..\..\MPF.Check\bin\Debug +- 7z a MPF-Check_net472.zip net472\* +- 7z a MPF-Check_net48.zip net48\* +- 7z a MPF-Check_netcoreapp3.1.zip netcoreapp3.1\* # artifact linking artifacts: -- path: DICUI\bin\Debug\DICUI_net472.zip - name: DICUI (WPF UI) (.NET Framework 4.7.2) -- path: DICUI\bin\Debug\DICUI_net48.zip - name: DICUI (WPF UI) (.NET Framework 4.8) -- path: DICUI\bin\Debug\DICUI_netcoreapp3.1.zip - name: DICUI (WPF UI) (.NET Core 3.1) +- path: MPF\bin\Debug\MPF_net472.zip + name: MPF (WPF UI) (.NET Framework 4.7.2) +- path: MPF\bin\Debug\MPF_net48.zip + name: MPF (WPF UI) (.NET Framework 4.8) +- path: MPF\bin\Debug\MPF_netcoreapp3.1.zip + name: MPF (WPF UI) (.NET Core 3.1) -- path: DICUI.Avalonia\bin\Debug\DICUI-Avalonia_net472.zip - name: DICUI (Avalonia UI) (.NET Framework 4.7.2) -- path: DICUI.Avalonia\bin\Debug\DICUI-Avalonia_net48.zip - name: DICUI (Avalonia UI) (.NET Framework 4.8) -- path: DICUI.Avalonia\bin\Debug\DICUI-Avalonia_netcoreapp3.1.zip - name: DICUI (Avalonia UI) (.NET Core 3.1) +- path: MPF.Avalonia\bin\Debug\MPF-Avalonia_net472.zip + name: MPF (Avalonia UI) (.NET Framework 4.7.2) +- path: MPF.Avalonia\bin\Debug\MPF-Avalonia_net48.zip + name: MPF (Avalonia UI) (.NET Framework 4.8) +- path: MPF.Avalonia\bin\Debug\MPF-Avalonia_netcoreapp3.1.zip + name: MPF (Avalonia UI) (.NET Core 3.1) -- path: DICUI.Check\bin\Debug\DICUI-Check_net472.zip - name: DICUI Check (.NET Framework 4.7.2) -- path: DICUI.Check\bin\Debug\DICUI-Check_net48.zip - name: DICUI Check (.NET Framework 4.8) -- path: DICUI.Check\bin\Debug\DICUI-Check_netcoreapp3.1.zip - name: DICUI Check (.NET Core 3.1) \ No newline at end of file +- path: MPF.Check\bin\Debug\MPF-Check_net472.zip + name: MPF Check (.NET Framework 4.7.2) +- path: MPF.Check\bin\Debug\MPF-Check_net48.zip + name: MPF Check (.NET Framework 4.8) +- path: MPF.Check\bin\Debug\MPF-Check_netcoreapp3.1.zip + name: MPF Check (.NET Core 3.1) \ No newline at end of file