Skip to content

Commit 5ea80e0

Browse files
committed
Better UI & Remove MFAudio
* Better colors for the UI * Removed MFAudio
1 parent facfafe commit 5ea80e0

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

Zero2Undub/App.xaml.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Configuration;
4-
using System.Data;
5-
using System.Linq;
6-
using System.Threading.Tasks;
7-
using System.Windows;
1+
using System.Windows;
82

93
namespace Zero2Undub
104
{

Zero2Undub/MainWindow.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:Zero2Undub"
77
mc:Ignorable="d"
8-
Title="PS2 Fatal Frame 2 Undubber" Height="472.25" Width="344.401" ResizeMode="NoResize" Background="#FFD6DBE9" WindowStyle="ToolWindow">
8+
Title="PS2 Fatal Frame 2 Undubber" Height="472.25" Width="344.401" ResizeMode="NoResize" Background="#e76940" WindowStyle="ToolWindow">
99
<Window.Effect>
1010
<DropShadowEffect/>
1111
</Window.Effect>
12-
<Grid Margin="0,0,4,5" Background="#FFD6DBE9">
12+
<Grid Background="#290d0b" HorizontalAlignment="Center" Width="344" Height="462" VerticalAlignment="Center">
1313
<Grid.ColumnDefinitions>
14-
<ColumnDefinition Width="144*"/>
15-
<ColumnDefinition Width="23*"/>
14+
<ColumnDefinition/>
15+
<ColumnDefinition Width="0*"/>
1616
<ColumnDefinition Width="0*"/>
1717
</Grid.ColumnDefinitions>
18-
<Button x:Name="button" Content="Undub" HorizontalAlignment="Left" Height="20" Margin="38,347,0,0" VerticalAlignment="Top" Width="99" FontSize="10.667" Click="LaunchUndubbing" Background="#FF293955" Foreground="#FFD6DBE9" BorderBrush="{x:Null}"/>
19-
<Button x:Name="button1" Content="Select Files" HorizontalAlignment="Left" Margin="198,347,-8.856,0" VerticalAlignment="Top" Width="99" Click="Button_Click" Foreground="#FFD6DBE9" Background="#FF2C3E5F" BorderBrush="{x:Null}" Height="22"/>
20-
<Image x:Name="image" HorizontalAlignment="Left" Height="312" Margin="70,24,0,0" VerticalAlignment="Top" Width="200" Source="main.png" Stretch="Fill"/>
21-
<ProgressBar Name="pbStatus" HorizontalAlignment="Left" Height="11" Margin="120,414,0,0" VerticalAlignment="Top" Width="100"/>
18+
<Button x:Name="button" Content="Undub" HorizontalAlignment="Left" Height="20" Margin="40,364,0,0" VerticalAlignment="Top" Width="100" FontSize="10.667" Click="LaunchUndubbing" Background="#413438" Foreground="#FFD6DBE9" BorderBrush="{x:Null}"/>
19+
<Button x:Name="button1" Content="Select Files" Margin="204,364,40,0" VerticalAlignment="Top" Click="Button_Click" Foreground="#FFD6DBE9" Background="#413438" BorderBrush="{x:Null}" Height="20"/>
20+
<Image x:Name="image" HorizontalAlignment="Center" Height="312" VerticalAlignment="Top" Width="200" Source="main.png" Stretch="Fill" Margin="0,22,0,0"/>
21+
<ProgressBar Name="pbStatus" HorizontalAlignment="Center" Height="10" Margin="0,419,0,0" VerticalAlignment="Top" Width="180"/>
2222
</Grid>
2323
</Window>

Zero2Undub/MainWindow.xaml.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace Zero2Undub
1212
public partial class MainWindow : Window
1313
{
1414
private const string WindowName = "PS2 Fatal Frame 2 Undubber";
15-
private string JpIsoFile { get; set; }
16-
private string UsIsoFile { get; set; }
15+
private string OriginIsoFile { get; set; }
16+
private string TargetIsoFile { get; set; }
1717
private bool IsUndubLaunched { get; set; }
1818
private UndubOptions Options { get; set; }
1919

@@ -30,7 +30,7 @@ public MainWindow()
3030
private void UndubGame(object sender, DoWorkEventArgs e)
3131
{
3232

33-
if (string.IsNullOrWhiteSpace(JpIsoFile) || string.IsNullOrWhiteSpace(UsIsoFile))
33+
if (string.IsNullOrWhiteSpace(OriginIsoFile) || string.IsNullOrWhiteSpace(TargetIsoFile))
3434
{
3535
MessageBox.Show("Please select the files before!", WindowName);
3636
return;
@@ -40,7 +40,7 @@ private void UndubGame(object sender, DoWorkEventArgs e)
4040
IsUndubLaunched = true;
4141

4242
(sender as BackgroundWorker)?.ReportProgress(10);
43-
var importer = new ZeroFileImporter(JpIsoFile, UsIsoFile, Options);
43+
var importer = new ZeroFileImporter(OriginIsoFile, TargetIsoFile, Options);
4444

4545
var task = Task.Factory.StartNew(() =>
4646
{
@@ -60,7 +60,7 @@ private void UndubGame(object sender, DoWorkEventArgs e)
6060
MessageBox.Show($"The program failed with the following message: {importer.InfoReporterUi.ErrorMessage}", WindowName);
6161
return;
6262
}
63-
63+
6464
MessageBox.Show("All Done! Enjoy the game :D", WindowName);
6565
}
6666

@@ -91,24 +91,24 @@ private void Button_Click(object sender, RoutedEventArgs e)
9191
{
9292
var usFileDialog = new OpenFileDialog
9393
{
94-
Filter = "iso files (*.iso)|*.iso|All files (*.*)|*.*",
94+
Filter = "iso files (*.iso)|*.iso|All files (*.*)|*.*",
9595
Title = "Select the USA ISO"
9696
};
9797

9898
if (usFileDialog.ShowDialog() == true)
9999
{
100-
UsIsoFile = usFileDialog.FileName;
100+
TargetIsoFile = usFileDialog.FileName;
101101
}
102102

103103
var jpFileDialog = new OpenFileDialog
104104
{
105-
Filter = "iso files (*.iso)|*.iso|All files (*.*)|*.*",
105+
Filter = "iso files (*.iso)|*.iso|All files (*.*)|*.*",
106106
Title = "Select the JP ISO"
107107
};
108108

109109
if (jpFileDialog.ShowDialog() == true)
110110
{
111-
JpIsoFile = jpFileDialog.FileName;
111+
OriginIsoFile = jpFileDialog.FileName;
112112
}
113113
}
114114
}

Zero2UndubProcess/MFAudio.exe

-57 KB
Binary file not shown.

Zero2UndubProcess/Zero2UndubProcess.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,4 @@
55
<RootNamespace>Zero2UndubProcess</RootNamespace>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<None Update="MFAudio.exe">
10-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11-
</None>
12-
</ItemGroup>
13-
148
</Project>

0 commit comments

Comments
 (0)