fixed some minor issues
This commit is contained in:
Xpl0itR
parent
d0ff8f44ae
commit
607fd55624
7 changed files with 101 additions and 54 deletions
|
|
@ -199,7 +199,7 @@ namespace Ryujinx.HLE
|
|||
if (Path.GetExtension(applicationPath) == ".xci") { applicationIcon = RyujinxXciIcon; }
|
||||
else { applicationIcon = RyujinxNspIcon; }
|
||||
|
||||
Logger.PrintError(LogClass.Application, $"Unable to decrypt NCA header. The header key must be incorrect. File: {applicationPath}");
|
||||
Logger.PrintError(LogClass.Application, $"The file is not an NCA file or the header key is incorrect. Errored File: {applicationPath}");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ namespace Ryujinx
|
|||
/// <summary>
|
||||
/// Dumps shaders in this local directory
|
||||
/// </summary>
|
||||
public string GraphicsShadersDumpPath { get; private set; }
|
||||
public string GraphicsShadersDumpPath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Enables printing debug log messages
|
||||
|
|
@ -246,11 +246,13 @@ namespace Ryujinx
|
|||
{
|
||||
GraphicsConfig.ShadersDumpPath = SwitchConfig.GraphicsShadersDumpPath;
|
||||
|
||||
Logger.SetEnable(LogLevel.Debug , SwitchConfig.LoggingEnableDebug);
|
||||
Logger.SetEnable(LogLevel.Debug , SwitchConfig.LoggingEnableDebug );
|
||||
Logger.SetEnable(LogLevel.Stub , SwitchConfig.LoggingEnableStub );
|
||||
Logger.SetEnable(LogLevel.Info , SwitchConfig.LoggingEnableInfo );
|
||||
Logger.SetEnable(LogLevel.Warning, SwitchConfig.LoggingEnableWarn );
|
||||
Logger.SetEnable(LogLevel.Error , SwitchConfig.LoggingEnableError);
|
||||
Logger.SetEnable(LogLevel.Warning , SwitchConfig.LoggingEnableWarn );
|
||||
Logger.SetEnable(LogLevel.Error , SwitchConfig.LoggingEnableError );
|
||||
Logger.SetEnable(LogLevel.Guest , SwitchConfig.LoggingEnableGuest );
|
||||
Logger.SetEnable(LogLevel.AccessLog, SwitchConfig.LoggingEnableFsAccessLog);
|
||||
|
||||
if (SwitchConfig.LoggingFilteredClasses.Length > 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
<OutputType>Exe</OutputType>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Configurations>Debug;Release;Profile Debug;Profile Release</Configurations>
|
||||
<ApplicationIcon>ryujinx.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile Release|AnyCPU'">
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ namespace Ryujinx.UI
|
|||
[GUI] MenuItem ReturnMain;
|
||||
[GUI] MenuItem Nfc;
|
||||
[GUI] Box Box;
|
||||
[GUI] ScrolledWindow GameTableWindow;
|
||||
[GUI] TreeView GameTable;
|
||||
[GUI] GLArea GlScreen;
|
||||
#pragma warning restore 649
|
||||
|
|
@ -287,9 +286,9 @@ namespace Ryujinx.UI
|
|||
}
|
||||
}
|
||||
}
|
||||
catch (ArgumentNullException exception)
|
||||
catch (ArgumentNullException)
|
||||
{
|
||||
Logger.PrintError(LogClass.Application, $"Could not access save path to retrieve time/last played data using: UserID: {userId}, TitleID: {_device.System.TitleID}\nException: {exception}");
|
||||
Logger.PrintError(LogClass.Application, $"Could not access save path to retrieve time/last played data using: UserID: {userId}, TitleID: {_device.System.TitleID}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -299,12 +298,16 @@ namespace Ryujinx.UI
|
|||
using (GlScreen screen = new GlScreen(_device, _renderer))
|
||||
{
|
||||
screen.MainLoop();
|
||||
|
||||
End();
|
||||
}
|
||||
}
|
||||
|
||||
private static void End()
|
||||
{
|
||||
string userId = "00000000000000000000000000000001";
|
||||
if (_GameLoaded)
|
||||
{
|
||||
try
|
||||
{
|
||||
string appdataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
||||
|
|
@ -335,9 +338,10 @@ namespace Ryujinx.UI
|
|||
}
|
||||
}
|
||||
}
|
||||
catch (ArgumentNullException exception)
|
||||
catch (ArgumentNullException)
|
||||
{
|
||||
Logger.PrintError(LogClass.Application, $"Could not access save path to retrieve time/last played data using: UserID: {userId}, TitleID: {_device.System.TitleID}\nException: {exception}");
|
||||
Logger.PrintError(LogClass.Application, $"Could not access save path to retrieve time/last played data using: UserID: {userId}, TitleID: {_device.System.TitleID}");
|
||||
}
|
||||
}
|
||||
|
||||
Profile.FinishProfiling();
|
||||
|
|
@ -404,7 +408,7 @@ namespace Ryujinx.UI
|
|||
|
||||
private void ReturnMain_Pressed(object o, EventArgs args)
|
||||
{
|
||||
//TODO: Write logic to kill running game
|
||||
// TODO: Write logic to kill running game
|
||||
}
|
||||
|
||||
private void FullScreen_Toggled(object o, EventArgs args)
|
||||
|
|
@ -429,7 +433,7 @@ namespace Ryujinx.UI
|
|||
|
||||
if (fc.Run() == (int)ResponseType.Accept)
|
||||
{
|
||||
//TODO: Write logic to emulate reading an NFC tag
|
||||
// TODO: Write logic to emulate reading an NFC tag
|
||||
}
|
||||
fc.Destroy();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ namespace Ryujinx.UI
|
|||
[GUI] ToggleButton BrowseDir;
|
||||
[GUI] ToggleButton RemoveDir;
|
||||
[GUI] Entry LogPath;
|
||||
[GUI] Entry GraphicsShadersDumpPath;
|
||||
[GUI] Image ControllerImage;
|
||||
|
||||
[GUI] ComboBoxText Controller1Type;
|
||||
|
|
@ -184,6 +185,7 @@ namespace Ryujinx.UI
|
|||
ZR1.Label = SwitchConfig.KeyboardControls.RightJoycon.ButtonZr.ToString();
|
||||
|
||||
CustThemeDir.Buffer.Text = SwitchConfig.CustomThemePath;
|
||||
GraphicsShadersDumpPath.Buffer.Text = SwitchConfig.GraphicsShadersDumpPath;
|
||||
FGALMSpinAdjustment.Value = SwitchConfig.FsGlobalAccessLogMode;
|
||||
|
||||
GameDirsBox.AppendColumn("", new CellRendererText(), "text", 0);
|
||||
|
|
@ -378,10 +380,10 @@ namespace Ryujinx.UI
|
|||
SwitchConfig.SystemLanguage = (SystemLanguage)Enum.Parse(typeof(SystemLanguage), SystemLanguageSelect.ActiveId);
|
||||
SwitchConfig.ControllerType = (ControllerStatus)Enum.Parse(typeof(ControllerStatus), Controller1Type.ActiveId);
|
||||
SwitchConfig.CustomThemePath = CustThemeDir.Buffer.Text;
|
||||
SwitchConfig.GraphicsShadersDumpPath = GraphicsShadersDumpPath.Buffer.Text;
|
||||
SwitchConfig.GameDirs = gameDirs;
|
||||
SwitchConfig.FsGlobalAccessLogMode = (int)FGALMSpinAdjustment.Value;
|
||||
|
||||
|
||||
Configuration.SaveConfig(SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
|
||||
Configuration.Configure(Device, SwitchConfig);
|
||||
MainWindow.ApplyTheme();
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Icon Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Developer Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -243,7 +243,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Time Played Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -273,7 +273,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Title Name/ID Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Version Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -309,7 +309,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Last Played Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -339,7 +339,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable file extension column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -357,7 +357,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable File Size Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -375,7 +375,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
|
||||
<property name="tooltip_text" translatable="yes">Enable or Disable Path Column in the game list</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
|
|
@ -1729,6 +1729,46 @@
|
|||
<property name="position">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Graphics Shaders Dump Path</property>
|
||||
<property name="label" translatable="yes">Graphics Shaders Dump Path:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="padding">5</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkEntry" id="GraphicsShadersDumpPath">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Graphics Shaders Dump Path</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="caps_lock_warning">False</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="padding">5</property>
|
||||
<property name="position">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 85 KiB |
Loading…
Add table
Add a link
Reference in a new issue