mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2026-05-25 10:02:25 +00:00
Whoops. Remove all that stuff for user options.
This commit is contained in:
parent
92602fb374
commit
986be95332
2 changed files with 33 additions and 57 deletions
|
|
@ -10,52 +10,6 @@ namespace Ryujinx.Common
|
|||
// My code is crappy and I know it. Props to VewDev for assisting me in these shenanigans. - Awesomeangotti
|
||||
public class SplashTextHelper
|
||||
{
|
||||
// These variables will be set to something once I figure out how to implement user selectable options. Perhaps just check and assign at boot?
|
||||
private static bool s_loadingSplashEnabled = true;
|
||||
|
||||
private static bool s_logSplashEnabled = true;
|
||||
|
||||
private static bool s_titleSplashEnabled = true;
|
||||
|
||||
private static string s_finalSplash = "";
|
||||
|
||||
private static string GetSplash()
|
||||
{
|
||||
if (string.IsNullOrEmpty(s_finalSplash))
|
||||
{
|
||||
s_finalSplash = _GetLangJson();
|
||||
if (string.IsNullOrEmpty(s_finalSplash))
|
||||
{
|
||||
s_finalSplash = "Splash Text";
|
||||
}
|
||||
}
|
||||
return $"{s_finalSplash}";
|
||||
}
|
||||
|
||||
public static string GetTitleSplash()
|
||||
{
|
||||
if (s_titleSplashEnabled)
|
||||
{
|
||||
if (OperatingSystem.IsMacOS())
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
return $" - {GetSplash()}";
|
||||
}
|
||||
return "";
|
||||
|
||||
}
|
||||
|
||||
public static string GetLoadingSplash()
|
||||
{
|
||||
if (s_loadingSplashEnabled)
|
||||
{
|
||||
return $"\"{GetSplash()}\"";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public static void PrintSplash()
|
||||
{
|
||||
Logger.Notice.Print(LogClass.Application, " ___ __ _ ");
|
||||
|
|
@ -63,18 +17,40 @@ namespace Ryujinx.Common
|
|||
Logger.Notice.Print(LogClass.Application, @" / , _/ / // // // / / _ \ / / / _ \ / _ `/");
|
||||
Logger.Notice.Print(LogClass.Application, @"/_/|_| \_, / \_,_/ /_.__//_/ /_//_/ \_, / ");
|
||||
Logger.Notice.Print(LogClass.Application, " /___/ /___/ ");
|
||||
|
||||
if (s_logSplashEnabled)
|
||||
Logger.Notice.Print(LogClass.Application, "");
|
||||
Logger.Notice.Print(LogClass.Application, GetSplash());
|
||||
Logger.Notice.Print(LogClass.Application, "");
|
||||
}
|
||||
|
||||
private static string s_finalSplash = "";
|
||||
|
||||
public static string GetSplash()
|
||||
{
|
||||
if (string.IsNullOrEmpty(s_finalSplash))
|
||||
{
|
||||
Logger.Notice.Print(LogClass.Application, "");
|
||||
Logger.Notice.Print(LogClass.Application, GetSplash());
|
||||
Logger.Notice.Print(LogClass.Application, "");
|
||||
s_finalSplash = GetLangJson();
|
||||
if (string.IsNullOrEmpty(s_finalSplash))
|
||||
{
|
||||
s_finalSplash = "Splash Text";
|
||||
}
|
||||
}
|
||||
|
||||
return $"{s_finalSplash}";
|
||||
}
|
||||
|
||||
public static string GetTitleSplash()
|
||||
{
|
||||
if (OperatingSystem.IsMacOS())
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
return $" - {GetSplash()}";
|
||||
}
|
||||
|
||||
private static SplashLocales s_SplashJson;
|
||||
private static SplashLocales s_splashJson;
|
||||
|
||||
private static string _GetLangJson()
|
||||
private static string GetLangJson()
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -85,9 +61,9 @@ namespace Ryujinx.Common
|
|||
path = path.Replace('.', '/');
|
||||
path = path.Append(".json");
|
||||
data = EmbeddedResources.ReadAllText(path);
|
||||
s_SplashJson = JsonSerializer.Deserialize<SplashLocales>(data);
|
||||
s_splashJson = JsonSerializer.Deserialize<SplashLocales>(data);
|
||||
}
|
||||
return s_SplashJson.Locales[ConfigurationState.Instance.UI.LanguageCode.Value].GetRandomElement();
|
||||
return s_splashJson.Locales[ConfigurationState.Instance.UI.LanguageCode.Value].GetRandomElement();
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
@ -97,7 +73,7 @@ namespace Ryujinx.Common
|
|||
|
||||
private struct SplashLocales
|
||||
{
|
||||
public Dictionary<string, List<string>> Locales { get; }
|
||||
public Dictionary<string, List<string>> Locales { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1196,7 +1196,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||
break;
|
||||
case ShaderCacheLoadingState shaderCacheState:
|
||||
CacheLoadStatus = $"{current} / {total}";
|
||||
Splash = $"{SplashTextHelper.GetLoadingSplash()}";
|
||||
Splash = $"\"{SplashTextHelper.GetSplash()}\"";
|
||||
switch (shaderCacheState)
|
||||
{
|
||||
case ShaderCacheLoadingState.Start:
|
||||
|
|
|
|||
Loading…
Reference in a new issue