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

added check for updates + checking when closing

Browse Source
This commit is contained in:
iAmAsval 2020-08-07 12:17:22 +02:00
parent 15597adac4
commit 0a99506270
15 changed files with 30 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FModel/FModel.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>WinExe</OutputType>

6
FModel/MainWindow.xaml
View File

@ -179,11 +179,17 @@
<Image Source="Resources/discord.png"/>
</MenuItem.Icon>
</MenuItem>
<Separator/>
<MenuItem x:Name="FModel_MI_Help_About" Header="{x:Static properties:Resources.AboutF}" Click="FModel_MI_Help_About_Click">
<MenuItem.Icon>
<Image Source="Resources/information.png"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem x:Name="FModel_MI_Help_Updates" Header="{x:Static properties:Resources.CheckForUpdates}" Click="FModel_MI_Help_Updates_Click">
<MenuItem.Icon>
<Image Source="Resources/refresh.png"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
</Menu>

6
FModel/MainWindow.xaml.cs
View File

@ -47,6 +47,7 @@ namespace FModel
private async void OnClosing(object sender, CancelEventArgs e)
{
Updater.CheckForUpdate();
Globals.gNotifier.Dispose();
Tasks.TokenSource?.Dispose();
DiscordIntegration.Dispose();
@ -68,7 +69,6 @@ namespace FModel
FModel_MI_Assets_GoTo.ItemsSource = MenuItems.customGoTos;
FModel_AssetsPathTree.ItemsSource = SortedTreeviewVm.gameFilesPath.ChildrensView;
Updater.CheckForUpdate();
DebugHelper.WriteUserSettings();
Folders.CheckWatermarks();
@ -266,6 +266,10 @@ namespace FModel
}
else { FWindows.GetOpenedWindow<Window>(Properties.Resources.AboutF).Focus(); }
}
private void FModel_MI_Help_Updates_Click(object sender, RoutedEventArgs e)
{
Updater.CheckForUpdate();
}
#endregion
#region TREEVIEW

1
FModel/PakReader/Parsers/Objects/EPakVersion.cs
View File

@ -14,6 +14,7 @@ namespace PakReader.Parsers.Objects
FNAME_BASED_COMPRESSION_METHOD = 8, // UE4.22+ - use string instead of enum for compression method
FROZEN_INDEX = 9,
PATH_HASH_INDEX = 10,
FNV64BUGFIX = 11,
LAST,

27
FModel/Properties/Resources.Designer.cs generated
View File

