Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-06-23 16:30:35 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added option to enable/disable AES reload.

Browse Source
This commit is contained in:
MaikyM 2019-10-27 20:27:17 -06:00
parent e9a4a1051b
commit 8240be42e0
8 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FModel/App.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -79,6 +79,9 @@
<setting name="FUpdateSettings" serializeAs="String">
<value>True</value>
</setting>
<setting name="ReloadAES" serializeAs="String">
<value>True</value>
</setting>
</FModel.Properties.Settings>
</userSettings>
<runtime>

2
FModel/FModel.csproj
View File

@ -43,6 +43,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
@ -54,6 +55,7 @@
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Logo.ico</ApplicationIcon>

4
FModel/FModel_Main.xaml
View File

@ -1,4 +1,4 @@
<Window
<Window
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -37,6 +37,8 @@
<MenuItem x:Name="MI_LoadOnePAK" Header="Load One PAK" IsEnabled="False"/>
<MenuItem x:Name="MI_LoadAllPAKs" Header="Load All PAKs" Padding="2,4,2,2" IsEnabled="False" Click="MI_LoadAllPAKs_Click"/>
<Separator/>
<MenuItem x:Name="reloadAES" Header="Reload AES Key" Click="MenuItem_Click"/>
<Separator/>
<MenuItem x:Name="MI_DownloadBackups" Header="Download Backups"/>
<MenuItem x:Name="MI_BackupPAKs" Header="Backup PAKs" Click="MI_BackupPAKs_Click" IsEnabled="False"/>
<Separator/>

10
FModel/FModel_Main.xaml.cs
View File

@ -1,4 +1,4 @@
using AutoUpdaterDotNET;
using AutoUpdaterDotNET;
using FModel.Forms;
using FModel.Forms.HexViewer;
using FModel.Methods;
@ -51,7 +51,8 @@ namespace FModel
FoldersUtility.LoadFolders();
FoldersUtility.CheckWatermark();
RegisterFromPath.FilterPAKs();
DynamicKeysChecker.SetDynamicKeys();
if (FProp.Default.ReloadAES)
DynamicKeysChecker.SetDynamicKeys();
RegisterDownloadedBackups.LoadBackupFiles();
}).ContinueWith(TheTask =>
{
@ -356,5 +357,10 @@ namespace FModel
}
}
#endregion
private void MenuItem_Click(object sender, RoutedEventArgs e)
{
DynamicKeysChecker.SetDynamicKeys();
}
}
}

19
FModel/Forms/FModel_Settings.xaml
View File

