Support settings keys and hotkey config embedded in settings INI for RA1 by CO2-code · Pull Request #943 · CnCNet/xna-cncnet-client

CO2-code · 2026-03-06T12:30:19Z

Fixes an issue where hotkeys and client settings overwrite each other when using same INI file.
Updated UserINISettings key mapping to match RA1's expected keys.
Made the hotkey section configurable (allowing RA1 to use WinHotkeys while other games continue using Hotkey).

Removed RA game type settings from UserINISettings.

…client into Ra1-Options

…-cncnet-client into Ra1-Options" This reverts commit 1721273, reversing changes made to 7bf4645.

add KeyboardHotkeySection to the configs

github-actions · 2026-03-06T12:35:46Z

Nightly build for this pull request:

artifacts.zip
This comment is automatic and is meant to allow guests to get latest automatic builds without registering. It is updated on every successful build.

Metadorius

The keyboard INI change is good and if you split it out it can be merged even now, the rest needs more refinement

ClientCore/Settings/UserINISettings.cs

Metadorius · 2026-03-06T15:37:44Z

ClientGUI/HotkeyConfigurationWindow.cs

    {
-        private readonly string HOTKEY_TIP_TEXT = "Press a key...".L10N("Client:DTAConfig:PressAKey");
-        private const string HOTKEY_INI_SECTION = "Hotkey";
+        private readonly string HOTKEY_TIP_TEXT = "Press a key...".L10N("Client:DTAConfig:PressAKey");      


what changed in this specific line? did line ending change? that should be reverted as it litters the history with unnecessary changes

I deleted (private const string HOTKEY_INI_SECTION = "Hotkey";) only

Metadorius · 2026-03-06T15:39:08Z

ClientCore/Settings/UserINISettings.cs

        /* AUDIO */
        /*********/

+        public DoubleSetting MultiplayerScoreVolume { get; private set; }


not sure what is this for, some other score volume?

not sure what is this for, some other score volume?

yes ScoreVolume and MultiplayerScoreVolume are the game's "Music volume"

should be done in another way probably, not sure. @SadPencil @11EJDE11 opinions?

should be done in another way probably, not sure. @SadPencil @11EJDE11 opinions?

can you re-review please

not sure what is this for, some other score volume?

yes ScoreVolume and MultiplayerScoreVolume are the game's "Music volume"

Can we assume ScoreVolume and MultiplayerScoreVolume always have the same values?

not sure what is this for, some other score volume?

yes ScoreVolume and MultiplayerScoreVolume are the game's "Music volume"

Can we assume ScoreVolume and MultiplayerScoreVolume always have the same values?

I am 100% sure that they should always have the same values , according to Iran's RAConfigTool ,

double MusicVolume = ((double)this.Slider_MusicVolume.Value) / 1000;
Files.RedAlertINI.setStringValue("Options", "ScoreVolume", MusicVolume.ToString());
Files.RedAlertINI.setStringValue("Options", "MultiplayerScoreVolume", MusicVolume.ToString());

Metadorius · 2026-03-06T15:41:34Z

The keyboard INI change is good

although keep in mind that this is a basic review of only changed files, I suspect there may be more places to handle this

Metadorius · 2026-03-06T15:43:10Z

have you handled "reset to defaults" part of the keyboard INI to work with RA1 setup and your changes?

CO2-code · 2026-03-06T16:07:38Z

have you handled "reset to defaults" part of the keyboard INI to work with RA1 setup and your changes?

I think it is already done as it uses WriteKeyboardINI() , right ?

Metadorius

looks much better now! remind me to review in more details on weekend

CO2-code · 2026-03-06T22:56:22Z

looks much better now! remind me to review in more details on weekend

for me the weekend is Saturday and Sunday , which starts tomorrow :)

Metadorius · 2026-03-07T01:41:27Z

yea correct, I'll just forget by tomorrow likely 🤣

Removed call to HotkeyConfigurationWindow.WriteKeyboardINI() during settings save.

