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

some bug fixes

Browse source
This commit is contained in:
NicoAICP 2020-04-20 02:35:31 +02:00
parent 7e7de1d784
commit 06b749d72a
8 changed files with 81 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -549,9 +549,26 @@ namespace UWUVCI_AIO_WPF
{
(thing as N64Config).getInfoFromConfig();
}
else if(gameConfiguration.Console == GameConsoles.TG16)
{
(thing as TurboGrafX).getInfoFromConfig();
}else if(gameConfiguration.Console == GameConsoles.WII && test != GameConsoles.GCN)
{
(thing as WiiConfig).getInfoFromConfig();
}else if (test == GameConsoles.GCN)
{
(thing as GCConfig).getInfoFromConfig();
}
else
{
(thing as OtherConfigs).getInfoFromConfig();
try
{
(thing as OtherConfigs).getInfoFromConfig();
}
catch(Exception e)
{
(thing as GCConfig).getInfoFromConfig();
}
}
}
@ -656,6 +673,7 @@ namespace UWUVCI_AIO_WPF
}
catch (Exception) { }
dw.ShowDialog();
Progress = 0;
string extra = "";
if (GameConfiguration.Console == GameConsoles.WII) extra = "\nSome games cannot reboot into the WiiU Menu. Shut down via the GamePad.\nIf Stuck in a BlackScreen, you need to unplug your WiiU.";
@ -676,7 +694,7 @@ namespace UWUVCI_AIO_WPF
Injected = false;
GameConfiguration.CBasePath = null;
GC = false;
Directory.Delete(Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo"), true);
if(Directory.Exists(Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo"))) Directory.Delete(Path.Combine(Directory.GetCurrentDirectory(), "bin", "repo"), true);
}
DownloadWait Injectwait;

37
UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/BaseContainerFrame.xaml.cs
View file

@ -60,24 +60,31 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
{
mvm = FindResource("mvm") as MainViewModel;
mvm.removeCBASE();
if (cbCombo.SelectedIndex != -1 && cbCombo.SelectedIndex != mvm.OldIndex)
if (cbCombo.SelectedIndex != -1)
{
if (cbCombo.SelectedIndex == 0)
if (cbCombo.SelectedIndex == 0)
{
id.Visibility = Visibility.Hidden;
idtxt.Visibility = Visibility.Hidden;
fLoadFrame.Content = new CustomBaseFrame(mvm.LBases[cbCombo.SelectedIndex], console, insertedConfig);
}
else
{
id.Visibility = Visibility.Visible;
{
id.Visibility = Visibility.Hidden;
idtxt.Visibility = Visibility.Hidden;
fLoadFrame.Content = new CustomBaseFrame(mvm.LBases[cbCombo.SelectedIndex], console, insertedConfig);
}
else
{
id.Visibility = Visibility.Visible;
idtxt.Visibility = Visibility.Visible;
fLoadFrame.Content = new NonCustomBaseFrame(mvm.LBases[cbCombo.SelectedIndex], console, insertedConfig, this);
idtxt.Content = mvm.GameConfiguration.BaseRom.Tid;
}
mvm.OldIndex = cbCombo.SelectedIndex;
idtxt.Visibility = Visibility.Visible;
fLoadFrame.Content = new NonCustomBaseFrame(mvm.LBases[cbCombo.SelectedIndex], console, insertedConfig, this);
idtxt.Content = mvm.GameConfiguration.BaseRom.Tid;
}
mvm.OldIndex = cbCombo.SelectedIndex;
}
}
catch (Exception)

2
UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/CustomBaseFrame.xaml
View file

@ -9,7 +9,7 @@
Title="CustomBaseFrame" Height="239">
<Grid DataContext="{StaticResource mvm}">
<TextBox materialDesign:HintAssist.Hint="BASE PATH" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="0,5,108,191" Background="{x:Null}" Foreground="Black" SelectionBrush="#FF00C3D7" CaretBrush="#FF21C3F3" FontSize="18" Text="{Binding CBasePath}" IsReadOnly="True" Focusable="False" />
<TextBox materialDesign:HintAssist.Hint="BASE PATH" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="0,5,108,191" Background="{x:Null}" Foreground="Black" SelectionBrush="#FF00C3D7" CaretBrush="#FF21C3F3" FontSize="18" Text="{Binding CBasePath}" IsReadOnly="True" Focusable="False" Name="bar" />
<Button Content="Set Path" HorizontalAlignment="Left" Margin="280,21,0,0" VerticalAlignment="Top" Width="103" Height="26" Click="Button_Click" IsEnabled="{Binding Ckeys}" Name="path"/>
<TextBlock x:Name="tbCode" HorizontalAlignment="Center" Margin="10,67,10,0" TextWrapping="Wrap" Text="Code folder not found" VerticalAlignment="Top" TextAlignment="Center" Width="363" FontSize="20" Foreground="DarkRed"/>
<TextBlock x:Name="tbContent" HorizontalAlignment="Center" Margin="10,102,10,0" TextWrapping="Wrap" Text="Content folder not found" VerticalAlignment="Top" TextAlignment="Center" Width="363" FontSize="20" Foreground="DarkRed"/>

3
UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/CustomBaseFrame.xaml.cs
View file

@ -41,12 +41,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
tbMeta.Foreground = new SolidColorBrush(Color.FromRgb(205, 50, 50));
mvm = (MainViewModel)FindResource("mvm");
bases = Base;
mvm.isCkeySet();
this.existing = existing;
this.console = console;
mvm.SetCBASE(this);
if (mvm.Ckeys)
{
CK.Visibility = Visibility.Hidden;
path.IsEnabled = true;
}
}
@ -101,6 +103,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
gb.Name = "Custom";
gb.Region = Regions.EU;
gb.Path = mvm.GameConfiguration.CBasePath;
bar.Text = gb.Path;
mvm.GameConfiguration.BaseRom = gb;
tbCode.Text = "Code Folder exists";
tbCode.Foreground = new SolidColorBrush(Color.FromRgb(50, 205, 50));

4
UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml
View file

@ -27,9 +27,9 @@
<StackPanel Margin="10,20,244,436" Orientation="Horizontal" ToolTip="This may not work with every Game">
<Label Content="DarkFilter:" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Width="102"/>
<RadioButton Content="Keep" Width="78" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top" GroupName="df" IsChecked="True"/>
<RadioButton Content="Keep" Width="78" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top" GroupName="df" IsChecked="True" Click="RadioButton_Click"/>
<RadioButton x:Name="rbRDF" Width="111" Content="Remove" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top" GroupName="df" IsChecked="{Binding GameConfiguration.N64Stuff.DarkFilter}"/>
<RadioButton x:Name="rbRDF" Width="111" Content="Remove" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top" GroupName="df" Click="rbRDF_Click"/>
</StackPanel>
</Grid>
</Page>

10
UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml.cs
View file

@ -175,5 +175,15 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
gn.CaretIndex = gn.Text.Length;
gn.ScrollToHorizontalOffset(double.MaxValue);
}
private void rbRDF_Click(object sender, RoutedEventArgs e)
{
mvm.GameConfiguration.N64Stuff.DarkFilter = true;
}
private void RadioButton_Click(object sender, RoutedEventArgs e)
{
mvm.GameConfiguration.N64Stuff.DarkFilter = false;
}
}
}

