Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-09-20 13:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

almost every reported bug fixed

Browse source
This commit is contained in:
NicoAICP 2020-06-22 22:19:39 +02:00
parent 4ed67cbea6
commit 13cb980266
7 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UWUVCI AIO WPF/Classes/BootImage.cs
View file

@ -205,7 +205,7 @@ namespace UWUVCI_AIO_WPF.Classes
GraphicsPath r = new GraphicsPath();
r.AddString("Released: " + Released.ToString(), font.FontFamily,
(int)(FontStyle.Regular),
g.DpiY * 25.0F / 72.0F, new Rectangle(586, 450, 300, 40), format);
g.DpiY * 25.0F / 72.0F, new Rectangle(586, 450, 600, 40), format);
g.DrawPath(shadow, r);
g.DrawPath(outline, r);
g.FillPath(brush, r);
@ -218,7 +218,7 @@ namespace UWUVCI_AIO_WPF.Classes
p.AddString("Players: " + pStr, font.FontFamily,
(int)(FontStyle.Regular),
g.DpiY * 25.0F / 72.0F, new Rectangle(586, 496, 400, 40), format);
g.DpiY * 25.0F / 72.0F, new Rectangle(586, 496, 600, 40), format);
g.DrawPath(shadow, p);

30
UWUVCI AIO WPF/Classes/Injection.cs
View file

@ -1821,12 +1821,12 @@ namespace UWUVCI_AIO_WPF
string gameName = string.Empty;
if(gameNameOr != string.Empty && gameNameOr != null)
{
Regex reg = new Regex("[^a-zA-Z0-9 éÉ - |]");
gameName= reg.Replace(gameNameOr, "");
gameName = gameNameOr;
if (gameName.Contains('|'))
{
var split = gameName.Split('|');
gameName = split[0] + ", " + split[1];
gameName = split[0] + "," + split[1];
}
}
@ -1844,18 +1844,18 @@ namespace UWUVCI_AIO_WPF
doc.Load(metaXml);
if (gameName != null && gameName != string.Empty)
{
doc.SelectSingleNode("menu/longname_ja").InnerText = gameName.Replace(",", "" );
doc.SelectSingleNode("menu/longname_en").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_fr").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_de").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_it").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_es").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_zhs").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_ko").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_nl").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_pt").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_ru").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_zht").InnerText = gameName.Replace(",", "");
doc.SelectSingleNode("menu/longname_ja").InnerText = gameName.Replace(",", "\n" );
doc.SelectSingleNode("menu/longname_en").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_fr").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_de").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_it").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_es").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_zhs").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_ko").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_nl").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_pt").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_ru").InnerText = gameName.Replace(",", "\n");
doc.SelectSingleNode("menu/longname_zht").InnerText = gameName.Replace(",", "\n");
}
/* if(code != null)

26
UWUVCI AIO WPF/Models/MainViewModel.cs
View file

@ -36,6 +36,18 @@ namespace UWUVCI_AIO_WPF
{
public class MainViewModel : BaseModel
{
private bool Injected2 = false;
public bool injected2
{
get { return Injected2; }
set
{
Injected2 = value;
OnPropertyChanged();
}
}
public string prodcode = "";
//public GameConfig GameConfiguration { get; set; }
private GameConfig gameConfiguration = new GameConfig();
@ -1068,8 +1080,18 @@ namespace UWUVCI_AIO_WPF
task.Start();*/
Task.Run(() =>
{
if (Injection.Inject(GameConfiguration, RomPath, this, force)) Injected = true;
else Injected = false;
if (Injection.Inject(GameConfiguration, RomPath, this, force))
{
Injected = true;
injected2 = true;
if(GameConfiguration.Console == GameConsoles.WII || GameConfiguration.Console == GameConsoles.GCN)
{
injected2 = false;
}
}
else { Injected = false; injected2 = false; }
});
DownloadWait dw = new DownloadWait("Injecting Game - Please Wait", "", this);
try

2
UWUVCI AIO WPF/UI/Frames/InjectFrame.xaml
View file

@ -15,7 +15,7 @@
<Frame Name="fBaseFrame" Width="403" Margin="20,64,706,130" IsTabStop="False"/>
</Grid>
<Button Content="WUP Installable" HorizontalAlignment="Left" Margin="51,533,0,0" VerticalAlignment="Top" Width="137" IsEnabled="{Binding Injected}" Click="Button_Click_3" IsTabStop="False"/>
<Button Content="Loadiine" HorizontalAlignment="Left" Margin="256,533,0,0" VerticalAlignment="Top" Width="137" IsEnabled="{Binding Injected}" Click="Button_Click_2" IsTabStop="False"/>
<Button Content="Loadiine" HorizontalAlignment="Left" Margin="256,533,0,0" VerticalAlignment="Top" Width="137" IsEnabled="{Binding injected2}" Click="Button_Click_2" IsTabStop="False" Name="btnLoadiine"/>
<Frame Name="fLoadConfig" Width="643" Margin="459,55,28,35" IsTabStop="False"/>

4
UWUVCI AIO WPF/UI/Frames/InjectFrame.xaml.cs
View file

@ -43,16 +43,18 @@ namespace UWUVCI_AIO_WPF.UI.Frames
else if (console == GameConsoles.WII)
{
fLoadConfig.Content = new InjectFrames.Configurations.WiiConfig();
}
else if (console == GameConsoles.GCN)
{
fLoadConfig.Content = new InjectFrames.Configurations.GCConfig();
}
else
{
fLoadConfig.Content = new InjectFrames.Configurations.OtherConfigs();
}
mvm.injected2 = false;
Console.WriteLine("GameConfig : " + mvm.GameConfiguration.Console.ToString());
fBaseFrame.Content = new InjectFrames.Bases.BaseContainerFrame(console);
}

4
UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren.xaml.cs
View file

@ -758,9 +758,9 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void trimn_Click(object sender, RoutedEventArgs e)
{
if (mvm.donttrim)
if (!mvm.donttrim)
{
mvm.donttrim =false;
mvm.donttrim = false;
}
else
{

2
UWUVCI AIO WPF/UI/Windows/MenuWindow.xaml.cs
View file

@ -211,6 +211,8 @@ namespace UWUVCI_AIO_WPF
mvm.regionfriijp = false;
mvm.regionfriius = false;
mvm.pixelperfect = false;
mvm.injected2 = false;
mvm.RemoveCreatedIMG();
mvm.isDoneMW();