more bug fixes

This commit is contained in:
NicoAICP 2020-04-20 11:31:26 +02:00
parent 06b749d72a
commit cb4c31d47e
16 changed files with 345 additions and 88 deletions

View file

@ -37,6 +37,9 @@
<setting name="SysKey1" serializeAs="String">
<value />
</setting>
<setting name="dont" serializeAs="String">
<value>False</value>
</setting>
</UWUVCI_AIO_WPF.Properties.Settings>
</userSettings>
</configuration>

View file

@ -67,7 +67,10 @@ namespace UWUVCI_AIO_WPF
mvvm = mvm;
if (Directory.Exists(tempPath)) Directory.Delete(tempPath, true);
if (Directory.Exists(tempPath))
{
Directory.Delete(tempPath, true);
}
Directory.CreateDirectory(tempPath);
mvm.msg = "Checking Tools...";
@ -93,6 +96,10 @@ namespace UWUVCI_AIO_WPF
throw new Exception("12G");
}
}
if(Configuration.BaseRom == null || Configuration.BaseRom.Name == null)
{
throw new Exception("BASE");
}
if (Configuration.BaseRom.Name != "Custom")
{
//Normal Base functionality here
@ -141,6 +148,10 @@ namespace UWUVCI_AIO_WPF
{
MessageBox.Show("The ROM you want to Inject is to big for selected Base!\nPlease try again with different Base", "Injection Failed", MessageBoxButton.OK, MessageBoxImage.Error);
}
else if (e.Message.Contains("BASE"))
{
MessageBox.Show("If you import a config you NEED to reselect a base", "Injection Failed", MessageBoxButton.OK, MessageBoxImage.Error);
}
else if (e.Message.Contains("WII"))
{
MessageBox.Show( $"{e.Message.Replace("WII", "")}\nPlease make sure that your ROM isn't flawed and that you have atleast 12 GB of free Storage left.", "Injection Failed", MessageBoxButton.OK, MessageBoxImage.Error);
@ -1381,6 +1392,7 @@ namespace UWUVCI_AIO_WPF
private static void Images(GameConfig config)
{
bool usetemp = false;
bool readbin = false;
try
{
@ -1407,7 +1419,7 @@ namespace UWUVCI_AIO_WPF
if(File.Exists(Path.Combine(toolsPath, "iconTex.tga")))
{
CopyAndConvertImage(Path.Combine(toolsPath, "iconTex.tga"), Path.Combine(imgPath), false, 128, 128, 32, "iconTex.tga");
usetemp = true;
Images.Add(true);
}
else
@ -1437,7 +1449,7 @@ namespace UWUVCI_AIO_WPF
if (File.Exists(Path.Combine(toolsPath, "bootTvTex.png")))
{
CopyAndConvertImage(Path.Combine(toolsPath, "bootTvTex.png"), Path.Combine(imgPath), false, 1280, 720, 24, "bootTvTex.tga");
usetemp = true;
Images.Add(true);
}
@ -1453,6 +1465,7 @@ namespace UWUVCI_AIO_WPF
CopyAndConvertImage($"bootTvTex.{config.TGATv.extension}", Path.Combine(imgPath), true, 1280, 720, 24, "bootTvTex.tga");
config.TGATv.ImgPath = Path.Combine(imgPath, "bootTvTex.tga");
Images.Add(true);
readbin = true;
}
//Drc
@ -1482,13 +1495,34 @@ namespace UWUVCI_AIO_WPF
}
else
{
conv.StartInfo.FileName = Path.Combine(toolsPath, "tga2png.exe");
conv.StartInfo.Arguments = $"-i \"{config.TGATv.ImgPath}\" -o \"{Path.Combine(tempPath)}\"";
conv.Start();
conv.WaitForExit();
conv.StartInfo.FileName = Path.Combine(toolsPath, "tga2png.exe");
if (!readbin)
{
conv.StartInfo.Arguments = $"-i \"{config.TGATv.ImgPath}\" -o \"{Path.Combine(tempPath)}\"";
}
else
{
if (config.TGATv.extension.Contains("tga"))
{
ReadFileFromBin(config.TGATv.ImgBin, $"bootTvTex.{config.TGATv.extension}");
conv.StartInfo.Arguments = $"-i \"bootTvTex.{config.TGATv.extension}\" -o \"{Path.Combine(tempPath)}\"";
}
else
{
ReadFileFromBin(config.TGATv.ImgBin, Path.Combine(tempPath, "bootTvTex.png"));
}
}
if (!readbin || config.TGATv.extension.Contains("tga"))
{
conv.Start();
conv.WaitForExit();
}
File.Copy(Path.Combine(tempPath, "bootTvTex.png"), Path.Combine(tempPath, "bootDrcTex.png"));
File.Delete(Path.Combine(tempPath, "bootTvTex.png"));
if(File.Exists(Path.Combine(tempPath, "bootTvTex.png"))) File.Delete(Path.Combine(tempPath, "bootTvTex.png"));
if (File.Exists($"bootTvTex.{config.TGATv.extension}")) File.Delete($"bootTvTex.{config.TGATv.extension}");
}

View file

@ -22,6 +22,7 @@ using AutoUpdaterDotNET;
using System.Threading;
using System.Windows.Threading;
using System.Diagnostics;
using Microsoft.WindowsAPICodePack.Dialogs;
namespace UWUVCI_AIO_WPF
{
@ -419,15 +420,15 @@ namespace UWUVCI_AIO_WPF
catch (Exception) { }
cm.ShowDialog();
using (var dialog = new FolderBrowserDialog())
using (var dialog = new CommonOpenFileDialog())
{
System.Windows.Forms.DialogResult result = dialog.ShowDialog();
if (result == DialogResult.OK)
dialog.IsFolderPicker = true;
CommonFileDialogResult result = dialog.ShowDialog();
if (result == CommonFileDialogResult.Ok)
{
try
{
if (DirectoryIsEmpty(dialog.SelectedPath))
if (DirectoryIsEmpty(dialog.FileName))
{
cm = new Custom_Message("Issue", "The folder is Empty. Please choose another folder");
try
@ -439,7 +440,7 @@ namespace UWUVCI_AIO_WPF
}
else
{
if (Directory.GetDirectories(dialog.SelectedPath).Length > 0)
if (Directory.GetDirectories(dialog.FileName).Length > 0)
{
cm = new Custom_Message("Issue", "This folder mustn't contain any subfolders.");
try
@ -453,9 +454,9 @@ namespace UWUVCI_AIO_WPF
else
{
//WUP
if (Directory.GetFiles(dialog.SelectedPath, "*.hcd").Length == 1 && Directory.GetFiles(dialog.SelectedPath, "*.ogg").Length > 0 && Directory.GetFiles(dialog.SelectedPath, "*.bin").Length > 0)
if (Directory.GetFiles(dialog.FileName, "*.hcd").Length == 1 && Directory.GetFiles(dialog.FileName, "*.ogg").Length > 0 && Directory.GetFiles(dialog.FileName, "*.bin").Length > 0)
{
ret = dialog.SelectedPath;
ret = dialog.FileName;
}
else
{
@ -513,18 +514,26 @@ namespace UWUVCI_AIO_WPF
{
ReadIniIntoConfig();
}
GameConfig backup = GameConfiguration;
if (test == GameConsoles.GCN) backup.Console = GameConsoles.GCN;
if(GameConfiguration.TGADrc.ImgBin != null && GameConfiguration.TGADrc.ImgBin.Length > 0) backup.TGADrc.ImgPath = "Added via Config";
if (GameConfiguration.TGATv.ImgBin != null && GameConfiguration.TGATv.ImgBin.Length > 0) backup.TGATv.ImgPath = "Added via Config";
if (GameConfiguration.TGALog.ImgBin != null && GameConfiguration.TGALog.ImgBin.Length > 0) backup.TGALog.ImgPath = "Added via Config";
if (GameConfiguration.TGAIco.ImgBin != null && GameConfiguration.TGAIco.ImgBin.Length > 0) backup.TGAIco.ImgPath = "Added via Config";
if (GameConfiguration.N64Stuff.INIBin != null && GameConfiguration.N64Stuff.INIBin.Length > 0) backup.N64Stuff.INIPath = "Added via Config";
if (GameConfiguration.GameName == "" || GameConfiguration.GameName == null) backup.GameName = "NoName";
CheckAndFixConfigFolder();
string outputPath = $@"configs\{ GameConfiguration.GameName}.uwuvci";
int i = 0;
while (Directory.Exists(outputPath))
string outputPath = $@"configs\[{backup.Console.ToString()}]{backup.GameName}.uwuvci";
int i = 1;
while (File.Exists(outputPath))
{
outputPath = $@"configs\{ GameConfiguration.GameName}_{i}.uwuvci";
outputPath = $@"configs\[{backup.Console.ToString()}]{backup.GameName}_{i}.uwuvci";
i++;
}
Stream createConfigStream = new FileStream(outputPath, FileMode.Create, FileAccess.Write);
GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress);
IFormatter formatter = new BinaryFormatter();
formatter.Serialize(compressedStream, GameConfiguration);
formatter.Serialize(compressedStream, backup);
compressedStream.Close();
createConfigStream.Close();
Custom_Message cm = new Custom_Message("Export success", "The Config was successfully exported.\nClick the Open Folder Button to open the Location where the Config is stored.", Path.Combine(Directory.GetCurrentDirectory(), outputPath));
@ -534,6 +543,35 @@ namespace UWUVCI_AIO_WPF
}
catch (Exception) { }
cm.ShowDialog();
GameConfiguration = new GameConfig();
gameConfiguration.Console = backup.Console;
if (GameConfiguration.Console == GameConsoles.N64)
{
(thing as N64Config).reset();
}
else if (gameConfiguration.Console == GameConsoles.TG16)
{
(thing as TurboGrafX).reset();
}
else if (gameConfiguration.Console == GameConsoles.WII && test != GameConsoles.GCN)
{
(thing as WiiConfig).reset();
}
else if (test == GameConsoles.GCN)
{
(thing as GCConfig).reset();
}
else
{
try
{
(thing as OtherConfigs).reset();
}
catch (Exception e)
{
(thing as GCConfig).reset();
}
}
}
public void ImportConfig(string configPath)
{
@ -1927,16 +1965,17 @@ namespace UWUVCI_AIO_WPF
public void SetInjectPath()
{
using (var dialog = new System.Windows.Forms.FolderBrowserDialog())
using (var dialog = new CommonOpenFileDialog())
{
System.Windows.Forms.DialogResult result = dialog.ShowDialog();
if(result == DialogResult.OK)
dialog.IsFolderPicker = true;
CommonFileDialogResult result = dialog.ShowDialog();
if(result == CommonFileDialogResult.Ok)
{
try
{
if (DirectoryIsEmpty(dialog.SelectedPath))
if (DirectoryIsEmpty(dialog.FileName))
{
Settings.Default.OutPath = dialog.SelectedPath;
Settings.Default.OutPath = dialog.FileName;
Settings.Default.SetOutOnce = true;
Settings.Default.Save();
UpdatePathSet();
@ -1953,7 +1992,7 @@ namespace UWUVCI_AIO_WPF
if (choosefolder)
{
choosefolder = false;
Settings.Default.OutPath = dialog.SelectedPath;
Settings.Default.OutPath = dialog.FileName;
Settings.Default.SetOutOnce = true;
Settings.Default.Save();
UpdatePathSet();
@ -1982,41 +2021,42 @@ namespace UWUVCI_AIO_WPF
}
public void SetBasePath()
{
using (var dialog = new System.Windows.Forms.FolderBrowserDialog())
using (var dialog = new CommonOpenFileDialog())
{
System.Windows.Forms.DialogResult result = dialog.ShowDialog();
if (result == DialogResult.OK)
dialog.IsFolderPicker = true;
CommonFileDialogResult result = dialog.ShowDialog();
if (result == CommonFileDialogResult.Ok)
{
try
{
if (DirectoryIsEmpty(dialog.SelectedPath))
if (DirectoryIsEmpty(dialog.FileName))
{
Settings.Default.BasePath = dialog.SelectedPath;
Settings.Default.BasePath = dialog.FileName;
Settings.Default.SetBaseOnce = true;
Settings.Default.Save();
UpdatePathSet();
}
else
{
Custom_Message cm = new Custom_Message("Information", "Folder contains Files or Subfolders, do you really want to use this folder as the Base Folder?");
Custom_Message cm = new Custom_Message("Information", "Folder contains Files or Subfolders, do you really want to use this folder as the Bases Folder?");
try
{
cm.Owner = mw;
}
catch (Exception) { }
cm.ShowDialog();
if (choosefolder)
{
choosefolder = false;
Settings.Default.BasePath = dialog.SelectedPath;
Settings.Default.BasePath = dialog.FileName;
Settings.Default.SetBaseOnce = true;
Settings.Default.Save();
UpdatePathSet();
}
else
{
SetBasePath();
SetInjectPath();
}
}
}

View file

@ -130,5 +130,17 @@ namespace UWUVCI_AIO_WPF.Properties {
this["SysKey1"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool dont {
get {
return ((bool)(this["dont"]));
}
set {
this["dont"] = value;
}
}
}
}

View file

@ -29,5 +29,8 @@
<Setting Name="SysKey1" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="dont" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View file

@ -18,6 +18,7 @@ using GameBaseClassLibrary;
using System.Windows.Forms;
using System.IO;
using UWUVCI_AIO_WPF.UI.Windows;
using Microsoft.WindowsAPICodePack.Dialogs;
namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
{
@ -70,35 +71,36 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
if(mvm.choosefolder)
{
mvm.choosefolder = false; //get folder
using (var dialog = new System.Windows.Forms.FolderBrowserDialog())
using (var dialog = new CommonOpenFileDialog())
{
System.Windows.Forms.DialogResult result = dialog.ShowDialog();
if (result == DialogResult.OK)
dialog.IsFolderPicker = true;
CommonFileDialogResult result = dialog.ShowDialog();
if (result == CommonFileDialogResult.Ok)
{
try
{
if (mvm.DirectoryIsEmpty(dialog.SelectedPath))
if (mvm.DirectoryIsEmpty(dialog.FileName))
{
new Custom_Message("Issue", "The Folder is Empty. Please choose another Folder.").ShowDialog();
}
else
{
if(Directory.GetDirectories(dialog.SelectedPath).Length > 3)
if(Directory.GetDirectories(dialog.FileName).Length > 3)
{
new Custom_Message("Issue", "This Folder has too many subfolders. Please choose another folder").ShowDialog();
}
else
{
if(Directory.GetDirectories(dialog.SelectedPath).Length > 0)
if(Directory.GetDirectories(dialog.FileName).Length > 0)
{
//Code Content Meta
if (Directory.Exists(System.IO.Path.Combine(dialog.SelectedPath, "content")) && Directory.Exists(System.IO.Path.Combine(dialog.SelectedPath, "code")) && Directory.Exists(System.IO.Path.Combine(dialog.SelectedPath, "meta")))
if (Directory.Exists(System.IO.Path.Combine(dialog.FileName, "content")) && Directory.Exists(System.IO.Path.Combine(dialog.FileName, "code")) && Directory.Exists(System.IO.Path.Combine(dialog.FileName, "meta")))
{
//create new Game Config
mvm.GameConfiguration.Console = console;
mvm.GameConfiguration.CBasePath = dialog.SelectedPath;
mvm.GameConfiguration.CBasePath = dialog.FileName;
GameBases gb = new GameBases();
gb.Name = "Custom";
gb.Region = Regions.EU;
@ -121,12 +123,12 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
else
{
//WUP
if (Directory.GetFiles(dialog.SelectedPath, "*.app").Length > 0 && Directory.GetFiles(dialog.SelectedPath, "*.h3").Length > 0 && File.Exists(System.IO.Path.Combine(dialog.SelectedPath, "title.tmd")) && File.Exists(System.IO.Path.Combine(dialog.SelectedPath, "title.tik")))
if (Directory.GetFiles(dialog.FileName, "*.app").Length > 0 && Directory.GetFiles(dialog.FileName, "*.h3").Length > 0 && File.Exists(System.IO.Path.Combine(dialog.FileName, "title.tmd")) && File.Exists(System.IO.Path.Combine(dialog.FileName, "title.tik")))
{
if (mvm.CBaseConvertInfo())
{
//Convert to LOADIINE => save under bases/custom or custom_x path => create new config
string path = Injection.ExtractBase(dialog.SelectedPath, console);
string path = Injection.ExtractBase(dialog.FileName, console);
mvm.GameConfiguration = new GameConfig();
mvm.GameConfiguration.Console = console;
mvm.GameConfiguration.CBasePath = path;

View file

@ -15,6 +15,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using UWUVCI_AIO_WPF.Classes;
using UWUVCI_AIO_WPF.Properties;
namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
@ -57,7 +58,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGATv.ImgPath = tv.Text;
}
else
else if (!tv.Text.Equals("Added via Config") && !tv.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGATv.ImgPath = null;
}
@ -65,7 +66,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGAIco.ImgPath = ic.Text;
}
else
else if (!ic.Text.Equals("Added via Config") && !ic.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGAIco.ImgPath = null;
@ -74,7 +75,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGALog.ImgPath = log.Text;
}
else
else if(!log.Text.Equals("Added via Config") && !log.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGALog.ImgPath = null;
}
@ -82,7 +83,15 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGADrc.ImgPath = drc.Text;
}
else
else if (!drc.Text.Equals("Added via Config") && !drc.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
if (File.Exists(ini.Text))
{
mvm.GameConfiguration.N64Stuff.INIPath = ini.Text;
}
else if (!ini.Text.Equals("Added via Config") && !ini.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
@ -101,7 +110,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
}
private void Set_TvTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -114,7 +126,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_DrcTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -127,7 +142,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_IconTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -139,7 +157,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_LogoTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -185,5 +206,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.N64Stuff.DarkFilter = false;
}
public void reset()
{
ini.Text = "";
tv.Text = "";
drc.Text = "";
gn.Text = "";
ic.Text = "";
log.Text = "";
}
}
}

View file

@ -77,7 +77,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGATv.ImgPath = tv.Text;
}
else
else if (!tv.Text.Equals("Added via Config") && !tv.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGATv.ImgPath = null;
}
@ -85,7 +85,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGAIco.ImgPath = ic.Text;
}
else
else if (!ic.Text.Equals("Added via Config") && !ic.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGAIco.ImgPath = null;
@ -94,7 +94,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGALog.ImgPath = log.Text;
}
else
else if (!log.Text.Equals("Added via Config") && !log.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGALog.ImgPath = null;
}
@ -102,7 +102,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGADrc.ImgPath = drc.Text;
}
else
else if (!drc.Text.Equals("Added via Config") && !drc.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
@ -114,7 +114,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_TvTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -127,7 +130,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_DrcTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -140,7 +146,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_IconTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGAIco.ImgPath = path;
@ -151,7 +160,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_LogoTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGALog.ImgPath = path;
@ -213,5 +225,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
mvm.gc2rom = path;
}
}
public void reset()
{
gc2.Text = "";
tv.Text = "";
drc.Text = "";
gn.Text = "";
ic.Text = "";
log.Text = "";
}
}
}

View file

@ -62,7 +62,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGATv.ImgPath = tv.Text;
}
else
else if (!tv.Text.Equals("Added via Config") && !tv.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGATv.ImgPath = null;
}
@ -70,7 +70,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGAIco.ImgPath = ic.Text;
}
else
else if (!ic.Text.Equals("Added via Config") && !ic.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGAIco.ImgPath = null;
@ -79,7 +79,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGALog.ImgPath = log.Text;
}
else
else if (!log.Text.Equals("Added via Config") && !log.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGALog.ImgPath = null;
}
@ -87,7 +87,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGADrc.ImgPath = drc.Text;
}
else
else if (!drc.Text.Equals("Added via Config") && !drc.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
@ -96,7 +96,11 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_TvTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -109,7 +113,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_DrcTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -122,7 +129,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_IconTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGAIco.ImgPath = path;
@ -133,7 +143,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_LogoTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGALog.ImgPath = path;
@ -186,5 +199,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
gn.CaretIndex = gn.Text.Length;
gn.ScrollToHorizontalOffset(double.MaxValue);
}
public void reset()
{
tv.Text = "";
drc.Text = "";
gn.Text = "";
ic.Text = "";
log.Text = "";
}
}
}

View file

@ -57,7 +57,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGATv.ImgPath = tv.Text;
}
else
else if (!tv.Text.Equals("Added via Config") && !tv.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGATv.ImgPath = null;
}
@ -65,7 +65,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGAIco.ImgPath = ic.Text;
}
else
else if (!ic.Text.Equals("Added via Config") && !ic.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGAIco.ImgPath = null;
@ -74,7 +74,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGALog.ImgPath = log.Text;
}
else
else if (!log.Text.Equals("Added via Config") && !log.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGALog.ImgPath = null;
}
@ -82,7 +82,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGADrc.ImgPath = drc.Text;
}
else
else if (!drc.Text.Equals("Added via Config") && !drc.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
@ -91,7 +91,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_TvTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -104,7 +107,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_DrcTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -117,7 +123,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_IconTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGAIco.ImgPath = path;
@ -128,7 +137,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_LogoTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path)) {
mvm.GameConfiguration.TGALog.ImgPath = path;
@ -166,5 +178,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
}
public void reset()
{
tv.Text = "";
drc.Text = "";
gn.Text = "";
ic.Text = "";
log.Text = "";
}
}
}

View file

@ -14,6 +14,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using UWUVCI_AIO_WPF.Properties;
namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
@ -80,7 +81,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGATv.ImgPath = tv.Text;
}
else
else if (!tv.Text.Equals("Added via Config") && !tv.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGATv.ImgPath = null;
}
@ -88,7 +89,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGAIco.ImgPath = ic.Text;
}
else
else if (!ic.Text.Equals("Added via Config") && !ic.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGAIco.ImgPath = null;
@ -97,7 +98,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGALog.ImgPath = log.Text;
}
else
else if (!log.Text.Equals("Added via Config") && !log.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGALog.ImgPath = null;
}
@ -105,7 +106,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
mvm.GameConfiguration.TGADrc.ImgPath = drc.Text;
}
else
else if (!drc.Text.Equals("Added via Config") && !drc.Text.Equals("Downloaded from Cucholix Repo"))
{
mvm.GameConfiguration.TGADrc.ImgPath = null;
}
@ -123,7 +124,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_TvTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -136,7 +140,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_DrcTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -149,7 +156,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_IconTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -161,7 +171,10 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
private void Set_LogoTex(object sender, RoutedEventArgs e)
{
mvm.ImageWarning();
if (!Settings.Default.dont)
{
mvm.ImageWarning();
}
string path = mvm.GetFilePath(false, false);
if (!CheckIfNull(path))
{
@ -231,5 +244,15 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
mvm.toPal = false;
mvm.Patch = false;
}
public void reset()
{
tv.Text = "";
drc.Text = "";
gn.Text = "";
ic.Text = "";
log.Text = "";
}
}
}

View file

@ -24,6 +24,7 @@
<Button Content="Close" HorizontalAlignment="Left" Margin="7,8,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click" RenderTransformOrigin="0.5,0.5" Grid.Row="2" Grid.Column="2"/>
<Button Content="Open Folder" HorizontalAlignment="Left" Margin="5,8,0,0" VerticalAlignment="Top" Width="121" Name="Folder" Click="Folder_Click" RenderTransformOrigin="1,1" Grid.Row="2" Grid.Column="1"/>
<Button Content="Continue" HorizontalAlignment="Left" Margin="5,8,0,0" VerticalAlignment="Top" Width="121" x:Name="Reset" Click="Reset_Click" RenderTransformOrigin="1,1" Grid.Row="2" Grid.Column="1" Visibility="Hidden"/>
<CheckBox Content="Don't show this again" HorizontalAlignment="Left" Margin="2,14,0,0" Grid.Row="2" VerticalAlignment="Top" Width="139" Foreground="Black" Name="dont"/>
</Grid>

View file

@ -26,9 +26,9 @@ namespace UWUVCI_AIO_WPF.UI.Windows
public Custom_Message(string title, string message)
{
InitializeComponent();
dont.Visibility = Visibility.Hidden;
Title.Text = title;
Message.Content = message;
Folder.Visibility = Visibility.Hidden;
@ -40,6 +40,10 @@ namespace UWUVCI_AIO_WPF.UI.Windows
reset = true;
}
}
if(title.Equals("Image Warning"))
{
dont.Visibility = Visibility.Visible;
}
}
public Custom_Message(string title, string message, string Path)
@ -53,6 +57,11 @@ namespace UWUVCI_AIO_WPF.UI.Windows
}
private void Button_Click(object sender, RoutedEventArgs e)
{
if(dont.IsChecked == true)
{
Properties.Settings.Default.dont = true;
Properties.Settings.Default.Save();
}
this.Close();
}
@ -75,6 +84,11 @@ namespace UWUVCI_AIO_WPF.UI.Windows
}
cm.ShowDialog();
if (dont.IsChecked == true)
{
Properties.Settings.Default.dont = true;
Properties.Settings.Default.Save();
}
this.Close();
}
@ -91,7 +105,11 @@ namespace UWUVCI_AIO_WPF.UI.Windows
{
((MainViewModel)FindResource("mvm")).choosefolder = true;
}
if (dont.IsChecked == true)
{
Properties.Settings.Default.dont = true;
Properties.Settings.Default.Save();
}
this.Close();
}
}

