diff --git a/Ryujinx/GUI/SwitchSettings.cs b/Ryujinx/GUI/SwitchSettings.cs index bdbdfc559b..91c91d0a55 100644 --- a/Ryujinx/GUI/SwitchSettings.cs +++ b/Ryujinx/GUI/SwitchSettings.cs @@ -159,7 +159,7 @@ namespace Ryujinx CustThemeDir.Buffer.Text = SwitchConfig.CustomThemePath; - GameDirsBox.AppendColumn("Game Directories", new CellRendererText(), "text", 0); + GameDirsBox.AppendColumn("", new CellRendererText(), "text", 0); GameDirsBoxStore = new ListStore(typeof(string)); GameDirsBox.Model = GameDirsBoxStore; foreach (string GameDir in SwitchConfig.GameDirs) diff --git a/Ryujinx/GUI/SwitchSettings.glade b/Ryujinx/GUI/SwitchSettings.glade index 539f57b5a6..9352e50af3 100644 --- a/Ryujinx/GUI/SwitchSettings.glade +++ b/Ryujinx/GUI/SwitchSettings.glade @@ -21,6 +21,9 @@ False + 5 + 3 + 3 end @@ -47,6 +50,7 @@ False True + 5 1 @@ -62,76 +66,125 @@ True True - + True False + 5 + 10 + 5 vertical - + True False + 5 + 5 + vertical True False - end - System Language: + start + 5 + General + + + False True - 10 0 - + True False - - American English - British English - Canadian French - Chinese - Dutch - French - German - Italian - Japanese - Korean - Latin American Spanish - Portuguese - Russian - Simplified Chinese - Spanish - Taiwanese - Traditional Chinese - + 10 + 5 + vertical + + + True + False + 5 + + + True + False + end + System Language: + + + False + True + 0 + + + + + True + False + 5 + + American English + British English + Canadian French + Chinese + Dutch + French + German + Italian + Japanese + Korean + Latin American Spanish + Portuguese + Russian + Simplified Chinese + Spanish + Taiwanese + Traditional Chinese + + + + False + True + 1 + + + + + False + True + 0 + + + + + Enable Discord Integration + True + True + False + start + 5 + True + + + False + True + 5 + 1 + + - True + False True 1 - - False - True - 10 - 0 - - - - - Enable Discord Integration - True - True - False - start - 5 - True - False True @@ -143,6 +196,8 @@ True False + 5 + 5 False @@ -152,29 +207,26 @@ - + True False + 5 + 5 vertical - + True - True - in - - - True - True - - - - - + False + start + 5 + Game Directories + + + - True + False True - 5 0 @@ -182,26 +234,98 @@ True False + 10 + 10 + vertical - + True True + 10 + in + + + True + True + False + False + + + + + + True True - 5 0 - - Add - 80 + True - True - True - + False + + + True + True + + + True + True + 0 + + + + + Add + 80 + True + True + True + 5 + + + + False + True + 1 + + + + + Browse... + 80 + True + True + True + 5 + + + False + True + 2 + + + + + Remove + 80 + True + True + True + 5 + + + + False + True + 3 + + False @@ -209,19 +333,132 @@ 1 + + + True + True + 1 + + + + + True + True + 5 + 4 + + + + + True + False + 5 + 5 + + + False + True + 5 + 5 + + + + + True + False + 5 + 5 + vertical + + + True + False + start + 5 + Themes + + + + + + False + True + 0 + + + + + True + False + 10 + 10 + vertical - - Remove - 80 + + Use Custom Theme True True - True - + False + start + True + False True 5 + 1 + + + + + True + False + + + True + False + Custom Theme Dir: + + + False + True + 5 + 0 + + + + + True + True + center + + + True + True + 1 + + + + + Browse... + 80 + True + True + True + 5 + + + False + True + 2 + + + + + False + True + 10 2 @@ -233,35 +470,6 @@ - - True - True - 4 - - - - - True - False - - - False - True - 5 - 5 - - - - - Use Custom Theme - True - True - False - start - 5 - True - - False True @@ -269,94 +477,6 @@ 6 - - - True - False - - - True - False - 5 - Custom Theme Dir: - - - False - True - 5 - 0 - - - - - True - True - center - - - True - True - 1 - - - - - False - True - 10 - 7 - - - - - True - False - - - False - True - 8 - - - - - True - False - - - True - False - 2 - 10 - Log File Location: - - - False - True - 5 - 0 - - - - - True - True - center - - - True - True - 1 - - - - - False - True - 5 - 9 - - @@ -370,357 +490,7 @@ - - True - False - vertical - - - True - False - vertical - - - True - False - start - 5 - 5 - Core - - - False - True - 0 - - - - - True - False - vertical - - - Enable VSync - True - True - False - start - 5 - 5 - True - - - False - True - 0 - - - - - Enable Multicore Scheduling - True - True - False - start - 5 - 5 - True - - - False - True - 1 - - - - - Enable Aggressive CPU Optimizations - True - True - False - start - 5 - 5 - True - - - False - True - 2 - - - - - Enable FS Integrity Checks - True - True - False - start - 5 - 5 - True - - - False - True - 3 - - - - - True - True - 1 - - - - - True - True - 5 - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - vertical - - - True - False - start - 5 - 5 - Logging - - - False - True - 0 - - - - - True - False - vertical - - - Enable Error Logs - True - True - False - start - 5 - 5 - True - - - False - True - 0 - - - - - Enable Warning Logs - True - True - False - start - 5 - 5 - True - - - False - True - 1 - - - - - Enable Info Logs - True - True - False - start - 5 - 5 - True - - - False - True - 2 - - - - - Enable Debug Logs - True - True - False - start - 5 - 5 - True - - - False - True - 3 - - - - - Enable Stub Logs - True - True - False - start - 5 - 5 - True - - - False - True - 4 - - - - - Enable Logging to File - True - True - False - start - 5 - 5 - True - - - False - True - 5 - - - - - True - True - 1 - - - - - True - True - 5 - 2 - - - - - True - False - - - False - True - 3 - - - - - True - False - vertical - - - True - False - start - 5 - 5 - Hacks - These may cause instability - - - False - True - 1 - - - - - True - False - vertical - - - Ignore Missing Services - True - True - False - start - 5 - 5 - True - - - False - True - 0 - - - - - True - True - 2 - - - - - True - True - 5 - 4 - - - - - 1 - - - - - True - False - System - - - 1 - False - - - - + True False vertical @@ -728,6 +498,8 @@ True False + 5 + 10 Enable Docked Mode @@ -774,59 +546,64 @@ True False - vertical + 5 + 5 + 5 + 5 True False + vertical - + True False - center - 10 - 10 - 5 - 5 - Controller Type: - - - False - True - 0 - - - - - True - False - 0 - - Handheld - Pro Controller - Paired Joycons - Left Joycon - Right Joycon - + + + True + False + center + 10 + 10 + 5 + 5 + Controller Type: + + + False + True + 0 + + + + + True + False + 5 + 0 + + Handheld + Pro Controller + Paired Joycons + Left Joycon + Right Joycon + + + + True + True + 1 + + True True - 1 + 10 + 0 - - - True - True - 10 - 0 - - - - - True - False True @@ -1390,17 +1167,6 @@ False True 10 - 0 - - - - - True - False - - - True - True 1 @@ -1408,6 +1174,18 @@ False True + 0 + + + + + True + False + 5 + + + True + True 1 @@ -1580,7 +1358,7 @@ - 2 + 1 @@ -1589,6 +1367,452 @@ False Controller + + 1 + False + + + + + True + False + 5 + 10 + 5 + vertical + + + True + False + start + 5 + 5 + vertical + + + True + False + start + 5 + 5 + Core + + + + + + False + True + 0 + + + + + True + False + 10 + 10 + vertical + + + Enable VSync + True + True + False + start + 5 + 5 + True + + + False + True + 0 + + + + + Enable Multicore Scheduling + True + True + False + start + 5 + 5 + True + + + False + True + 1 + + + + + Enable Aggressive CPU Optimizations + True + True + False + start + 5 + 5 + True + + + False + True + 2 + + + + + Enable FS Integrity Checks + True + True + False + start + 5 + 5 + True + + + False + True + 3 + + + + + True + True + 1 + + + + + False + True + 5 + 0 + + + + + True + False + 5 + 5 + + + False + True + 5 + 1 + + + + + True + False + 5 + 5 + vertical + + + True + False + start + 5 + Logging + + + + + + False + True + 0 + + + + + True + False + 10 + 10 + vertical + + + Enable Logging to File + True + True + False + start + 5 + 5 + True + + + False + True + 0 + + + + + True + False + 5 + 10 + + + True + False + Log File Location: + + + False + True + 5 + 0 + + + + + True + True + center + False + False + + + True + True + 1 + + + + + False + True + 5 + 1 + + + + + Enable Debug Logs + True + True + False + start + 5 + 5 + True + + + False + True + 2 + + + + + Enable Stub Logs + True + True + False + start + 5 + 5 + True + + + False + True + 3 + + + + + Enable Info Logs + True + True + False + start + 5 + 5 + True + + + False + True + 4 + + + + + Enable Warning Logs + True + True + False + start + 5 + 5 + True + + + False + True + 5 + + + + + Enable Error Logs + True + True + False + start + 5 + 5 + True + + + False + True + 6 + + + + + True + True + 1 + + + + + False + True + 5 + 2 + + + + + True + False + 5 + 5 + + + False + True + 5 + 3 + + + + + True + False + 5 + 5 + vertical + + + True + False + + + True + False + start + 5 + Hacks + + + + + + False + True + 0 + + + + + True + False + start + 5 + - These may cause instability + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + 10 + 10 + vertical + + + Ignore Missing Services + True + True + False + start + 5 + 5 + True + + + False + True + 0 + + + + + True + True + 2 + + + + + False + True + 5 + 4 + + + + + 2 + + + + + True + False + end + System + 2 False diff --git a/Ryujinx/GUI/assets/Theme.css b/Ryujinx/GUI/assets/Theme.css index 997f3f11ac..fbe2338051 100644 --- a/Ryujinx/GUI/assets/Theme.css +++ b/Ryujinx/GUI/assets/Theme.css @@ -26,6 +26,12 @@ separator { background: #929394; } +.GameDir { + border-color: #929394; + border-width: 1px; + border-style: solid; +} + notebook { border: none; }