SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Merge UI.Core into main application

Browse Source
This commit is contained in:
Matt Nadareski
2024-05-23 21:35:02 -04:00
parent 4816c5ab6a
commit aff981171a
33 changed files with 55 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -108,6 +108,7 @@
- Move Aaru CICM code to Core
- Clean up Core dependencies
- Move Aaru CICM code to Processors
- Merge UI.Core into main application
### 3.1.9a (2024-05-21)

61
MPF.UI.Core/MPF.UI.Core.csproj
View File

@@ -1,61 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<!-- Assembly Properties -->
<TargetFrameworks>net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<ImportFrameworkWinFXTargets Condition="$(TargetFramework.StartsWith(`net3`))">true</ImportFrameworkWinFXTargets>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<VersionPrefix>3.1.9</VersionPrefix>
<!-- Package Properties -->
<Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
<Description>Common code for all MPF UI implementations</Description>
<Copyright>Copyright (c) Matt Nadareski 2019-2024</Copyright>
<PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
<RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<ItemGroup>
<Resource Include="Images\ring-code-guide-1-layer.png" />
<Resource Include="Images\ring-code-guide-2-layer.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
</ItemGroup>
<!-- Support for old .NET versions -->
<ItemGroup Condition="$(TargetFramework.StartsWith(`net3`))">
<Reference Include="PresentationBuildTasks" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationBuildTasks.dll" />
<Reference Include="PresentationCore" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationCore.dll" />
<Reference Include="PresentationFramework" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationFramework.dll" />
<Reference Include="WindowsBase" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\WindowsBase.dll" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.RedumpLib" Version="1.3.8" />
</ItemGroup>
<ItemGroup>
<Page Update="UserControls\UserInput.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<Page Update="Windows\DiscInformationWindow.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<Page Update="Windows\RingCodeGuideWindow.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
</ItemGroup>
</Project>

6
MPF.sln
View File

