Added all frames, Fixed models, added settings

This commit is contained in:
NicoAICP 2020-03-01 16:52:59 +01:00
parent 2b2b5c341a
commit 50746ee108
22 changed files with 485 additions and 36 deletions

View file

@ -1,6 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="UWUVCI_AIO_WPF.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<userSettings>
<UWUVCI_AIO_WPF.Properties.Settings>
<setting name="PathsSet" serializeAs="String">
<value>False</value>
</setting>
<setting name="BasePath" serializeAs="String">
<value />
</setting>
<setting name="OutPath" serializeAs="String">
<value />
</setting>
</UWUVCI_AIO_WPF.Properties.Settings>
</userSettings>
</configuration>

View file

@ -11,7 +11,7 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Indigo.xaml" />
</ResourceDictionary.MergedDictionaries>
<local:MainViewModel x:Key="mvm"/>
</ResourceDictionary>
</Application.Resources>
</Application>

View file

@ -21,11 +21,27 @@ namespace UWUVCI_AIO_WPF
}
}
public bool PathsSet { get; set; } = false;
public bool pathsSet { get; set; } = false;
public bool PathsSet
{
get { return pathsSet; }
set
{
pathsSet = value;
OnPropertyChanged();
}
}
public MainViewModel()
{
GameConfiguration = new GameConfig();
UpdatePathSet(Properties.Settings.Default.PathsSet);
}
public void UpdatePathSet(bool newValue)
{
PathsSet = newValue;
}
}
}

View file

