UI: Options Menu (Part 1 of 2) → General Improvements (#133)

Ayyyy, welcome to the UI: Options Menu → General Improvements PR!

We cruisin'!

This is the first PR of a small series aimed at improving the `Options` menu and related submenus.

This initial PR focuses on smaller visual and navigational improvements to the main `Options` menu. As this is part of a progressive series (two PRs _for now_), further bug fixes and refinements may be present in Part 2. Additionally, as the `View` menu is related to some of the changes presents in this PR, it has also received minor adjustments (see details below).

### LOCALISATION
* **Fractured:**
    * `MenuBar_Options.json` - `Options` menu locales
    * `MenuBar_View.json` - `View` menu locales
    * `Settings_Interface.json` - Interface `Settings` tab locales (UI-only)
* **Added:** Missing "e" in Italian translation of `User Profiles` (thank you BOBBIJDJ for pointing it out!)

**NOTE:** `MenuBar_View.json` and `Settings_Interface.json` were not populated in this PR.

### OPTIONS MENU
* **Moved:** `Toggle Fullscreen` to the `View` menu.
    * This option affects the current window/view state, so it belongs under `View` rather than `Options`.
* **Moved:** `Show Console` checkbox to the `View` menu.
    * Even though it was previously under `Options`, this is a real-time visibility toggle. It affects Ryujinx "immediately" (shows/hides the console window, and as immediately as you can get with our current implementation), so it fits better alongside other current view controls like `Toggle Fullscreen` and the `Window Size` presets.
* **Moved:** `Start Games in Fullscreen` and `Start Games Without UI` (renamed to "Hide UI on Game Start" for better flow) from the `Options` menu to the `Interface` tab in `Settings`.
    * These are persistent launch preferences rather than actions that can affect just the current session. Settings is the semantically correct location for them. They now sit alongside other launch-related options such as `Confirm Game Shutdown`.
    * Their respective locales were transferred to the newly created `Settings_Interface.json`.
* **Renamed:** `Change Language` → `Language`
    * Made consistent with the shorter style used by other items in this menu in previous cleanups.
* **Modified:** Menu item order (see images below).

### VIEW MENU
The `View` menu received only light adjustments in this PR (mainly padding/margins to better fit the newly added `Show Console` checkbox ). A dedicated _View Menu_ follow-up PR is planned to reorganise it further and add new options. Furthermore, _Options Menu (Part 2 of 2)_ will follow shortly as well.

_If there are any features or changes that you wish to be implemented, please comment down below and I'll be happy to accommodate!_

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/133

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1407,10 +1407,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public void HideUi() => ShowMenuAndStatusBar = false;
 
-        public void ToggleStartGamesInFullscreen() => StartGamesInFullscreen = !StartGamesInFullscreen;
-
-        public void ToggleStartGamesWithoutUi() => StartGamesWithoutUi = !StartGamesWithoutUi;
-
         public void ToggleShowConsole() => ShowConsole = !ShowConsole;
 
         public void SetListMode() => Glyph = Glyph.List;

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -109,6 +109,31 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public bool StartGamesInFullscreen
+        {
+            get => ConfigurationState.Instance.UI.StartFullscreen;
+            set
+            {
+                if (ConfigurationState.Instance.UI.StartFullscreen.Value != value)
+                {
+                    ConfigurationState.Instance.UI.StartFullscreen.Value = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        public bool StartGamesWithoutUi
+        {
+            get => ConfigurationState.Instance.UI.StartNoUI;
+            set
+            {
+                if (ConfigurationState.Instance.UI.StartNoUI.Value != value)
+                {
+                    ConfigurationState.Instance.UI.StartNoUI.Value = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public int GraphicsBackendMultithreadingIndex
         {
             get;
@@ -638,6 +663,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             HideCursor = (int)config.HideCursor.Value;
             UpdateCheckerType = (int)config.UpdateCheckerType.Value;
             FocusLostActionType = (int)config.FocusLostActionType.Value;
+            StartGamesInFullscreen = config.UI.StartFullscreen;
+            StartGamesWithoutUi = config.UI.StartNoUI;
 
             GameDirectories.Clear();
             GameDirectories.AddRange(config.UI.GameDirs.Value);
@@ -758,6 +785,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
             config.UI.GameDirs.Value = [.. GameDirectories];
             config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+            config.UI.StartFullscreen.Value = StartGamesInFullscreen;
+            config.UI.StartNoUI.Value = StartGamesWithoutUi;
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
             {

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -74,77 +74,23 @@
                     Header="{ext:Locale MenuBarFileExit}"
                     Icon="{ext:Icon fa-solid fa-power-off}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarOptions}">
-                <MenuItem
-                    Command="{Binding ToggleFullscreen}"
-                    Header="{ext:Locale MenuBarOptionsToggleFullscreen}"
-                    Classes="withCheckbox"
-                    Padding="0"
-                    Icon="{ext:Icon fa-solid fa-expand}"
-                    InputGesture="F11">
-                </MenuItem>
-                <MenuItem
-                    Padding="0"
-                    Command="{Binding ToggleStartGamesInFullscreen}"
-                    Header="{ext:Locale MenuBarOptionsStartGamesInFullscreen}"
-                    Classes="withCheckbox">
-                    <MenuItem.Icon>
-                        <CheckBox
-                            MinWidth="{DynamicResource CheckBoxSize}"
-                            MinHeight="{DynamicResource CheckBoxSize}"
-                            IsChecked="{Binding StartGamesInFullscreen, Mode=TwoWay}"
-                            Padding="0" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem
-                    Padding="0"
-                    Command="{Binding ToggleStartGamesWithoutUi}"
-                    Header="{ext:Locale MenuBarOptionsStartGamesWithoutUI}"
-                    Classes="withCheckbox">
-                    <MenuItem.Icon>
-                        <CheckBox
-                            MinWidth="{DynamicResource CheckBoxSize}"
-                            MinHeight="{DynamicResource CheckBoxSize}"
-                            IsChecked="{Binding StartGamesWithoutUi, Mode=TwoWay}"
-                            Padding="0" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem
-                    Padding="0"
-                    IsVisible="{Binding ShowConsoleVisible}"
-                    Command="{Binding ToggleShowConsole}"
-                    Header="{ext:Locale MenuBarOptionsShowConsole}"
-                    Classes="withCheckbox">
-                    <MenuItem.Icon>
-                        <CheckBox
-                            MinWidth="{DynamicResource CheckBoxSize}"
-                            MinHeight="{DynamicResource CheckBoxSize}"
-                            IsChecked="{Binding ShowConsole, Mode=TwoWay}"
-                            Padding="0" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBar_Options_OptionsLabel}">
                 <MenuItem
                     Name="ChangeLanguageMenuItem" 
-                    Padding="0"
-                    Header="{ext:Locale MenuBarOptionsChangeLanguage}"
-                    Icon="{ext:Icon fa-solid fa-globe}"
-                    Classes="withCheckbox">
-                </MenuItem>
-                <MenuItem
-                    Name="OpenSettingsMenuItem"
-                    Padding="0"
-                    Header="{ext:Locale MenuBarOptionsSettings}"
-                    Icon="{ext:Icon fa-solid fa-gear}"
-                    Classes="withCheckbox">
+                    Header="{ext:Locale MenuBar_Options_LanguageButton}"
+                    Icon="{ext:Icon fa-solid fa-globe}">
                 </MenuItem>
                 <MenuItem
                     Command="{Binding ManageProfiles}"
-                    Padding="0"
-                    Header="{ext:Locale MenuBarOptionsManageUserProfiles}"
+                    Header="{ext:Locale MenuBar_Options_UserProfilesButton}"
                     Icon="{ext:Icon fa-solid fa-user}"
-                    IsEnabled="{Binding EnableNonGameRunningControls}"
-                    Classes="withCheckbox">
+                    IsEnabled="{Binding EnableNonGameRunningControls}">
+                </MenuItem>
+                <Separator/>
+                <MenuItem
+                    Name="OpenSettingsMenuItem"
+                    Header="{ext:Locale MenuBar_Options_SettingsButton}"
+                    Icon="{ext:Icon fa-solid fa-gear}">
                 </MenuItem>
             </MenuItem>
             <MenuItem
@@ -270,13 +216,36 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
-                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}" Icon="{ext:Icon fa-solid fa-window-restore}">
-                    <MenuItem Name="WindowSize720PMenuItem" Header="{ext:Locale MenuBarViewWindow720}" CommandParameter="1280 720" />
-                    <MenuItem Name="WindowSize1080PMenuItem" Header="{ext:Locale MenuBarViewWindow1080}" CommandParameter="1920 1080" />
-                    <MenuItem Name="WindowSize1440PMenuItem" Header="{ext:Locale MenuBarViewWindow1440}" CommandParameter="2560 1440" />
-                    <MenuItem Name="WindowSize2160PMenuItem" Header="{ext:Locale MenuBarViewWindow2160}" CommandParameter="3840 2160" />
+                <MenuItem
+                    Command="{Binding ToggleShowConsole}"
+                    IsVisible="{Binding ShowConsoleVisible}"
+                    Header="{ext:Locale MenuBar_View_ShowConsoleButton}"
+                    Classes="withCheckbox"
+                    Padding="0">
+                    <MenuItem.Icon>
+                        <CheckBox
+                            MinWidth="{DynamicResource CheckBoxSize}"
+                            MinHeight="{DynamicResource CheckBoxSize}"
+                            IsChecked="{Binding ShowConsole, Mode=TwoWay}"
+                            Padding="0" />
+                    </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Name="ToggleFileTypesMenuItem" Header="{ext:Locale MenuBarShowFileTypes}" Icon="{ext:Icon fa-solid fa-tags}" />
+                <MenuItem
+                    Command="{Binding ToggleFullscreen}"
+                    Padding="0"
+                    Header="{ext:Locale MenuBar_View_ToggleFullscreenButton}"
+                    Icon="{ext:Icon fa-solid fa-expand}"
+                    InputGesture="F11"
+                    Classes="withCheckbox">
+                </MenuItem>
+                <MenuItem VerticalAlignment="Center" Padding="0" Header="{ext:Locale MenuBarViewWindow}" Icon="{ext:Icon fa-solid fa-window-restore}" Classes="withCheckbox">
+                    <MenuItem Name="WindowSize720PMenuItem" Padding = "15,0,0,0" Header="{ext:Locale MenuBarViewWindow720}" CommandParameter="1280 720" />
+                    <MenuItem Name="WindowSize1080PMenuItem" Padding = "15,0,0,0" Header="{ext:Locale MenuBarViewWindow1080}" CommandParameter="1920 1080" />
+                    <MenuItem Name="WindowSize1440PMenuItem" Padding = "15,0,0,0" Header="{ext:Locale MenuBarViewWindow1440}" CommandParameter="2560 1440" />
+                    <MenuItem Name="WindowSize2160PMenuItem" Padding = "15,0,0,0" Header="{ext:Locale MenuBarViewWindow2160}" CommandParameter="3840 2160" />
+                </MenuItem>
+                 <Separator />
+                <MenuItem Name="ToggleFileTypesMenuItem" Padding="0" Header="{ext:Locale MenuBarShowFileTypes}" Icon="{ext:Icon fa-solid fa-tags}" Classes="withCheckbox" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
                 <MenuItem

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -77,6 +77,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                 .Select(it =>
                     new CheckBox
                     {
+                        Margin = new Thickness(10, 0, 0, 0),
                         Content = $".{it.FileName}",
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
                         Command = Commands.Create(() => Window.ToggleFileType(it.FileName))
@@ -98,8 +99,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
                 MenuItem menuItem = new()
                 {
-                    Padding = new Thickness(15, 0, 0, 0),
-                    Margin = new Thickness(3, 0, 3, 0),
+                    Padding = new Thickness(10, 0, 0, 0),
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     Header = code == currentLanguageCode ? $"{languageName}  ✔" : languageName,
                     Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(code))

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -36,6 +36,25 @@
                                 <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                             </StackPanel>
                         </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding StartGamesInFullscreen, Mode=TwoWay}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale Settings_Interface_StartGamesInFullscreenCheckboxLabel}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding StartGamesWithoutUi, Mode=TwoWay}"
+                            ToolTip.Tip="{ext:Locale Settings_Interface_StartGamesWithoutUICheckboxLabelToolTip}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale Settings_Interface_StartGamesWithoutUICheckboxLabel}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
                         <CheckBox
                             IsEnabled="{Binding !IsGameTitleNotNull}"
                             Opacity="{Binding PanelOpacity}"