22
UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs
View file

@ -58,8 +58,26 @@ namespace UWUVCI_AIO_WPF.UI.Windows
private void Folder_Click(object sender, RoutedEventArgs e)
{
Process.Start(path);
this.Close();
try
{
if (File.Exists(path)) path = new FileInfo(path).DirectoryName;
Process.Start(path);
this.Close();
}
catch (Exception)
{
Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.");
try
{
cm.Owner = (FindResource("mvm") as MainViewModel).mw;
}catch(Exception)
{
}
cm.ShowDialog();
this.Close();
}
}
private void Reset_Click(object sender, RoutedEventArgs e)

5
UWUVCI AIO WPF/UI/Windows/DownloadWait.xaml.cs
View file

@ -22,13 +22,13 @@ namespace UWUVCI_AIO_WPF.UI.Windows
partial class DownloadWait : Window
{
MainViewModel mvm;
DispatcherTimer timer = new DispatcherTimer();
public DownloadWait(string doing, string msg, MainViewModel mvm)
{
this.mvm = mvm;
InitializeComponent();
Key.Text = doing;
DispatcherTimer timer = new DispatcherTimer();
timer.Interval = TimeSpan.FromSeconds(1);
timer.Tick += timer_Tick;
timer.Start();
@ -57,6 +57,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
}
if(mvm.Progress == 100)
{
timer.Stop();
Close();
}