diff options
| author | Sera <62521228+SeraUX@users.noreply.github.com> | 2020-11-13 01:50:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 01:50:28 +0100 |
| commit | 04e048efcf69424d61b368d27b69cf196c667ab3 (patch) | |
| tree | facdddb8ab034f3c603c0c996a3ed289ce50227d | |
| parent | c6524942199eca97d3f9bd9e2e18a21b14069a8c (diff) | |
SettingsWindow: Add an Apply button (#1562)
* SettingsWindow: Add an Apply button
Adds an apply button that doesnt close the settings window when saving
the changes.
* fix the apply button staying turned on after clicking it
| -rw-r--r-- | Ryujinx/Ui/SettingsWindow.cs | 128 | ||||
| -rw-r--r-- | Ryujinx/Ui/SettingsWindow.glade | 1131 |
2 files changed, 645 insertions, 614 deletions
diff --git a/Ryujinx/Ui/SettingsWindow.cs b/Ryujinx/Ui/SettingsWindow.cs index 4646df06..f6eb8e51 100644 --- a/Ryujinx/Ui/SettingsWindow.cs +++ b/Ryujinx/Ui/SettingsWindow.cs @@ -365,6 +365,69 @@ namespace Ryujinx.Ui _systemTimeMinuteSpin.ValueChanged += SystemTimeSpin_ValueChanged; } + private void SaveSettings() + { + List<string> gameDirs = new List<string>(); + + _gameDirsBoxStore.GetIterFirst(out TreeIter treeIter); + for (int i = 0; i < _gameDirsBoxStore.IterNChildren(); i++) + { + gameDirs.Add((string)_gameDirsBoxStore.GetValue(treeIter, 0)); + + _gameDirsBoxStore.IterNext(ref treeIter); + } + + if (!float.TryParse(_resScaleText.Buffer.Text, out float resScaleCustom) || resScaleCustom <= 0.0f) + { + resScaleCustom = 1.0f; + } + + if (_validTzRegions.Contains(_systemTimeZoneEntry.Text)) + { + ConfigurationState.Instance.System.TimeZone.Value = _systemTimeZoneEntry.Text; + } + + ConfigurationState.Instance.Logger.EnableError.Value = _errorLogToggle.Active; + ConfigurationState.Instance.Logger.EnableWarn.Value = _warningLogToggle.Active; + ConfigurationState.Instance.Logger.EnableInfo.Value = _infoLogToggle.Active; + ConfigurationState.Instance.Logger.EnableStub.Value = _stubLogToggle.Active; + ConfigurationState.Instance.Logger.EnableDebug.Value = _debugLogToggle.Active; + ConfigurationState.Instance.Logger.EnableGuest.Value = _guestLogToggle.Active; + ConfigurationState.Instance.Logger.EnableFsAccessLog.Value = _fsAccessLogToggle.Active; + ConfigurationState.Instance.Logger.EnableFileLog.Value = _fileLogToggle.Active; + ConfigurationState.Instance.Logger.GraphicsDebugLevel.Value = Enum.Parse<GraphicsDebugLevel>(_graphicsDebugLevel.ActiveId); + ConfigurationState.Instance.System.EnableDockedMode.Value = _dockedModeToggle.Active; + ConfigurationState.Instance.EnableDiscordIntegration.Value = _discordToggle.Active; + ConfigurationState.Instance.CheckUpdatesOnStart.Value = _checkUpdatesToggle.Active; + ConfigurationState.Instance.Graphics.EnableVsync.Value = _vSyncToggle.Active; + ConfigurationState.Instance.Graphics.EnableShaderCache.Value = _shaderCacheToggle.Active; + ConfigurationState.Instance.System.EnableMulticoreScheduling.Value = _multiSchedToggle.Active; + ConfigurationState.Instance.System.EnablePtc.Value = _ptcToggle.Active; + ConfigurationState.Instance.System.EnableFsIntegrityChecks.Value = _fsicToggle.Active; + ConfigurationState.Instance.System.IgnoreMissingServices.Value = _ignoreToggle.Active; + ConfigurationState.Instance.Hid.EnableKeyboard.Value = _directKeyboardAccess.Active; + ConfigurationState.Instance.Ui.EnableCustomTheme.Value = _custThemeToggle.Active; + ConfigurationState.Instance.System.Language.Value = Enum.Parse<Language>(_systemLanguageSelect.ActiveId); + ConfigurationState.Instance.System.Region.Value = Enum.Parse<Configuration.System.Region>(_systemRegionSelect.ActiveId); + ConfigurationState.Instance.System.SystemTimeOffset.Value = _systemTimeOffset; + ConfigurationState.Instance.Ui.CustomThemePath.Value = _custThemePath.Buffer.Text; + ConfigurationState.Instance.Graphics.ShadersDumpPath.Value = _graphicsShadersDumpPath.Buffer.Text; + ConfigurationState.Instance.Ui.GameDirs.Value = gameDirs; + ConfigurationState.Instance.System.FsGlobalAccessLogMode.Value = (int)_fsLogSpinAdjustment.Value; + ConfigurationState.Instance.Graphics.MaxAnisotropy.Value = float.Parse(_anisotropy.ActiveId); + ConfigurationState.Instance.Graphics.ResScale.Value = int.Parse(_resScaleCombo.ActiveId); + ConfigurationState.Instance.Graphics.ResScaleCustom.Value = resScaleCustom; + + if (_audioBackendSelect.GetActiveIter(out TreeIter activeIter)) + { + ConfigurationState.Instance.System.AudioBackend.Value = (AudioBackend)_audioBackendStore.GetValue(activeIter, 1); + } + + MainWindow.SaveConfig(); + MainWindow.UpdateGraphicsConfig(); + MainWindow.ApplyTheme(); + } + //Events private void TimeZoneEntry_FocusOut(Object sender, FocusOutEventArgs e) { @@ -501,68 +564,15 @@ namespace Ryujinx.Ui private void SaveToggle_Activated(object sender, EventArgs args) { - List<string> gameDirs = new List<string>(); - - _gameDirsBoxStore.GetIterFirst(out TreeIter treeIter); - for (int i = 0; i < _gameDirsBoxStore.IterNChildren(); i++) - { - gameDirs.Add((string)_gameDirsBoxStore.GetValue(treeIter, 0)); - - _gameDirsBoxStore.IterNext(ref treeIter); - } - - if (!float.TryParse(_resScaleText.Buffer.Text, out float resScaleCustom) || resScaleCustom <= 0.0f) - { - resScaleCustom = 1.0f; - } - - if (_validTzRegions.Contains(_systemTimeZoneEntry.Text)) - { - ConfigurationState.Instance.System.TimeZone.Value = _systemTimeZoneEntry.Text; - } - - ConfigurationState.Instance.Logger.EnableError.Value = _errorLogToggle.Active; - ConfigurationState.Instance.Logger.EnableWarn.Value = _warningLogToggle.Active; - ConfigurationState.Instance.Logger.EnableInfo.Value = _infoLogToggle.Active; - ConfigurationState.Instance.Logger.EnableStub.Value = _stubLogToggle.Active; - ConfigurationState.Instance.Logger.EnableDebug.Value = _debugLogToggle.Active; - ConfigurationState.Instance.Logger.EnableGuest.Value = _guestLogToggle.Active; - ConfigurationState.Instance.Logger.EnableFsAccessLog.Value = _fsAccessLogToggle.Active; - ConfigurationState.Instance.Logger.EnableFileLog.Value = _fileLogToggle.Active; - ConfigurationState.Instance.Logger.GraphicsDebugLevel.Value = Enum.Parse<GraphicsDebugLevel>(_graphicsDebugLevel.ActiveId); - ConfigurationState.Instance.System.EnableDockedMode.Value = _dockedModeToggle.Active; - ConfigurationState.Instance.EnableDiscordIntegration.Value = _discordToggle.Active; - ConfigurationState.Instance.CheckUpdatesOnStart.Value = _checkUpdatesToggle.Active; - ConfigurationState.Instance.Graphics.EnableVsync.Value = _vSyncToggle.Active; - ConfigurationState.Instance.Graphics.EnableShaderCache.Value = _shaderCacheToggle.Active; - ConfigurationState.Instance.System.EnableMulticoreScheduling.Value = _multiSchedToggle.Active; - ConfigurationState.Instance.System.EnablePtc.Value = _ptcToggle.Active; - ConfigurationState.Instance.System.EnableFsIntegrityChecks.Value = _fsicToggle.Active; - ConfigurationState.Instance.System.IgnoreMissingServices.Value = _ignoreToggle.Active; - ConfigurationState.Instance.Hid.EnableKeyboard.Value = _directKeyboardAccess.Active; - ConfigurationState.Instance.Ui.EnableCustomTheme.Value = _custThemeToggle.Active; - ConfigurationState.Instance.System.Language.Value = Enum.Parse<Language>(_systemLanguageSelect.ActiveId); - ConfigurationState.Instance.System.Region.Value = Enum.Parse<Configuration.System.Region>(_systemRegionSelect.ActiveId); - ConfigurationState.Instance.System.SystemTimeOffset.Value = _systemTimeOffset; - ConfigurationState.Instance.Ui.CustomThemePath.Value = _custThemePath.Buffer.Text; - ConfigurationState.Instance.Graphics.ShadersDumpPath.Value = _graphicsShadersDumpPath.Buffer.Text; - ConfigurationState.Instance.Ui.GameDirs.Value = gameDirs; - ConfigurationState.Instance.System.FsGlobalAccessLogMode.Value = (int)_fsLogSpinAdjustment.Value; - ConfigurationState.Instance.Graphics.MaxAnisotropy.Value = float.Parse(_anisotropy.ActiveId); - ConfigurationState.Instance.Graphics.ResScale.Value = int.Parse(_resScaleCombo.ActiveId); - ConfigurationState.Instance.Graphics.ResScaleCustom.Value = resScaleCustom; - - if (_audioBackendSelect.GetActiveIter(out TreeIter activeIter)) - { - ConfigurationState.Instance.System.AudioBackend.Value = (AudioBackend)_audioBackendStore.GetValue(activeIter, 1); - } - - MainWindow.SaveConfig(); - MainWindow.UpdateGraphicsConfig(); - MainWindow.ApplyTheme(); + SaveSettings(); Dispose(); } + private void ApplyToggle_Activated(object sender, EventArgs args) + { + SaveSettings(); + } + private void CloseToggle_Activated(object sender, EventArgs args) { Dispose(); diff --git a/Ryujinx/Ui/SettingsWindow.glade b/Ryujinx/Ui/SettingsWindow.glade index ef2262df..b22fef90 100644 --- a/Ryujinx/Ui/SettingsWindow.glade +++ b/Ryujinx/Ui/SettingsWindow.glade @@ -1,94 +1,91 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.38.1 --> <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="_fsLogSpinAdjustment"> <property name="upper">3</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="_systemTimeDaySpinAdjustment"> <property name="lower">1</property> <property name="upper">31</property> - <property name="step_increment">1</property> - <property name="page_increment">5</property> + <property name="step-increment">1</property> + <property name="page-increment">5</property> </object> <object class="GtkAdjustment" id="_systemTimeHourSpinAdjustment"> <property name="upper">23</property> - <property name="step_increment">1</property> - <property name="page_increment">5</property> + <property name="step-increment">1</property> + <property name="page-increment">5</property> </object> <object class="GtkAdjustment" id="_systemTimeMinuteSpinAdjustment"> <property name="upper">59</property> - <property name="step_increment">1</property> - <property name="page_increment">5</property> + <property name="step-increment">1</property> + <property name="page-increment">5</property> </object> <object class="GtkAdjustment" id="_systemTimeMonthSpinAdjustment"> <property name="lower">1</property> <property name="upper">12</property> - <property name="step_increment">1</property> - <property name="page_increment">5</property> + <property name="step-increment">1</property> + <property name="page-increment">5</property> </object> <object class="GtkAdjustment" id="_systemTimeYearSpinAdjustment"> <property name="lower">2000</property> <property name="upper">2060</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkEntryCompletion" id="_systemTimeZoneCompletion"> - <property name="minimum_key_length">0</property> - <property name="inline_completion">True</property> - <property name="inline_selection">True</property> + <property name="minimum-key-length">0</property> + <property name="inline-completion">True</property> + <property name="inline-selection">True</property> </object> <object class="GtkWindow" id="_settingsWin"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="title" translatable="yes">Ryujinx - Settings</property> <property name="modal">True</property> - <property name="window_position">center</property> - <property name="default_width">650</property> - <property name="default_height">550</property> - <child> - <placeholder/> - </child> + <property name="window-position">center</property> + <property name="default-width">650</property> + <property name="default-height">550</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkNotebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <object class="GtkBox" id="TabGeneral"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">10</property> - <property name="margin_top">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">10</property> + <property name="margin-top">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="CatGeneral"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">General</property> <attributes> <attribute name="weight" value="bold"/> @@ -103,19 +100,19 @@ <child> <object class="GtkBox" id="General"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="_discordToggle"> <property name="label" translatable="yes">Enable Discord Rich Presence</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables Discord Rich Presence</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables Discord Rich Presence</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -128,10 +125,10 @@ <object class="GtkCheckButton" id="_checkUpdatesToggle"> <property name="label" translatable="yes">Check for updates on launch</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -158,9 +155,9 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> </object> <packing> <property name="expand">False</property> @@ -172,16 +169,16 @@ <child> <object class="GtkBox" id="CatGameDir"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Game Directories</property> <attributes> <attribute name="weight" value="bold"/> @@ -196,22 +193,22 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_bottom">10</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="margin-bottom">10</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="_gameDirsBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> + <property name="can-focus">True</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child> @@ -230,12 +227,12 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkEntry" id="_addGameDirBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Enter a game directroy to add to the list</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Enter a game directroy to add to the list</property> </object> <packing> <property name="expand">True</property> @@ -246,12 +243,12 @@ <child> <object class="GtkToggleButton" id="_addDir"> <property name="label" translatable="yes">Add</property> - <property name="width_request">80</property> + <property name="width-request">80</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes"> Add a game directory to the list</property> - <property name="margin_left">5</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes"> Add a game directory to the list</property> + <property name="margin-left">5</property> <signal name="toggled" handler="AddDir_Pressed" swapped="no"/> </object> <packing> @@ -263,12 +260,12 @@ <child> <object class="GtkToggleButton" id="_removeDir"> <property name="label" translatable="yes">Remove</property> - <property name="width_request">80</property> + <property name="width-request">80</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Remove selected game directory</property> - <property name="margin_left">5</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Remove selected game directory</property> + <property name="margin-left">5</property> <signal name="toggled" handler="RemoveDir_Pressed" swapped="no"/> </object> <packing> @@ -302,9 +299,9 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> </object> <packing> <property name="expand">False</property> @@ -316,16 +313,16 @@ <child> <object class="GtkBox" id="CatThemes"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Themes</property> <attributes> <attribute name="weight" value="bold"/> @@ -340,19 +337,19 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="_custThemeToggle"> <property name="label" translatable="yes">Use Custom Theme</property> <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 custom themes in the GUI</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enable or disable custom themes in the GUI</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <signal name="toggled" handler="CustThemeToggle_Activated" swapped="no"/> </object> <packing> @@ -365,12 +362,12 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="_custThemePathLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Path to custom GUI theme</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Path to custom GUI theme</property> <property name="label" translatable="yes">Custom Theme Path:</property> </object> <packing> @@ -383,8 +380,8 @@ <child> <object class="GtkEntry" id="_custThemePath"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Path to custom GUI theme</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Path to custom GUI theme</property> <property name="valign">center</property> </object> <packing> @@ -396,12 +393,12 @@ <child> <object class="GtkToggleButton" id="_browseThemePath"> <property name="label" translatable="yes">Browse...</property> - <property name="width_request">80</property> + <property name="width-request">80</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Browse for a custom GUI theme</property> - <property name="margin_left">5</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Browse for a custom GUI theme</property> + <property name="margin-left">5</property> <signal name="toggled" handler="BrowseThemeDir_Pressed" swapped="no"/> </object> <packing> @@ -438,35 +435,35 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">General</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="TabInput"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">10</property> - <property name="margin_top">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">10</property> + <property name="margin-top">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <child> <object class="GtkCheckButton" id="_dockedModeToggle"> <property name="label" translatable="yes">Enable Docked Mode</property> <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 Docked Mode</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enable or disable Docked Mode</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -479,10 +476,10 @@ <object class="GtkCheckButton" id="_directKeyboardAccess"> <property name="label" translatable="yes">Direct Keyboard Access</property> <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 "direct keyboard access (HID) support" (Provides games access to your keyboard as a text entry device)</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enable or disable "direct keyboard access (HID) support" (Provides games access to your keyboard as a text entry device)</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -502,7 +499,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -511,23 +508,24 @@ </packing> </child> <child> + <!-- n-columns=5 n-rows=5 --> <object class="GtkGrid" id="ControllerGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="column_spacing">20</property> + <property name="column-spacing">20</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 1</property> </object> <packing> @@ -540,12 +538,12 @@ <object class="GtkToggleButton" id="_configureController1"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -555,21 +553,21 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 3</property> </object> <packing> @@ -582,12 +580,12 @@ <object class="GtkToggleButton" id="_configureController3"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -597,21 +595,21 @@ </child> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> + <property name="left-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 2</property> </object> <packing> @@ -624,12 +622,12 @@ <object class="GtkToggleButton" id="_configureController2"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -639,21 +637,21 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Handheld</property> </object> <packing> @@ -666,12 +664,12 @@ <object class="GtkToggleButton" id="_configureControllerH"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -681,21 +679,21 @@ </child> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">4</property> + <property name="left-attach">4</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 6</property> </object> <packing> @@ -708,12 +706,12 @@ <object class="GtkToggleButton" id="_configureController6"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -723,21 +721,21 @@ </child> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">2</property> + <property name="left-attach">4</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 5</property> </object> <packing> @@ -750,12 +748,12 @@ <object class="GtkToggleButton" id="_configureController5"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -765,21 +763,21 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 7</property> </object> <packing> @@ -792,12 +790,12 @@ <object class="GtkToggleButton" id="_configureController7"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -807,21 +805,21 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 4</property> </object> <packing> @@ -834,12 +832,12 @@ <object class="GtkToggleButton" id="_configureController4"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -849,21 +847,21 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">False</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> <property name="label" translatable="yes">Player 8</property> </object> <packing> @@ -876,12 +874,12 @@ <object class="GtkToggleButton" id="_configureController8"> <property name="label" translatable="yes">Configure</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">20</property> - <property name="margin_right">20</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-left">20</property> + <property name="margin-right">20</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> </object> <packing> <property name="expand">False</property> @@ -891,168 +889,168 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> + <property name="left-attach">2</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> + <property name="left-attach">3</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">4</property> + <property name="left-attach">3</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> + <property name="left-attach">3</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> + <property name="left-attach">3</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> + <property name="left-attach">4</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> - <property name="left_attach">4</property> - <property name="top_attach">3</property> + <property name="left-attach">4</property> + <property name="top-attach">3</property> </packing> </child> </object> @@ -1065,7 +1063,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1081,36 +1079,36 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Input</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="TabSystem"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">10</property> - <property name="margin_top">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">10</property> + <property name="margin-top">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="CatCore"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Core</property> <attributes> <attribute name="weight" value="bold"/> @@ -1125,19 +1123,19 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="RegionBox"> <property name="visible">True</property> - <property name="can_focus">False</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">Change System Region</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System Region</property> <property name="halign">end</property> <property name="label" translatable="yes">System Region:</property> </object> @@ -1151,9 +1149,9 @@ <child> <object class="GtkComboBoxText" id="_systemRegionSelect"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Change System Region</property> - <property name="margin_left">5</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System Region</property> + <property name="margin-left">5</property> <items> <item id="Japan" translatable="yes">Japan</item> <item id="USA" translatable="yes">USA</item> @@ -1181,12 +1179,12 @@ <child> <object class="GtkBox" id="LanguageBox"> <property name="visible">True</property> - <property name="can_focus">False</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">Change System Language</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System Language</property> <property name="halign">end</property> <property name="label" translatable="yes">System Language:</property> </object> @@ -1200,8 +1198,8 @@ <child> <object class="GtkComboBoxText" id="_systemLanguageSelect"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Change System Language</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System Language</property> <items> <item id="AmericanEnglish" translatable="yes">American English</item> <item id="BritishEnglish" translatable="yes">British English</item> @@ -1239,12 +1237,12 @@ <child> <object class="GtkBox" id="TimeZoneBox"> <property name="visible">True</property> - <property name="can_focus">False</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">Change System TimeZone</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System TimeZone</property> <property name="halign">end</property> <property name="label" translatable="yes">System TimeZone:</property> </object> @@ -1258,9 +1256,9 @@ <child> <object class="GtkEntry" id="_systemTimeZoneEntry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Change System TimeZone</property> - <property name="margin_left">5</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Change System TimeZone</property> + <property name="margin-left">5</property> <property name="completion">_systemTimeZoneCompletion</property> </object> <packing> @@ -1280,11 +1278,11 @@ <child> <object class="GtkBox" id="TimeBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">System Time:</property> </object> @@ -1298,7 +1296,7 @@ <child> <object class="GtkSpinButton" id="_systemTimeYearSpin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text" translatable="yes">2000</property> <property name="orientation">vertical</property> <property name="adjustment">_systemTimeYearSpinAdjustment</property> @@ -1314,7 +1312,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label">-</property> </object> @@ -1328,7 +1326,7 @@ <child> <object class="GtkSpinButton" id="_systemTimeMonthSpin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text" translatable="yes">1</property> <property name="orientation">vertical</property> <property name="adjustment">_systemTimeMonthSpinAdjustment</property> @@ -1344,7 +1342,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label">-</property> </object> @@ -1358,7 +1356,7 @@ <child> <object class="GtkSpinButton" id="_systemTimeDaySpin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text" translatable="yes">1</property> <property name="orientation">vertical</property> <property name="adjustment">_systemTimeDaySpinAdjustment</property> @@ -1374,7 +1372,7 @@ <child> <object class="GtkSpinButton" id="_systemTimeHourSpin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text" translatable="yes">0</property> <property name="orientation">vertical</property> <property name="adjustment">_systemTimeHourSpinAdjustment</property> @@ -1389,7 +1387,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label">:</property> </object> @@ -1403,7 +1401,7 @@ <child> <object class="GtkSpinButton" id="_systemTimeMinuteSpin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="text" translatable="yes">0</property> <property name="orientation">vertical</property> <property name="adjustment">_systemTimeMinuteSpinAdjustment</property> @@ -1427,13 +1425,13 @@ <object class="GtkCheckButton" id="_vSyncToggle"> <property name="label" translatable="yes">Enable VSync</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables Vertical Sync</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables Vertical Sync</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1445,13 +1443,13 @@ <object class="GtkCheckButton" id="_multiSchedToggle"> <property name="label" translatable="yes">Enable Multicore Scheduling</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables multi-core scheduling of threads</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables multi-core scheduling of threads</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1463,13 +1461,13 @@ <object class="GtkCheckButton" id="_ptcToggle"> <property name="label" translatable="yes">Enable Profiled Persistent Translation Cache</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables profiled translation cache persistency</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables profiled translation cache persistency</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1481,13 +1479,13 @@ <object class="GtkCheckButton" id="_fsicToggle"> <property name="label" translatable="yes">Enable FS Integrity Checks</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables integrity checks on Game content files</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables integrity checks on Game content files</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1505,17 +1503,17 @@ <child> <object class="GtkBox" id="_audioBackendBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <placeholder/> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Change System Region</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Change System Region</property> <property name="halign">end</property> - <property name="margin_right">5</property> + <property name="margin-right">5</property> <property name="label" translatable="yes">Audio Backend: </property> </object> <packing> @@ -1544,9 +1542,9 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> </object> <packing> <property name="expand">False</property> @@ -1558,21 +1556,21 @@ <child> <object class="GtkBox" id="CatHacks"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Hacks</property> <attributes> <attribute name="weight" value="bold"/> @@ -1587,9 +1585,9 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes"> - These may cause instability</property> </object> <packing> @@ -1608,21 +1606,21 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="_ignoreToggle"> <property name="label" translatable="yes">Ignore Missing Services</property> <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 ignoring missing services</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enable or disable ignoring missing services</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1653,36 +1651,36 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">System</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="TabGraphics"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="CatEnhancements"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> - <property name="margin_bottom">5</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Enhancements</property> <attributes> <attribute name="weight" value="bold"/> @@ -1697,21 +1695,21 @@ <child> <object class="GtkBox" id="EnhancementOptions"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="_shaderCacheToggle"> <property name="label" translatable="yes">Enable Shader Cache</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables Shader Cache</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables Shader Cache</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1722,14 +1720,14 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Resolution Scale applied to applicable render targets.</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Resolution Scale applied to applicable render targets.</property> <property name="label" translatable="yes">Resolution Scale:</property> </object> <packing> @@ -1742,9 +1740,9 @@ <child> <object class="GtkComboBoxText" id="_resScaleCombo"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Resolution Scale applied to applicable render targets.</property> - <property name="active_id">1</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Resolution Scale applied to applicable render targets.</property> + <property name="active-id">1</property> <items> <item id="1" translatable="yes">Native (720p/1080p)</item> <item id="2" translatable="yes">2x (1440p/2160p)</item> @@ -1762,12 +1760,12 @@ <child> <object class="GtkEntry" id="_resScaleText"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Floating point resolution scale, such as 1.5. Non-integral scales are more likely to cause issues or crash.</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Floating point resolution scale, such as 1.5. Non-integral scales are more likely to cause issues or crash.</property> <property name="valign">center</property> - <property name="caps_lock_warning">False</property> - <property name="placeholder_text">1.0</property> - <property name="input_purpose">number</property> + <property name="caps-lock-warning">False</property> + <property name="placeholder-text">1.0</property> + <property name="input-purpose">number</property> </object> <packing> <property name="expand">True</property> @@ -1786,14 +1784,14 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Level of Anisotropic Filtering (set to Auto to use the value requested by the game)</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Level of Anisotropic Filtering (set to Auto to use the value requested by the game)</property> <property name="label" translatable="yes">Anisotropic Filtering:</property> </object> <packing> @@ -1806,9 +1804,9 @@ <child> <object class="GtkComboBoxText" id="_anisotropy"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Level of Anisotropic Filtering (set to Auto to use the value requested by the game)</property> - <property name="active_id">-1</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Level of Anisotropic Filtering (set to Auto to use the value requested by the game)</property> + <property name="active-id">-1</property> <items> <item id="-1" translatable="yes">Auto</item> <item id="2" translatable="yes">2x</item> @@ -1849,7 +1847,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1861,18 +1859,18 @@ <child> <object class="GtkBox" id="CatDev"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> - <property name="margin_bottom">5</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Developer Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -1887,21 +1885,21 @@ <child> <object class="GtkBox" id="DevOptions"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</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="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> @@ -1914,10 +1912,10 @@ <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="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> + <property name="caps-lock-warning">False</property> </object> <packing> <property name="expand">True</property> @@ -1956,35 +1954,35 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Graphics</property> </object> <packing> <property name="position">3</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="TabLogging"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">10</property> - <property name="margin_top">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">10</property> + <property name="margin-top">5</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="CatLogging"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Logging</property> <attributes> <attribute name="weight" value="bold"/> @@ -1999,22 +1997,22 @@ <child> <object class="GtkBox" id="LogggingOptions"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="_fileLogToggle"> <property name="label" translatable="yes">Enable Logging to File</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables or disables logging to a file on disk</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables or disables logging to a file on disk</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2026,13 +2024,13 @@ <object class="GtkCheckButton" id="_stubLogToggle"> <property name="label" translatable="yes">Enable Stub Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing stub log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing stub log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2044,13 +2042,13 @@ <object class="GtkCheckButton" id="_infoLogToggle"> <property name="label" translatable="yes">Enable Info Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing info log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing info log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2062,13 +2060,13 @@ <object class="GtkCheckButton" id="_warningLogToggle"> <property name="label" translatable="yes">Enable Warning Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing warning log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing warning log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2080,13 +2078,13 @@ <object class="GtkCheckButton" id="_errorLogToggle"> <property name="label" translatable="yes">Enable Error Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing error log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing error log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2098,13 +2096,13 @@ <object class="GtkCheckButton" id="_guestLogToggle"> <property name="label" translatable="yes">Enable Guest Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing guest log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing guest log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2116,13 +2114,13 @@ <object class="GtkCheckButton" id="_fsAccessLogToggle"> <property name="label" translatable="yes">Enable Fs Access Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing fs access log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing fs access log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2133,12 +2131,12 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</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">Enables FS access log output to the console. Possible modes are 0-3</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Enables FS access log output to the console. Possible modes are 0-3</property> <property name="label" translatable="yes">Fs Global Access Log Mode:</property> </object> <packing> @@ -2151,8 +2149,8 @@ <child> <object class="GtkSpinButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Enables FS access log output to the console. Possible modes are 0-3</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Enables FS access log output to the console. Possible modes are 0-3</property> <property name="text" translatable="yes">0</property> <property name="adjustment">_fsLogSpinAdjustment</property> </object> @@ -2188,18 +2186,18 @@ <child> <object class="GtkBox" id="CatDevLogging"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> - <property name="margin_top">10</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> + <property name="margin-top">10</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Use with care</property> <property name="halign">start</property> - <property name="margin_bottom">5</property> - <property name="tooltip_text" translatable="yes">Use with care</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Developer Options (WARNING: Will reduce performance)</property> <attributes> <attribute name="weight" value="bold"/> @@ -2208,28 +2206,67 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkBox" id="DevLoggingOptions"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> <property name="orientation">vertical</property> <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Requires appropriate log levels enabled.</property> + <property name="label" translatable="yes">OpenGL Log Level</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">22</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="_graphicsDebugLevel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Requires appropriate log levels enabled.</property> + <property name="margin-left">5</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">22</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="_debugLogToggle"> <property name="label" translatable="yes">Enable Debug Logs</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Enables printing debug log messages</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Enables printing debug log messages</property> <property name="halign">start</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="draw_indicator">True</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -2237,41 +2274,12 @@ <property name="position">21</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Requires appropriate log levels enabled.</property> - <property name="label" translatable="yes">OpenGL Log Level</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">22</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="_graphicsDebugLevel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Requires appropriate log levels enabled.</property> - <property name="margin_left">5</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">22</property> - </packing> - </child> - </object> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> @@ -2289,12 +2297,12 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Logging</property> </object> <packing> <property name="position">4</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> @@ -2311,22 +2319,23 @@ <child> <object class="GtkButtonBox" id="_buttonBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_top">3</property> - <property name="margin_bottom">3</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-top">3</property> + <property name="margin-bottom">3</property> + <property name="spacing">5</property> + <property name="layout-style">end</property> <child> <object class="GtkToggleButton" id="SaveToggle"> <property name="label" translatable="yes">Save</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="toggled" handler="SaveToggle_Activated" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -2334,18 +2343,30 @@ <object class="GtkToggleButton" id="CloseToggle"> <property name="label" translatable="yes">Close</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_left">4</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="toggled" handler="CloseToggle_Activated" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Apply</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="ApplyToggle_Activated" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> |