added wii styles

This commit is contained in:
NicoAICP 2020-06-10 23:22:10 +02:00
parent 9f2f83ff48
commit abc4560dca
10 changed files with 120 additions and 25 deletions

View file

@ -240,6 +240,16 @@ namespace UWUVCI_AIO_WPF.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Wii2 {
get {
object obj = ResourceManager.GetObject("Wii2", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@ -249,5 +259,15 @@ namespace UWUVCI_AIO_WPF.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap WIIWARE {
get {
object obj = ResourceManager.GetObject("WIIWARE", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View file

@ -172,7 +172,13 @@
<data name="WII" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WII.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Wii2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Wii2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WiiIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WiiIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WIIWARE" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WIIWARE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,013 B

View file

@ -6,8 +6,8 @@
xmlns:local="clr-namespace:UWUVCI_AIO_WPF"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
Title="ImageCreator" Height="200" Width="435" Foreground="White" Background="LightGray" ResizeMode="NoResize" materialDesign:ShadowAssist.CacheMode="{x:Null}" Icon="/UWUVCI AIO WPF;component/b.ico" Name="wind" SizeToContent="WidthAndHeight" BorderBrush="#FF2196F3" BorderThickness="1.5,1.5,1.5,1.5" ShowInTaskbar="False" WindowStyle="None" Loaded="wind_Loaded" WindowStartupLocation="CenterOwner" MaxHeight="200">
<Grid>
Title="ImageCreator" Height="240" Width="622.019" Foreground="White" Background="LightGray" ResizeMode="NoResize" materialDesign:ShadowAssist.CacheMode="{x:Null}" Icon="/UWUVCI AIO WPF;component/b.ico" Name="wind" SizeToContent="WidthAndHeight" BorderBrush="#FF2196F3" BorderThickness="1.5,1.5,1.5,1.5" ShowInTaskbar="False" WindowStyle="None" Loaded="wind_Loaded" WindowStartupLocation="CenterOwner" MaxHeight="240">
<Grid Margin="0,0,-4,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="275"/>
@ -24,12 +24,12 @@
<Button Content="Select File" Grid.Column="1" HorizontalAlignment="Left" Margin="160,19,0,0" VerticalAlignment="Top" Width="99" Name="FileSelect" Click="FileSelect_Click" TabIndex="1" />
<Label Content="Overlay:" Grid.Column="1" HorizontalAlignment="Left" Margin="15,83,0,0" VerticalAlignment="Top"/>
<RadioButton Content="Enabled" Grid.Column="1" HorizontalAlignment="Left" Margin="100,87,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Name="enOv" Click="enOv_Click" IsChecked="True" TabIndex="2"/>
<RadioButton Content="Disabled" Grid.Column="1" HorizontalAlignment="Left" Margin="189,87,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3"/>
<Button Content="Cancel" Grid.Column="1" HorizontalAlignment="Left" Margin="160,145,0,0" Width="99" Click="Button_Click" Height="32" VerticalAlignment="Top" TabIndex="5"/>
<Button Content="Finish" Grid.Column="1" HorizontalAlignment="Left" Margin="15,145,0,0" VerticalAlignment="Top" Width="99" Name="Finish" Click="Finish_Click" TabIndex="4"/>
<Button Content="Select File" Grid.Column="1" HorizontalAlignment="Left" Margin="340,21,-163,0" VerticalAlignment="Top" Width="99" Name="FileSelect" Click="FileSelect_Click" TabIndex="1" />
<Label Content="Overlay:" Grid.Column="1" HorizontalAlignment="Left" Margin="112,95,0,0" VerticalAlignment="Top"/>
<RadioButton Content="Enabled" Grid.Column="1" HorizontalAlignment="Left" Margin="197,99,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Name="enOv" Click="enOv_Click" IsChecked="True" TabIndex="2"/>
<RadioButton Content="Disabled" Grid.Column="1" HorizontalAlignment="Left" Margin="286,99,-78,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3"/>
<Button Content="Cancel" Grid.Column="1" HorizontalAlignment="Left" Margin="340,186,-163,0" Width="99" Click="Button_Click" Height="32" VerticalAlignment="Top" TabIndex="5"/>
<Button Content="Finish" Grid.Column="1" HorizontalAlignment="Left" Margin="195,186,-18,0" VerticalAlignment="Top" Width="99" Name="Finish" Click="Finish_Click" TabIndex="4"/>
<Border BorderThickness="1.5,1.5,1.5,1.5" BorderBrush="#FF2196F3" HorizontalAlignment="Left" Height="129" VerticalAlignment="Top" Width="129" Margin="18,48,0,0">
</Border>
@ -42,5 +42,9 @@
<ComboBox Margin="0,2" Width="169" Name="combo" SelectionChanged="combo_SelectionChanged" Foreground="Black" Visibility="Hidden" ></ComboBox>
</StackPanel>
<Label Content=" bootTvTex" x:Name="imageName" Margin="14,25,14,148"/>
<Label Content="Overlay:" HorizontalAlignment="Left" Margin="21,188,0,0" VerticalAlignment="Top"/>
<RadioButton Content="Wii" HorizontalAlignment="Left" Margin="82,192,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" x:Name="enOv_Copy" Click="enOv_Click" IsChecked="True" TabIndex="2"/>
<RadioButton Content="WiiWare" HorizontalAlignment="Left" Margin="148,192,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3" Grid.ColumnSpan="2"/>
<RadioButton Content="Homebrew" HorizontalAlignment="Left" Margin="82,192,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3" Grid.Column="1"/>
</Grid>
</Window>

View file

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:UWUVCI_AIO_WPF"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
Title="ImageCreator" Height="200" Width="435" Foreground="White" Background="LightGray" ResizeMode="NoResize" materialDesign:ShadowAssist.CacheMode="{x:Null}" Icon="/UWUVCI AIO WPF;component/b.ico" Name="wind" SizeToContent="WidthAndHeight" BorderBrush="#FF2196F3" BorderThickness="1.5,1.5,1.5,1.5" ShowInTaskbar="False" WindowStyle="None" Loaded="wind_Loaded" WindowStartupLocation="CenterOwner" MaxHeight="200">
Title="ImageCreator" Height="200" Width="467" Foreground="White" Background="LightGray" ResizeMode="NoResize" materialDesign:ShadowAssist.CacheMode="{x:Null}" Icon="/UWUVCI AIO WPF;component/b.ico" Name="wind" SizeToContent="WidthAndHeight" BorderBrush="#FF2196F3" BorderThickness="1.5,1.5,1.5,1.5" ShowInTaskbar="False" WindowStyle="None" Loaded="wind_Loaded" WindowStartupLocation="CenterOwner" MaxHeight="200" MinWidth="467">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="160"/>
@ -24,11 +24,11 @@
<Button Content="Select File" Grid.Column="1" HorizontalAlignment="Left" Margin="160,19,0,0" VerticalAlignment="Top" Width="99" Name="FileSelect" Click="FileSelect_Click" TabIndex="1" />
<Label Content="Overlay:" Grid.Column="1" HorizontalAlignment="Left" Margin="15,59,0,0" VerticalAlignment="Top"/>
<RadioButton Content="Enabled" Grid.Column="1" HorizontalAlignment="Left" Margin="100,63,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Name="enOv" Click="enOv_Click" IsChecked="True" TabIndex="2"/>
<RadioButton Content="Disabled" Grid.Column="1" HorizontalAlignment="Left" Margin="189,63,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3"/>
<Button Content="Cancel" Grid.Column="1" HorizontalAlignment="Left" Margin="160,145,0,0" Width="99" Click="Button_Click" Height="32" VerticalAlignment="Top" TabIndex="5"/>
<Button Content="Select File" Grid.Column="1" HorizontalAlignment="Left" Margin="185,19,-8,0" VerticalAlignment="Top" Width="99" Name="FileSelect" Click="FileSelect_Click" TabIndex="1" />
<Label Content="Overlay:" Grid.Column="1" HorizontalAlignment="Left" Margin="15,61,0,0" VerticalAlignment="Top"/>
<RadioButton Content="Enabled" Grid.Column="1" HorizontalAlignment="Left" Margin="115,65,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Name="enOv" Click="enOv_Click" IsChecked="True" TabIndex="2" Width="73"/>
<RadioButton Content="Disabled" Grid.Column="1" HorizontalAlignment="Left" Margin="202,65,-15,0" VerticalAlignment="Top" Foreground="Black" GroupName="ov" Click="enOv_Click" TabIndex="3" Width="89"/>
<Button Content="Cancel" Grid.Column="1" HorizontalAlignment="Left" Margin="185,145,-8,0" Width="99" Click="Button_Click" Height="32" VerticalAlignment="Top" TabIndex="5"/>
<Button Content="Finish" Grid.Column="1" HorizontalAlignment="Left" Margin="15,145,0,0" VerticalAlignment="Top" Width="99" Name="Finish" Click="Finish_Click" TabIndex="4"/>
<Border BorderThickness="1.5,1.5,1.5,1.5" BorderBrush="#FF2196F3" HorizontalAlignment="Left" Height="129" VerticalAlignment="Top" Width="129" Margin="18,48,0,0">
@ -41,6 +41,10 @@
<RadioButton Content="Super Famicom" GroupName="snes" Click="RadioButton_Click" Foreground="Black" Margin="0,6,0,-6"/>
<ComboBox Margin="0,2" Width="169" Name="combo" SelectionChanged="combo_SelectionChanged" Foreground="Black" Visibility="Hidden" ></ComboBox>
</StackPanel>
<Label Content=" bootTvTex" x:Name="imageName" Margin="14,25,14,148"/>
<Label Content=" bootTvTex" x:Name="imageName" Margin="14,25,14,148" />
<Label Content="Style:" Grid.Column="1" HorizontalAlignment="Left" Margin="15,87,0,0" VerticalAlignment="Top" Name="ws" Visibility="Hidden"/>
<RadioButton Content="WiiWare" Grid.Column="1" HorizontalAlignment="Left" Margin="115,90,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="wis" IsChecked="True" TabIndex="2" Width="73" Name="ww" Visibility="Hidden" Click="ww_Click"/>
<RadioButton Content="Homebrew" Grid.Column="1" HorizontalAlignment="Left" Margin="202,90,-7,0" VerticalAlignment="Top" Foreground="Black" GroupName="wis" TabIndex="3" Width="81" Name="hb" Visibility="Hidden" Click="ww_Click"/>
<RadioButton Content="Wii" Grid.Column="1" HorizontalAlignment="Left" Margin="56,90,0,0" VerticalAlignment="Top" Foreground="Black" GroupName="wis" IsChecked="True" TabIndex="3" Width="45" Name="wii" Visibility="Hidden" Click="ww_Click"/>
</Grid>
</Window>

View file

@ -55,7 +55,11 @@ namespace UWUVCI_AIO_WPF.UI.Windows
{
if(console == "WII")
{
bi.Frame = new Bitmap(Properties.Resources.WiiIcon);
bi.Frame = new Bitmap(Properties.Resources.Wii2);
ww.Visibility = Visibility.Visible;
ws.Visibility = Visibility.Visible;
hb.Visibility = Visibility.Visible;
wii.Visibility = Visibility.Visible;
}
else
{
@ -195,9 +199,17 @@ namespace UWUVCI_AIO_WPF.UI.Windows
b = bi.Create(console);
Image.Source = BitmapToImageSource(b);
ww.IsEnabled = true;
wii.IsEnabled = true;
hb.IsEnabled = true;
ws.IsEnabled = true;
}
else
{
ww.IsEnabled = false;
wii.IsEnabled = false;
hb.IsEnabled = false;
ws.IsEnabled = false;
if(bi.TitleScreen != null)
{
@ -205,7 +217,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
}
else
{
b = new Bitmap(1280, 720);
b = new Bitmap(128, 128);
using (Graphics gfx = Graphics.FromImage(b))
using (SolidBrush brush = new SolidBrush(System.Drawing.Color.FromArgb(0, 0, 0)))
{
@ -313,5 +325,22 @@ namespace UWUVCI_AIO_WPF.UI.Windows
DrawImage();
}
private void ww_Click(object sender, RoutedEventArgs e)
{
if(ww.IsChecked == true)
{
bi.Frame = new Bitmap(Properties.Resources.WiiIcon);
}
else if(wii.IsChecked == true)
{
bi.Frame = new Bitmap(Properties.Resources.Wii2);
}
else if(hb.IsChecked == true)
{
bi.Frame = new Bitmap(Properties.Resources.Wii2);
}
DrawImage();
}
}
}

View file

@ -52,8 +52,8 @@
<Label Content="Style:" Width="50" Margin="0,4,0,-4"></Label>
<RadioButton Content="SNES - PAL" GroupName="snes" Name="pal" IsChecked="True" Click="pal_Click" Foreground="Black" Width="100" Margin="0,6,0,-6"/>
<RadioButton Content="SNES - NTSC" GroupName="snes" Click="pal_Click" Foreground="Black" Margin="0,6,0,-6" Width="107" />
<RadioButton Content="Super Famicom" GroupName="snes" Click="RadioButton_Click" Foreground="Black" Margin="0,6,0,-6"/>
<RadioButton Content="SNES - NTSC" GroupName="snes" Click="pal_Click" Foreground="Black" Margin="0,6,0,-6" Width="107" Name="sntsc"/>
<RadioButton Content="Super Famicom" GroupName="snes" Click="RadioButton_Click" Foreground="Black" Margin="0,6,0,-6" Name="sfc"/>
<ComboBox Margin="0,2" Width="169" Name="combo" SelectionChanged="combo_SelectionChanged" Foreground="Black" Visibility="Hidden" ></ComboBox>
</StackPanel>
<CheckBox Content="Use ALT font" HorizontalAlignment="Left" Height="18" Margin="407,333,0,0" VerticalAlignment="Top" Foreground="Black" Click="CheckBox_Click" Name="alt" Visibility="Hidden"/>

View file

@ -119,7 +119,10 @@ namespace UWUVCI_AIO_WPF.UI.Windows
alt.Visibility = Visibility.Hidden;
PlayerLabel.Visibility = Visibility.Hidden;
snesonly.Visibility = Visibility.Visible;
pal.Content = "Wii";
sntsc.Content = "WiiWare";
sfc.Content = "Homebrew";
break;
case GameConsoles.GCN:
bit = new Bitmap(Properties.Resources.GCN);
@ -417,22 +420,46 @@ namespace UWUVCI_AIO_WPF.UI.Windows
private void pal_Click(object sender, RoutedEventArgs e)
{
if(pal.IsChecked == true)
if(console != "WII")
{
bi.Frame = Properties.Resources.SNES_PAL;
if (pal.IsChecked == true)
{
bi.Frame = Properties.Resources.SNES_PAL;
}
else
{
bi.Frame = Properties.Resources.SNES_USA;
}
}
else
{
bi.Frame = Properties.Resources.SNES_USA;
if (pal.IsChecked == true)
{
bi.Frame = Properties.Resources.WII;
}
else
{
bi.Frame = Properties.Resources.WIIWARE;
}
}
b = bi.Create(console);
Image.Source = BitmapToImageSource(b);
}
private void RadioButton_Click(object sender, RoutedEventArgs e)
{
bi.Frame = Properties.Resources.SFAM;
if(console != "WII")
{
bi.Frame = Properties.Resources.SFAM;
}
else
{
bi.Frame = Properties.Resources.WII;
}
b = bi.Create(console);
Image.Source = BitmapToImageSource(b);
}

View file

@ -560,7 +560,12 @@
<ItemGroup>
<None Include="Resources\WiiIcon.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="Resources\Wii2.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\WIIWARE.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">