CO2-code · 2026-03-07T11:58:49Z

yea correct, I'll just forget by tomorrow likely 🤣

Reminder :)
also don't forget to check why hotkeys getting deleted after Clickin "Save" button in the options window
Edit : I think I have fixed that tho , just let me know if thats the correct way :)
Edit 2 : It only works if hotkeys section exists before firstluanch :( , but assigning doesn't work :(

Added functionality to handle keyboard hotkey section and apply default settings.

Add hotkey section handling in SaveSettings method.

Refactor WriteKeyboardINI method to use UserINISettings for keyboard configuration.

Metadorius · 2026-03-07T19:46:16Z

ClientCore/Settings/UserINISettings.cs

+            if (ClientConfiguration.Instance.ClientGameType == ClientType.RA)
+            {
+                _instance = new UserINISettings(userIni);
+                return;
+            }


what is this for?

DXMainClient/Resources/ClientDefinitions.ini

ClientCore/Settings/UserINISettings.cs

11EJDE11 · 2026-03-07T23:04:09Z

ClientGUI/HotkeyConfigurationWindow.cs

 using Rampastring.XNAUI.XNAControls;
 using System;
 using System.Collections.Generic;
+using ClientCore.Enums;


Remove this, it's unused.

11EJDE11 · 2026-03-07T23:30:50Z

ClientGUI/HotkeyConfigurationWindow.cs

+            // TODO should it be like this and main settings window will handle it, or should we flush even here, saving all settings?
+            if (!ClientConfiguration.Instance.SettingsIniAsKeyboardIni)
+                keyboardIni.WriteIniFile(SafePath.CombineFilePath(ProgramConstants.GamePath, ClientConfiguration.Instance.KeyboardINI));


For consistency I'd say flush here. The hotkey window has its own save button.

if (ClientConfiguration.Instance.SettingsIniAsKeyboardIni) keyboardIni.WriteIniFile(); else keyboardIni.WriteIniFile(SafePath.CombineFilePath(ProgramConstants.GamePath, ClientConfiguration.Instance.KeyboardINI));

just as you said this I realized it's not gonna work. Imagine a situation when the user pressed save in the hotkey config window, then decided they don't want config changes they did in the options.

If we don't flush here, everything (including hotkeys) can be restored by hitting a cancel.

If we flush here - you can't cancel anymore at all.

The hotkeys erased/not is a discrepancy in behavior, though, but I'd argue it's not as critical and the behavior with unified INI might be more logical

Makes sense, what a pain. I guess just add a comment explaining that for now.

SadPencil · 2026-03-08T02:33:22Z

ClientCore/ClientConfiguration.cs

+        public bool SettingsIniAsKeyboardIni => SettingsIniName == KeyboardINI;
+
+        public string KeyboardHotkeySection => clientDefinitionsIni.GetStringValue(SETTINGS, "KeyboardHotkeySection", "Hotkey");
+


Consider that we already introduced so many hard coded ini key names for RA, when providing the default value of KeyboardHotkeySection, provide "WinHotKeys" as the default value when it's RA.

CO2-code added 14 commits February 19, 2026 19:21

Update UserINISettings.cs

8beee92

Remove RA specific settings from UserINISettings

9c6b1c6

Removed RA game type settings from UserINISettings.

Update UserINISettings.cs

7bf4645

Merge branch 'Ra1-Options' of https://github.com/CO2-code/xna-cncnet-…

1721273

…client into Ra1-Options

Update UserINISettings.cs

512d1e9

Revert "Merge branch 'Ra1-Options' of https://github.com/CO2-code/xna…

542943c

…-cncnet-client into Ra1-Options" This reverts commit 1721273, reversing changes made to 7bf4645.

Merge branch 'CnCNet:develop' into Ra1-Options

44f15db

Update UserINISettings.cs

66928c0

Update UserINISettings.cs

7f0b5d9

Update UserINISettings.cs

3ddd460

Add new settings for detail level and input intervals

0559426

Add KeyboardHotkeySection property to ClientConfiguration

625a1a7

Refactor hotkey configuration handling

8992461

Update ClientDefinitions.ini

5c2257a

add KeyboardHotkeySection to the configs

Metadorius reviewed Mar 6, 2026

View reviewed changes

CO2-code added 9 commits March 6, 2026 21:29

Update UserINISettings.cs

11c4f4a

Update UserINISettings.cs

2820c26

fixes :)

