From d0e36b7b19a8477d7715b729bb389972edc7de66 Mon Sep 17 00:00:00 2001
From: Xpl0itR <xpl0itr@outlook.com>
Date: Sun, 20 Sep 2020 05:31:05 +0100
Subject: [PATCH] Move the open logs folder from setting into the File menu in
 the main window (#1550)

---
 Ryujinx/Ui/MainWindow.cs        | 17 ++++++++++++++++-
 Ryujinx/Ui/MainWindow.glade     | 10 ++++++++++
 Ryujinx/Ui/SettingsWindow.cs    | 15 ---------------
 Ryujinx/Ui/SettingsWindow.glade | 17 -----------------
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index 86a11f072..4e6895139 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -882,7 +882,7 @@ namespace Ryujinx.Ui
 
         private void Open_Ryu_Folder(object sender, EventArgs args)
         {
-            Process.Start(new ProcessStartInfo()
+            Process.Start(new ProcessStartInfo
             {
                 FileName        = AppDataManager.BaseDirPath,
                 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)
         {
             End(_emulationContext);
diff --git a/Ryujinx/Ui/MainWindow.glade b/Ryujinx/Ui/MainWindow.glade
index cf8d9a223..254d2bcd1 100644
--- a/Ryujinx/Ui/MainWindow.glade
+++ b/Ryujinx/Ui/MainWindow.glade
@@ -64,6 +64,16 @@
                         <signal name="activate" handler="Open_Ryu_Folder" swapped="no"/>
                       </object>
                     </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>
                       <object class="GtkSeparatorMenuItem">
                         <property name="visible">True</property>
diff --git a/Ryujinx/Ui/SettingsWindow.cs b/Ryujinx/Ui/SettingsWindow.cs
index 68634b305..efaa06cd2 100644
--- a/Ryujinx/Ui/SettingsWindow.cs
+++ b/Ryujinx/Ui/SettingsWindow.cs
@@ -478,21 +478,6 @@ namespace Ryujinx.Ui
             _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)
         {
             ((ToggleButton)sender).SetStateFlags(0, true);
diff --git a/Ryujinx/Ui/SettingsWindow.glade b/Ryujinx/Ui/SettingsWindow.glade
index a66bcd950..505cc2387 100644
--- a/Ryujinx/Ui/SettingsWindow.glade
+++ b/Ryujinx/Ui/SettingsWindow.glade
@@ -1977,23 +1977,6 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </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>
                                   <object class="GtkCheckButton" id="_stubLogToggle">
                                     <property name="label" translatable="yes">Enable Stub Logs</property>