@ -1,30 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace UWUVCI_AIO_WPF.Properties
{
namespace UWUVCI_AIO_WPF.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool PathsSet {
get {
return ((bool)(this["PathsSet"]));
}
set {
this["PathsSet"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string BasePath {
get {
return ((string)(this["BasePath"]));
}
set {
this["BasePath"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string OutPath {
get {
return ((string)(this["OutPath"]));
}
set {
this["OutPath"] = value;
}
}
}
}

View file

@ -1,7 +1,15 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="UWUVCI_AIO_WPF.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="PathsSet" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="BasePath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="OutPath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.GBAFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="GBAFrame">
<Grid>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für GBAFrame.xaml
/// </summary>
public partial class GBAFrame : Page, IDisposable
{
public GBAFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.MainFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="MainFrame">
<Grid>
<TextBlock HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="StartPage" VerticalAlignment="Top" Height="18" Width="75"/>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für MainFrame.xaml
/// </summary>
public partial class MainFrame : Page, IDisposable
{
public MainFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.N64Frame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="N64Frame">
<Grid>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für N64Frame.xaml
/// </summary>
public partial class N64Frame : Page, IDisposable
{
public N64Frame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,17 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.NDSFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="NDSFrame">
<Grid>
<GroupBox Header="1. BaseRom" HorizontalAlignment="Left" Height="349" Margin="10,10,0,0" VerticalAlignment="Top" Width="421"/>
<GroupBox Header="3. Packing" HorizontalAlignment="Left" Height="95" Margin="10,375,0,0" VerticalAlignment="Top" Width="421"/>
<GroupBox Header="2. Configuration" HorizontalAlignment="Left" Height="460" Margin="448,10,0,0" VerticalAlignment="Top" Width="661"/>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für NDSFrame.xaml
/// </summary>
public partial class NDSFrame : Page, IDisposable
{
public NDSFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.NESFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="NESFrame">
<Grid>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für NESFrame.xaml
/// </summary>
public partial class NESFrame : Page, IDisposable
{
public NESFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.SNESFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="SNESFrame">
<Grid>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für SNESFrame.xaml
/// </summary>
public partial class SNESFrame : Page, IDisposable
{
public SNESFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -0,0 +1,14 @@
<Page x:Class="UWUVCI_AIO_WPF.UI.Frames.SettingsFrame"
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"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:UWUVCI_AIO_WPF.UI.Frames"
mc:Ignorable="d"
d:DesignHeight="480" d:DesignWidth="1130"
Title="SettingsFrame">
<Grid>
</Grid>
</Page>

View file

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace UWUVCI_AIO_WPF.UI.Frames
{
/// <summary>
/// Interaktionslogik für SettingsFrame.xaml
/// </summary>
public partial class SettingsFrame : Page, IDisposable
{
public SettingsFrame()
{
InitializeComponent();
}
public void Dispose()
{
}
}
}

View file

@ -35,7 +35,7 @@
</EventTrigger>
</Window.Triggers>
<Grid>
<Grid DataContext="{StaticResource mvm}">
<Grid Margin="60,70,0,0">
<Frame x:Name="load_frame" NavigationUIVisibility="Hidden"/>
</Grid>
@ -50,6 +50,7 @@
</Grid.Background>
<TextBlock Name="tbTitleBar" HorizontalAlignment="Left" Margin="484,19,0,0" TextWrapping="Wrap" Text="UWUVCI AIO - Start" VerticalAlignment="Top" FontSize="25"/>
</Grid>
<Grid x:Name="GridMenu" Width="60" HorizontalAlignment="Left">
<Grid.Background>
@ -70,42 +71,42 @@
</Grid>
<ListView Foreground="White" ScrollViewer.HorizontalScrollBarVisibility="Disabled" PreviewMouseLeftButtonUp="ListView_Click">
<!--NDS-->
<ListViewItem Height="60" x:Name="NDS">
<ListViewItem Height="60" x:Name="NDS" IsEnabled="{Binding PathsSet}" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<Image Source="/UWUVCI AIO WPF;component/UI/Images/Colored/nds64v64.png"></Image>
<TextBlock Text="NDS VC Inject" VerticalAlignment="Center" Margin="20 10"/>
</StackPanel>
</ListViewItem>
<!--NDS-->
<ListViewItem Height="60" x:Name="GBA">
<!--GBA-->
<ListViewItem Height="60" x:Name="GBA" IsEnabled="{Binding PathsSet}" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<Image Source="/UWUVCI AIO WPF;component/UI/Images/Colored/gba64.png"></Image>
<TextBlock Text="GBA VC Inject" VerticalAlignment="Center" Margin="20 10"/>
</StackPanel>
</ListViewItem>
<!--N64-->
<ListViewItem Height="60" x:Name="N64">
<ListViewItem Height="60" x:Name="N64" IsEnabled="{Binding PathsSet}" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<Image Source="/UWUVCI AIO WPF;component/UI/Images/Colored/n64new.png"></Image>
<TextBlock Text="N64 VC Inject" VerticalAlignment="Center" Margin="20 10"/>
</StackPanel>
</ListViewItem>
<!--NES-->
<ListViewItem Height="60" x:Name="NES">
<ListViewItem Height="60" x:Name="NES" IsEnabled="{Binding PathsSet}" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<Image Source="/UWUVCI AIO WPF;component/UI/Images/Colored/nes64.png"></Image>
<TextBlock Text="NES VC Inject" VerticalAlignment="Center" Margin="20 10"/>
</StackPanel>
</ListViewItem>
<!--SNES-->
<ListViewItem Height="60" x:Name="SNES">
<ListViewItem Height="60" x:Name="SNES" IsEnabled="{Binding PathsSet}" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<Image Source="/UWUVCI AIO WPF;component/UI/Images/Colored/snes64.png"></Image>
<TextBlock Text="SNES VC Inject" VerticalAlignment="Center" Margin="20 10"/>
</StackPanel>
</ListViewItem>
<!--Settings-->
<ListViewItem Height="60" x:Name="Settings">
<ListViewItem Height="60" x:Name="Settings" Cursor="Hand">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Foreground="White" Kind="SettingsApplications" Height="45" Width="45"/>
<TextBlock Text="Settings" VerticalAlignment="Center" Margin="20 10"/>

View file

@ -23,6 +23,7 @@ namespace UWUVCI_AIO_WPF
public MainWindow()
{
InitializeComponent();
load_frame.Content = new UI.Frames.MainFrame();
}
private void ButtonCloseMenu_Click(object sender, RoutedEventArgs e)
{

View file

@ -65,6 +65,34 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="UI\Frames\GBAFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\MainFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\N64Frame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\NDSFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\NESFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\SettingsFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Frames\SNESFrame.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Windows\MenuWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -79,6 +107,29 @@
<Compile Include="Classes\N64Conf.cs" />
<Compile Include="Classes\PNGTGA.cs" />
<Compile Include="Classes\GameConfig.cs" />
<Compile Include="Models\BaseModel.cs" />
<Compile Include="Models\MainViewModel.cs" />
<Compile Include="UI\Frames\GBAFrame.xaml.cs">
<DependentUpon>GBAFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\MainFrame.xaml.cs">
<DependentUpon>MainFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\N64Frame.xaml.cs">
<DependentUpon>N64Frame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\NDSFrame.xaml.cs">
<DependentUpon>NDSFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\NESFrame.xaml.cs">
<DependentUpon>NESFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\SettingsFrame.xaml.cs">
<DependentUpon>SettingsFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Frames\SNESFrame.xaml.cs">
<DependentUpon>SNESFrame.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Windows\MenuWindow.xaml.cs">
<DependentUpon>MenuWindow.xaml</DependentUpon>
<SubType>Code</SubType>
@ -111,10 +162,7 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
<Folder Include="UI\Frames\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Resource Include="UI\Images\bg maybe wpf.png" />
</ItemGroup>