emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Move the open logs folder from setting into the File menu in the main window (#1550)

Browse source
This commit is contained in:
Xpl0itR 2020-09-20 05:31:05 +01:00 committed by GitHub
parent 31a84eedcb
commit d0e36b7b19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Ryujinx/Ui/MainWindow.cs
View file

@ -882,7 +882,7 @@ namespace Ryujinx.Ui
private void Open_Ryu_Folder(object sender, EventArgs args) private void Open_Ryu_Folder(object sender, EventArgs args)
{ {
Process.Start(new ProcessStartInfo() Process.Start(new ProcessStartInfo
{ {
FileName = AppDataManager.BaseDirPath, FileName = AppDataManager.BaseDirPath,
UseShellExecute = true, UseShellExecute = true,
@ -890,6 +890,21 @@ namespace Ryujinx.Ui
}); });
} }
private void OpenLogsFolder_Pressed(object sender, EventArgs args)
{
string logPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs");
DirectoryInfo directory = new DirectoryInfo(logPath);
directory.Create();
Process.Start(new ProcessStartInfo
{
FileName = logPath,
UseShellExecute = true,
Verb = "open"
});
}
private void Exit_Pressed(object sender, EventArgs args) private void Exit_Pressed(object sender, EventArgs args)
{ {
End(_emulationContext); End(_emulationContext);

10
Ryujinx/Ui/MainWindow.glade
View file

@ -64,6 +64,16 @@
<signal name="activate" handler="Open_Ryu_Folder" swapped="no"/> <signal name="activate" handler="Open_Ryu_Folder" swapped="no"/>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuItem" id="OpenLogsFolder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Opens the folder where logs are written to.</property>
<property name="label" translatable="yes">Open Logs Folder</property>
<property name="use_underline">True</property>
<signal name="activate" handler="OpenLogsFolder_Pressed" swapped="no"/>
</object>
</child>
<child> <child>
<object class="GtkSeparatorMenuItem"> <object class="GtkSeparatorMenuItem">
<property name="visible">True</property> <property name="visible">True</property>

15
Ryujinx/Ui/SettingsWindow.cs
View file

@ -478,21 +478,6 @@ namespace Ryujinx.Ui
_browseThemePath.SetStateFlags(0, true); _browseThemePath.SetStateFlags(0, true);
} }
private void OpenLogsFolder_Pressed(object sender, EventArgs args)
{
string logPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs");
DirectoryInfo directory = new DirectoryInfo(logPath);
directory.Create();
Process.Start(new ProcessStartInfo()
{
FileName = logPath,
UseShellExecute = true,
Verb = "open"
});
}
private void ConfigureController_Pressed(object sender, EventArgs args, PlayerIndex playerIndex) private void ConfigureController_Pressed(object sender, EventArgs args, PlayerIndex playerIndex)
{ {
((ToggleButton)sender).SetStateFlags(0, true); ((ToggleButton)sender).SetStateFlags(0, true);

17
Ryujinx/Ui/SettingsWindow.glade
View file

@ -1977,23 +1977,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="_openLogsFolderButton">
<property name="label" translatable="yes">Open Logs Folder</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Opens the folder where logs are written to.</property>
<property name="halign">start</property>
<property name="margin_bottom">10</property>
<signal name="clicked" handler="OpenLogsFolder_Pressed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkCheckButton" id="_stubLogToggle"> <object class="GtkCheckButton" id="_stubLogToggle">
<property name="label" translatable="yes">Enable Stub Logs</property> <property name="label" translatable="yes">Enable Stub Logs</property>