@@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Core", "MPF.Core\MPF.Core.csproj", "{70B1265D-FE49-472A-A83D-0B462152D37A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.UI.Core", "MPF.UI.Core\MPF.UI.Core.csproj", "{EA3768DB-694A-4653-82E4-9FF71B8963F3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{ADC5FDD7-F43F-4F9C-B222-19AA1D64D3D4}"
ProjectSection(SolutionItems) = preProject
.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
@@ -64,10 +62,6 @@ Global
{70B1265D-FE49-472A-A83D-0B462152D37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.Build.0 = Release|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.Build.0 = Release|Any CPU
{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Release|Any CPU.ActiveCfg = Release|Any CPU

2
MPF/App.xaml
View File

@@ -1,7 +1,7 @@
<Application
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:windows="clr-namespace:MPF.UI.Core.Windows;assembly=MPF.UI.Core"
xmlns:windows="clr-namespace:MPF.UI.Windows"
x:Class="MPF.App">
<Application.MainWindow>
<windows:MainWindow Visibility="Visible"/>

2
MPF.UI.Core/Constants.cs → MPF/Constants.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Windows.Media;
using static MPF.Frontend.InterfaceConstants;
namespace MPF.UI.Core
namespace MPF.UI
{
/// <summary>
/// Variables for UI elements

2
MPF.UI.Core/ElementConverter.cs → MPF/ElementConverter.cs
View File

@@ -5,7 +5,7 @@ using MPF.Core;
using MPF.Frontend.ComboBoxItems;
using SabreTools.RedumpLib.Data;
namespace MPF.UI.Core
namespace MPF.UI
{
internal class ElementConverter: IValueConverter
{

0
MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBox.cs → MPF/External/WPFCustomMessageBox/CustomMessageBox.cs vendored
View File

0
MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml → MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml vendored
View File

2
MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs → MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs vendored
View File

@@ -3,7 +3,7 @@ using System.Drawing;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using MPF.UI.Core;
using MPF.UI;
#pragma warning disable IDE1006 // Naming Styles

0
MPF.UI.Core/External/WPFCustomMessageBox/LICENSE → MPF/External/WPFCustomMessageBox/LICENSE vendored
View File

0
MPF.UI.Core/External/WPFCustomMessageBox/Util.cs → MPF/External/WPFCustomMessageBox/Util.cs vendored
View File

0
MPF.UI.Core/Images/ring-code-guide-1-layer.png → MPF/Images/ring-code-guide-1-layer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 423 KiB

After

Width:  |  Height:  |  Size: 423 KiB

0
MPF.UI.Core/Images/ring-code-guide-2-layer.png → MPF/Images/ring-code-guide-2-layer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

2
MPF.UI.Core/ItemHelper.cs → MPF/ItemHelper.cs
View File

@@ -2,7 +2,7 @@
using System.Windows.Media;
using System.Windows;
namespace MPF.UI.Core
namespace MPF.UI
{
internal static class ItemHelper
{

16
MPF/MPF.csproj
View File

@@ -51,11 +51,13 @@
<ItemGroup>
<Resource Include="Images\Icon.ico" />
<Resource Include="Images\ring-code-guide-1-layer.png" />
<Resource Include="Images\ring-code-guide-2-layer.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
<ProjectReference Include="..\MPF.UI.Core\MPF.UI.Core.csproj" />
<ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
</ItemGroup>
<!-- Support for old .NET versions -->
@@ -80,6 +82,18 @@
<Content Include="$(PkgBinaryObjectScanner)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
</ItemGroup>
<ItemGroup>
<Page Update="UserControls\UserInput.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<Page Update="Windows\DiscInformationWindow.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
<Page Update="Windows\RingCodeGuideWindow.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
</ItemGroup>
<!-- Special handling for Aero2 on non-Framework .NET -->
<Target Name="SelectWpfThemeAssembly" AfterTargets="ResolveAssemblyReferences" Condition="'$(ReferenceWpfAeroTheme)' == 'true' OR '$(ReferenceWpfAero2Theme)' == 'true' OR '$(ReferenceWpfAeroLiteTheme)' == 'true' OR '$(ReferenceWpfClassicTheme)' == 'true' OR '$(ReferenceWpfLunaTheme)' == 'true' OR '$(ReferenceWpfRoyaleTheme)' == 'true'">
<ItemGroup>

2
MPF.UI.Core/Theme.cs → MPF/Theme.cs
View File

@@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Media;
namespace MPF.UI.Core
namespace MPF.UI
{
/// <summary>
/// Represents all required mapping values for the UI

2
MPF.UI.Core/UserControls/LogOutput.xaml → MPF/UserControls/LogOutput.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="MPF.UI.Core.UserControls.LogOutput"
<UserControl x:Class="MPF.UI.UserControls.LogOutput"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
MPF.UI.Core/UserControls/LogOutput.xaml.cs → MPF/UserControls/LogOutput.xaml.cs
View File

@@ -9,7 +9,7 @@ using MPF.Core;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.UserControls
namespace MPF.UI.UserControls
{
public partial class LogOutput : UserControl
{

2
MPF.UI.Core/UserControls/UserInput.xaml → MPF/UserControls/UserInput.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="MPF.UI.Core.UserControls.UserInput"
<UserControl x:Class="MPF.UI.UserControls.UserInput"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
MPF.UI.Core/UserControls/UserInput.xaml.cs → MPF/UserControls/UserInput.xaml.cs
View File

@@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Controls;
namespace MPF.UI.Core.UserControls
namespace MPF.UI.UserControls
{
/// <summary>
/// Interaction logic for UserInput.xaml

6
MPF.UI.Core/Windows/CheckDumpWindow.xaml → MPF/Windows/CheckDumpWindow.xaml
View File

@@ -1,10 +1,10 @@
<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.CheckDumpWindow"
<coreWindows:WindowBase x:Class="MPF.UI.Windows.CheckDumpWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:core="clr-namespace:MPF.UI.Core"
xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
xmlns:core="clr-namespace:MPF.UI"
xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
mc:Ignorable="d"
Title="Check Existing Dump" Width="600" WindowStyle="None"

2
MPF.UI.Core/Windows/CheckDumpWindow.xaml.cs → MPF/Windows/CheckDumpWindow.xaml.cs
View File

@@ -9,7 +9,7 @@ using WinForms = System.Windows.Forms;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
/// <summary>
/// Interaction logic for CheckDumpWindow.xaml

6
MPF.UI.Core/Windows/CreateIRDWindow.xaml → MPF/Windows/CreateIRDWindow.xaml
View File

@@ -1,10 +1,10 @@
<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.CreateIRDWindow"
<coreWindows:WindowBase x:Class="MPF.UI.Windows.CreateIRDWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:core="clr-namespace:MPF.UI.Core"
xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
xmlns:core="clr-namespace:MPF.UI"
xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
mc:Ignorable="d"
Title="Create PS3 IRD" Width="600" WindowStyle="None"

2
MPF.UI.Core/Windows/CreateIRDWindow.xaml.cs → MPF/Windows/CreateIRDWindow.xaml.cs
View File

@@ -8,7 +8,7 @@ using WinForms = System.Windows.Forms;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
/// <summary>
/// Interaction logic for CreateIRDWindow.xaml

8
MPF.UI.Core/Windows/DiscInformationWindow.xaml → MPF/Windows/DiscInformationWindow.xaml
View File

@@ -1,12 +1,12 @@
<windows:WindowBase x:Class="MPF.UI.Core.Windows.DiscInformationWindow"
<windows:WindowBase x:Class="MPF.UI.Windows.DiscInformationWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:controls="clr-namespace:MPF.UI.Core.UserControls"
xmlns:core="clr-namespace:MPF.UI.Core"
xmlns:controls="clr-namespace:MPF.UI.UserControls"
xmlns:core="clr-namespace:MPF.UI"
xmlns:redump="clr-namespace:SabreTools.RedumpLib.Data;assembly=SabreTools.RedumpLib"
xmlns:windows="clr-namespace:MPF.UI.Core.Windows"
xmlns:windows="clr-namespace:MPF.UI.Windows"
mc:Ignorable="d"
Title="Disc Information" Width="515" WindowStyle="None"
WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"

4
MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs → MPF/Windows/DiscInformationWindow.xaml.cs
View File

@@ -4,12 +4,12 @@ using System.Windows.Controls;
using MPF.Core;
using MPF.Frontend.ViewModels;
using MPF.Core.Utilities;
using MPF.UI.Core.UserControls;
using MPF.UI.UserControls;
using SabreTools.RedumpLib.Data;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
/// <summary>
/// Interaction logic for DiscInformationWindow.xaml

8
MPF.UI.Core/Windows/MainWindow.xaml → MPF/Windows/MainWindow.xaml
View File

@@ -1,11 +1,11 @@
<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.MainWindow"
<coreWindows:WindowBase x:Class="MPF.UI.Windows.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:controls="clr-namespace:MPF.UI.Core.UserControls"
xmlns:core="clr-namespace:MPF.UI.Core"
xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
xmlns:controls="clr-namespace:MPF.UI.UserControls"
xmlns:core="clr-namespace:MPF.UI"
xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
mc:Ignorable="d"
Title="Media Preservation Frontend" Width="600" WindowStyle="None"

4
MPF.UI.Core/Windows/MainWindow.xaml.cs → MPF/Windows/MainWindow.xaml.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
using System.Windows;
using System.Windows.Controls;
using MPF.Frontend.ViewModels;
using MPF.UI.Core.UserControls;
using MPF.UI.UserControls;
using SabreTools.RedumpLib;
using SabreTools.RedumpLib.Data;
using WPFCustomMessageBox;
@@ -11,7 +11,7 @@ using WinForms = System.Windows.Forms;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
public partial class MainWindow : WindowBase
{

6
MPF.UI.Core/Windows/OptionsWindow.xaml → MPF/Windows/OptionsWindow.xaml
View File

@@ -1,10 +1,10 @@
<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.OptionsWindow"
<coreWindows:WindowBase x:Class="MPF.UI.Windows.OptionsWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:core="clr-namespace:MPF.UI.Core"
xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
xmlns:core="clr-namespace:MPF.UI"
xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
mc:Ignorable="d"
Width="515.132" WindowStyle="None"

2
MPF.UI.Core/Windows/OptionsWindow.xaml.cs → MPF/Windows/OptionsWindow.xaml.cs
View File

@@ -10,7 +10,7 @@ using WPFCustomMessageBox;
#pragma warning disable IDE1006 // Naming Styles
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
/// <summary>
/// Interaction logic for OptionsWindow.xaml

6
MPF.UI.Core/Windows/RingCodeGuideWindow.xaml → MPF/Windows/RingCodeGuideWindow.xaml
View File

@@ -1,10 +1,10 @@
<windows:WindowBase x:Class="MPF.UI.Core.Windows.RingCodeGuideWindow"
<windows:WindowBase x:Class="MPF.UI.Windows.RingCodeGuideWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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:controls="clr-namespace:MPF.UI.Core.UserControls"
xmlns:windows="clr-namespace:MPF.UI.Core.Windows"
xmlns:controls="clr-namespace:MPF.UI.UserControls"
xmlns:windows="clr-namespace:MPF.UI.Windows"
mc:Ignorable="d"
Title="Ring Code Guide" Width="500" WindowStyle="None"
WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"

2
MPF.UI.Core/Windows/RingCodeGuideWindow.xaml.cs → MPF/Windows/RingCodeGuideWindow.xaml.cs
View File

@@ -1,4 +1,4 @@
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
/// <summary>
/// Interaction logic for RingCodeGuideWindow.xaml

2
MPF.UI.Core/Windows/WindowBase.cs → MPF/Windows/WindowBase.cs
View File

@@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Input;
namespace MPF.UI.Core.Windows
namespace MPF.UI.Windows
{
public class WindowBase : Window
{