View file

@ -13,6 +13,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations;
namespace UWUVCI_AIO_WPF.UI.Windows
{
@ -67,8 +68,26 @@ namespace UWUVCI_AIO_WPF.UI.Windows
Directory.CreateDirectory(System.IO.Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo"));
client.DownloadFile(ic, System.IO.Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo", "iconTex.png"));
mvm.GameConfiguration.TGAIco.ImgPath = System.IO.Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo", "iconTex.png");
mvm.GameConfiguration.TGAIco.extension = ".png";
if (mvm.test == GameBaseClassLibrary.GameConsoles.GCN)
{
(mvm.Thing as GCConfig).ic.Text = "Downloaded from Cucholix Repo";
}
else if(mvm.GameConfiguration.Console == GameBaseClassLibrary.GameConsoles.WII)
{
(mvm.Thing as WiiConfig).ic.Text = "Downloaded from Cucholix Repo";
}
client.DownloadFile(tvs, System.IO.Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo", "bootTvTex.png"));
mvm.GameConfiguration.TGATv.ImgPath = System.IO.Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo", "bootTvTex.png");
mvm.GameConfiguration.TGATv.extension = ".png";
if (mvm.test == GameBaseClassLibrary.GameConsoles.GCN)
{
(mvm.Thing as GCConfig).tv.Text = "Downloaded from Cucholix Repo";
}
else if (mvm.GameConfiguration.Console == GameBaseClassLibrary.GameConsoles.WII)
{
(mvm.Thing as WiiConfig).tv.Text = "Downloaded from Cucholix Repo";
}
this.Close();
}

View file

@ -75,6 +75,12 @@
<Reference Include="MaterialDesignThemes.Wpf, Version=3.0.1.920, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />

View file

@ -5,4 +5,6 @@
<package id="Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
<package id="MaterialDesignColors" version="1.2.2" targetFramework="net472" />
<package id="MaterialDesignThemes" version="3.0.1" targetFramework="net472" />
<package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net472" />
<package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net472" />
</packages>