2e042c3

Fix hotkey configuration file writing method

a7fd805

Add using directive for System namespace

624ed84

Update keyboardIni.Write to WriteIniFile with path

c80bb05

Update HotkeyConfigurationWindow.cs

2325dfd

Remove 'WinHotkeys' section from settings

46e4166

Remove hotkey section from settings if specified

5b39728

Metadorius reviewed Mar 6, 2026

View reviewed changes

Refactor WriteKeyboardINI method for clarity

e8a8638

CO2-code added 5 commits March 7, 2026 10:31

Fix a typo

d6f7774

Remove hotkey section cleanup from settings

dc99624

Save hotkey configuration when saving options

9ea5c68

Refactor HotkeyConfigurationWindow method call

a4666c6

Remove hotkey configuration write during save

bca2b47

Removed call to HotkeyConfigurationWindow.WriteKeyboardINI() during settings save.

CO2-code and others added 8 commits March 7, 2026 16:59

Initialize UserINISettings for RA client type

67c7eae

Add WinHotkeys section conditionally in INI settings

cc37971

Refactor SaveSettings to use SettingsIni

bf9e323

Enhance UserINISettings with hotkey section handling

cf857e3

Added functionality to handle keyboard hotkey section and apply default settings.

Implement hotkey section management in settings

81b0031

Add hotkey section handling in SaveSettings method.

Update WriteKeyboardINI to use UserINISettings

25bf147

Refactor WriteKeyboardINI method to use UserINISettings for keyboard configuration.

Add ClientCore.Enums namespace to HotkeyConfigurationWindow

05bed27

simplify MultiplayerScoreVolume support

74ec0db

Metadorius reviewed Mar 7, 2026

View reviewed changes

Metadorius added 2 commits March 7, 2026 22:36

big cleanup and rewrite

f25247f

smol cleanup and no rewrite

896774e

Metadorius reviewed Mar 7, 2026

View reviewed changes

DXMainClient/Resources/ClientDefinitions.ini Outdated Show resolved Hide resolved

Metadorius reviewed Mar 7, 2026

View reviewed changes

ClientCore/Settings/UserINISettings.cs Outdated Show resolved Hide resolved

Apply suggestions from code review

4291069

Metadorius changed the title ~~features and fixes for RA1~~ Support settings keys and hotkey config embedded in settings INI for RA1 Mar 7, 2026

11EJDE11 reviewed Mar 7, 2026

View reviewed changes

SadPencil reviewed Mar 8, 2026

View reviewed changes

Remove unused ClientCore.Enums namespace

5072fcd

		public bool SettingsIniAsKeyboardIni => SettingsIniName == KeyboardINI;

		public string KeyboardHotkeySection => clientDefinitionsIni.GetStringValue(SETTINGS, "KeyboardHotkeySection", "Hotkey");

Uh oh!

Conversation

CO2-code commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Metadorius left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CO2-code Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Metadorius commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Metadorius commented Mar 6, 2026

Uh oh!

CO2-code commented Mar 6, 2026

Uh oh!

Metadorius left a comment

Choose a reason for hiding this comment

Uh oh!

CO2-code commented Mar 6, 2026

Uh oh!

Metadorius commented Mar 7, 2026

Uh oh!

CO2-code commented Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Mar 6, 2026 •

edited

Loading

CO2-code Mar 7, 2026 •

edited

Loading

Metadorius commented Mar 6, 2026 •

edited

Loading

CO2-code commented Mar 7, 2026 •

edited

Loading