@ -1,4 +1,4 @@
<Window x:Class="FModel.Forms.FModel_Settings"
<Window x:Class="FModel.Forms.FModel_Settings"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -6,7 +6,7 @@
xmlns:local="clr-namespace:FModel.Forms"
mc:Ignorable="d"
Title="Settings"
Height="558"
Height="585"
Width="610"
Style="{StaticResource {x:Type Window}}"
WindowStartupLocation="CenterScreen"
@ -14,22 +14,23 @@
ResizeMode="CanMinimize" Loaded="Window_Loaded"
>
<Grid>
<GroupBox Header=".PAK Files" HorizontalAlignment="Left" Height="48" Margin="10,10,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<GroupBox Header=".PAK Files" HorizontalAlignment="Left" Height="72" Margin="10,10,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<Grid>
<Label Content="Input:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,1,0,0"/>
<TextBox x:Name="InputTextBox" Height="19" Margin="41,4,121,0" TextWrapping="NoWrap" VerticalAlignment="Top" Foreground="#FFEFEFEF"/>
<Button x:Name="BrowseInput_Button" Content="..." HorizontalAlignment="Left" Margin="446,4,0,0" VerticalAlignment="Top" Width="20" Click="BrowseInput_Button_Click"/>
<CheckBox x:Name="bDiffFileSize" Content="Diff w/ File Size" HorizontalAlignment="Left" Margin="471,7,0,0" VerticalAlignment="Top"/>
<TextBox x:Name="InputTextBox" Height="19" Margin="41,4,35,0" TextWrapping="NoWrap" VerticalAlignment="Top" Foreground="#FFEFEFEF"/>
<Button x:Name="BrowseInput_Button" Content="..." HorizontalAlignment="Left" Margin="532,4,0,0" VerticalAlignment="Top" Width="20" Click="BrowseInput_Button_Click"/>
<CheckBox x:Name="bDiffFileSize" Content="Diff w/ File Size" HorizontalAlignment="Left" Margin="10,31,0,0" VerticalAlignment="Top"/>
<CheckBox x:Name="checkReloadAES" Content="AES reload automatically" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="120,31,0,0" Width="148" IsChecked="True"/>
</Grid>
</GroupBox>
<GroupBox Header="Extraction" HorizontalAlignment="Left" Height="48" Margin="10,63,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<GroupBox Header="Extraction" HorizontalAlignment="Left" Height="48" Margin="10,87,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<Grid>
<Label Content="Output:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,2,0,-1"/>
<TextBox x:Name="OutputTextBox" Height="19" Margin="50,4,35,0" TextWrapping="NoWrap" VerticalAlignment="Top" Foreground="#FFEFEFEF"/>
<Button x:Name="BrowseOutput_Button" Content="..." HorizontalAlignment="Left" Margin="532,4,0,0" VerticalAlignment="Top" Width="20" Click="BrowseOutput_Button_Click"/>
</Grid>
</GroupBox>
<GroupBox Header="Icon Creator" HorizontalAlignment="Left" Height="206" Margin="10,116,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<GroupBox Header="Icon Creator" HorizontalAlignment="Left" Height="206" Margin="10,140,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<Grid>
<Label Content="Language:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,2,0,0"/>
<ComboBox x:Name="ComboBox_Language" HorizontalAlignment="Left" Margin="61,5,0,0" VerticalAlignment="Top" Width="332" BorderBrush="#7F748198" Background="#FF333C46">
@ -75,7 +76,7 @@
<Button x:Name="OpenIconCreator_Button" Content="Open Image" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="164" Click="OpenIconCreator_Button_Click"/>
</Grid>
</GroupBox>
<GroupBox Header="Challenges Theme" HorizontalAlignment="Left" Height="155" Margin="10,327,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<GroupBox Header="Challenges Theme" HorizontalAlignment="Left" Height="155" Margin="10,351,0,0" VerticalAlignment="Top" Width="574" BorderBrush="#7F748198">
<Grid>
<Label Content="Watermark:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,2,0,-1"/>
<TextBox x:Name="WatermarkChallenge_TextBox" Height="19" Margin="69,4,263,0" TextWrapping="NoWrap" VerticalAlignment="Top" Foreground="#FFEFEFEF" TextChanged="UpdateChallengeCustomTheme"/>

5
FModel/Forms/FModel_Settings.xaml.cs
View File

@ -1,4 +1,4 @@
using FModel.Methods.MessageBox;
using FModel.Methods.MessageBox;
using System.Windows;
using System;
using FProp = FModel.Properties.Settings;
@ -108,6 +108,7 @@ namespace FModel.Forms
InputTextBox.Text = FProp.Default.FPak_Path;
bDiffFileSize.IsChecked = FProp.Default.FDiffFileSize;
OutputTextBox.Text = FProp.Default.FOutput_Path;
checkReloadAES.IsChecked = FProp.Default.ReloadAES;
ComboBox_Language.SelectedIndex = (int)GetEnumValueFromDescription<LIndexes>(FProp.Default.FLanguage);
ComboBox_Design.SelectedIndex = (int)GetEnumValueFromDescription<RIndexes>(FProp.Default.FRarity_Design);
@ -137,7 +138,9 @@ namespace FModel.Forms
FProp.Default.FPak_Path = InputTextBox.Text;
DarkMessageBox.Show("Please, restart FModel to apply your new input path", "FModel Input Path Changed", MessageBoxButton.OK, MessageBoxImage.Information);
}
FProp.Default.FDiffFileSize = (bool)bDiffFileSize.IsChecked;
FProp.Default.ReloadAES = (bool)checkReloadAES.IsChecked;
if (!string.Equals(FProp.Default.FOutput_Path, OutputTextBox.Text))
{

22
FModel/Properties/Settings.Designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
// Version du runtime :4.0.30319.42000
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.42000
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// </auto-generated>
//------------------------------------------------------------------------------
@ -12,7 +12,7 @@ namespace FModel.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -298,5 +298,17 @@ namespace FModel.Properties {
this["FUpdateSettings"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ReloadAES {
get {
return ((bool)(this["ReloadAES"]));
}
set {
this["ReloadAES"] = value;
}
}
}
}

3
FModel/Properties/Settings.settings
View File

@ -71,5 +71,8 @@
<Setting Name="FUpdateSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="ReloadAES" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>