@ -462,6 +462,15 @@ namespace FModel.Properties {
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Check For Updates.
/// </summary>
public static string CheckForUpdates {
get {
return ResourceManager.GetString("CheckForUpdates", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Chinese (Simplified).
/// </summary>
@ -1834,15 +1843,6 @@ namespace FModel.Properties {
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Open.
/// </summary>
public static string Open {
get {
return ResourceManager.GetString("Open", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Open Image.
/// </summary>
@ -2662,15 +2662,6 @@ namespace FModel.Properties {
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Use FModel in English.
/// </summary>
public static string UseFEnglish {
get {
return ResourceManager.GetString("UseFEnglish", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Use game colors.
/// </summary>

6
FModel/Properties/Resources.ar.resx
View File

@ -541,9 +541,6 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="Opacity" xml:space="preserve">
<value>التعتيم</value>
</data>
<data name="Open" xml:space="preserve">
<value>افتح</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>افتح الصورة</value>
</data>
@ -769,9 +766,6 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="CopyImage" xml:space="preserve">
<value>انسخ الصورة</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>استخدم Fmodel باللغة الإنجليزية</value>
</data>
<data name="NoBackground" xml:space="preserve">
<value>أي خلفية</value>
</data>

6
FModel/Properties/Resources.de-DE.resx
View File

@ -505,9 +505,6 @@ Jetzt ist es die am häufigsten genutzte freie Software um mit Fortnite zu leake
<data name="Opacity" xml:space="preserve">
<value>Deckkraft</value>
</data>
<data name="Open" xml:space="preserve">
<value>Öffnen</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Bild öffnen</value>
</data>
@ -806,9 +803,6 @@ Jetzt ist es die am häufigsten genutzte freie Software um mit Fortnite zu leake
<data name="CopyImage" xml:space="preserve">
<value>Bild kopieren</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>FModel in Englisch benutzen</value>
</data>
<data name="NoBackground" xml:space="preserve">
<value>Kein Hintergrund</value>
</data>

6
FModel/Properties/Resources.es.resx
View File

@ -688,9 +688,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite.</value>
<data name="Opacity" xml:space="preserve">
<value>Opacidad</value>
</data>
<data name="Open" xml:space="preserve">
<value>Abrir</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Abrir imagen</value>
</data>
@ -1022,9 +1019,6 @@ Ahora es el software gratuito más utilizado para filtrar en Fortnite.</value>
<data name="NoImageToCopy" xml:space="preserve">
<value>Actualmente no hay imagen para copiar</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>Usar FModel en Inglés</value>
</data>
<data name="NoBackground" xml:space="preserve">
<value>Sin fondo</value>
</data>

9
FModel/Properties/Resources.fr-FR.resx
View File

@ -564,9 +564,6 @@ C'est maintenant le logiciel gratuit le plus utilisé pour leak sur Fortnite.</v
<data name="Opacity" xml:space="preserve">
<value>Opacité</value>
</data>
<data name="Open" xml:space="preserve">
<value>Ouvrir</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Ouvrir l'Image</value>
</data>
@ -813,9 +810,6 @@ C'est maintenant le logiciel gratuit le plus utilisé pour leak sur Fortnite.</v
<data name="NoImageToCopy" xml:space="preserve">
<value>Il n'y a actuellement aucune image à copier</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>Utiliser FModel en Anglais</value>
</data>
<data name="NoBackground" xml:space="preserve">
<value>Pas de fond</value>
</data>
@ -828,4 +822,7 @@ C'est maintenant le logiciel gratuit le plus utilisé pour leak sur Fortnite.</v
<data name="NoKeyWarning" xml:space="preserve">
<value>Un fichier .PAK chiffré a été trouvé. Afin de le déchiffrer, veuillez spécifier une clé de chiffrement AES fonctionnelle</value>
</data>
<data name="CheckForUpdates" xml:space="preserve">
<value>Vérifier les Mises à Jour</value>
</data>
</root>

6
FModel/Properties/Resources.it-IT.resx
View File

@ -538,9 +538,6 @@ Col tempo sono state aggiunte nuove funzioni e molti altri utenti hanno comincia
<data name="Opacity" xml:space="preserve">
<value>Opacità</value>
</data>
<data name="Open" xml:space="preserve">
<value>Apri</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Apri Immagine</value>
</data>
@ -769,9 +766,6 @@ Col tempo sono state aggiunte nuove funzioni e molti altri utenti hanno comincia
<data name="CopyImage" xml:space="preserve">
<value>Copia Immagine</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>Usa FModel in inglese</value>
</data>
<data name="NoImageToCopy" xml:space="preserve">
<value>Al momento non ci sono immagini da copiare</value>
</data>

6
FModel/Properties/Resources.ja-JP.resx
View File

@ -739,9 +739,6 @@
<data name="Name" xml:space="preserve">
<value>名前</value>
</data>
<data name="Open" xml:space="preserve">
<value>開く</value>
</data>
<data name="Help" xml:space="preserve">
<value>ヘルプ</value>
</data>
@ -772,9 +769,6 @@
<data name="NoImageToCopy" xml:space="preserve">
<value>現在、コピーする画像はありません</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>FModelを英語で使用する</value>
</data>
<data name="UseDiscordRpc" xml:space="preserve">
<value>Discord RPCを使用する</value>
</data>

9
FModel/Properties/Resources.resx
View File

@ -703,9 +703,6 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="Opacity" xml:space="preserve">
<value>Opacity</value>
</data>
<data name="Open" xml:space="preserve">
<value>Open</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Open Image</value>
</data>
@ -1048,9 +1045,6 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="NoImageToCopy" xml:space="preserve">
<value>There is currently no image to copy</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>Use FModel in English</value>
</data>
<data name="NoBackground" xml:space="preserve">
<value>No Background</value>
</data>
@ -1081,4 +1075,7 @@ It's now the most used free software to leak on Fortnite.</value>
<data name="NoKeyWarning" xml:space="preserve">
<value>An encrypted .PAK file has been found. In order to decrypt it, please specify a working AES encryption key</value>
</data>
<data name="CheckForUpdates" xml:space="preserve">
<value>Check For Updates</value>
</data>
</root>

6
FModel/Properties/Resources.ru-RU.resx
View File

@ -438,9 +438,6 @@
<data name="Opacity" xml:space="preserve">
<value>Прозрачность</value>
</data>
<data name="Open" xml:space="preserve">
<value>Открыть</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>Открыть изображение</value>
</data>
@ -744,9 +741,6 @@
<data name="CopyImage" xml:space="preserve">
<value>Скопировать изображение</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>Использовать FModel на Английском</value>
</data>
<data name="FilePathNoExt" xml:space="preserve">
<value>Путь файлу без расширения</value>
</data>

8
FModel/Properties/Resources.zh-CN.resx
View File

@ -550,9 +550,6 @@
<data name="Opacity" xml:space="preserve">
<value>不透明度</value>
</data>
<data name="Open" xml:space="preserve">
<value>开放</value>
</data>
<data name="OpenImage" xml:space="preserve">
<value>开启图片</value>
</data>
@ -742,9 +739,6 @@
<data name="UseDiscordRpc" xml:space="preserve">
<value>使用Discord RPC</value>
</data>
<data name="UseFEnglish" xml:space="preserve">
<value>英文使用FModel</value>
</data>
<data name="UseGameColors" xml:space="preserve">
<value>使用游戏颜色</value>
</data>
@ -790,4 +784,4 @@
<data name="NoKeyWarning" xml:space="preserve">
<value>找到一个加密的.PAK文件。要解密文件，请设置正确的AES加密密钥。</value>
</data>
</root>
</root>

2
FModel/Utils/Paks.cs
View File

@ -90,7 +90,7 @@ namespace FModel.Utils
{
DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[RiotClientInstalls.json]", installs);
InstallsJson installsJson = JsonConvert.DeserializeObject<InstallsJson>(File.ReadAllText(installs));
if (installsJson?.AssociatedClient.Count > 0)
if (installsJson != null && installsJson.AssociatedClient.Count > 0)
{
foreach (var KvP in installsJson.AssociatedClient)
if (KvP.Key.Contains("VALORANT/live/"))