Skip to content

Commit 988f27f

Browse files
MahBoiDeveloperMahBoiDeveloper
authored
Fix objects naming in OptionsPanel (CnCNet#705)
1 parent 1f8f8e5 commit 988f27f

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

‎DTAConfig/OptionPanels/AudioOptionsPanel.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ public override void Initialize()
5151
Name = "AudioOptionsPanel";
5252

5353
var lblScoreVolume = new XNALabel(WindowManager);
54-
lblScoreVolume.Name = "lblScoreVolume";
54+
lblScoreVolume.Name = nameof(lblScoreVolume);
5555
lblScoreVolume.ClientRectangle = new Rectangle(PADDING_X, PADDING_Y, 0, 0);
5656
lblScoreVolume.Text = "Music Volume:".L10N("Client:DTAConfig:MusicVolume");
5757

5858
lblScoreVolumeValue = new XNALabel(WindowManager);
59-
lblScoreVolumeValue.Name = "lblScoreVolumeValue";
59+
lblScoreVolumeValue.Name = nameof(lblScoreVolumeValue);
6060
lblScoreVolumeValue.FontIndex = 1;
6161
lblScoreVolumeValue.Text = "0";
6262
lblScoreVolumeValue.ClientRectangle = new Rectangle(
6363
Width - lblScoreVolumeValue.Width - PADDING_X,
6464
lblScoreVolume.Y, 0, 0);
6565

6666
trbScoreVolume = new XNATrackbar(WindowManager);
67-
trbScoreVolume.Name = "trbScoreVolume";
67+
trbScoreVolume.Name = nameof(trbScoreVolume);
6868
trbScoreVolume.ClientRectangle = new Rectangle(
6969
lblScoreVolume.Right + TRACKBAR_X_PADDING,
7070
lblScoreVolume.Y - TRACKBAR_Y_OFFSET,
@@ -76,21 +76,21 @@ public override void Initialize()
7676
trbScoreVolume.ValueChanged += TrbScoreVolume_ValueChanged;
7777

7878
var lblSoundVolume = new XNALabel(WindowManager);
79-
lblSoundVolume.Name = "lblSoundVolume";
79+
lblSoundVolume.Name = nameof(lblSoundVolume);
8080
lblSoundVolume.ClientRectangle = new Rectangle(lblScoreVolume.X,
8181
trbScoreVolume.Bottom + TRACKBAR_Y_PADDING + TRACKBAR_Y_OFFSET, 0, 0);
8282
lblSoundVolume.Text = "Sound Volume:".L10N("Client:DTAConfig:SoundVolume");
8383

8484
lblSoundVolumeValue = new XNALabel(WindowManager);
85-
lblSoundVolumeValue.Name = "lblSoundVolumeValue";
85+
lblSoundVolumeValue.Name = nameof(lblSoundVolumeValue);
8686
lblSoundVolumeValue.FontIndex = 1;
8787
lblSoundVolumeValue.Text = "0";
8888
lblSoundVolumeValue.ClientRectangle = new Rectangle(
8989
lblScoreVolumeValue.X,
9090
lblSoundVolume.Y, 0, 0);
9191

9292
trbSoundVolume = new XNATrackbar(WindowManager);
93-
trbSoundVolume.Name = "trbSoundVolume";
93+
trbSoundVolume.Name = nameof(trbSoundVolume);
9494
trbSoundVolume.ClientRectangle = new Rectangle(
9595
trbScoreVolume.X,
9696
trbScoreVolume.Bottom + TRACKBAR_Y_PADDING,
@@ -102,21 +102,21 @@ public override void Initialize()
102102
trbSoundVolume.ValueChanged += TrbSoundVolume_ValueChanged;
103103

104104
var lblVoiceVolume = new XNALabel(WindowManager);
105-
lblVoiceVolume.Name = "lblVoiceVolume";
105+
lblVoiceVolume.Name = nameof(lblVoiceVolume);
106106
lblVoiceVolume.ClientRectangle = new Rectangle(lblScoreVolume.X,
107107
trbSoundVolume.Bottom + TRACKBAR_Y_PADDING + TRACKBAR_Y_OFFSET, 0, 0);
108108
lblVoiceVolume.Text = "Voice Volume:".L10N("Client:DTAConfig:VoiceVolume");
109109

110110
lblVoiceVolumeValue = new XNALabel(WindowManager);
111-
lblVoiceVolumeValue.Name = "lblVoiceVolumeValue";
111+
lblVoiceVolumeValue.Name = nameof(lblVoiceVolumeValue);
112112
lblVoiceVolumeValue.FontIndex = 1;
113113
lblVoiceVolumeValue.Text = "0";
114114
lblVoiceVolumeValue.ClientRectangle = new Rectangle(
115115
lblScoreVolumeValue.X,
116116
lblVoiceVolume.Y, 0, 0);
117117

118118
trbVoiceVolume = new XNATrackbar(WindowManager);
119-
trbVoiceVolume.Name = "trbVoiceVolume";
119+
trbVoiceVolume.Name = nameof(trbVoiceVolume);
120120
trbVoiceVolume.ClientRectangle = new Rectangle(
121121
trbScoreVolume.X,
122122
trbSoundVolume.Bottom + TRACKBAR_Y_PADDING,
@@ -128,29 +128,29 @@ public override void Initialize()
128128
trbVoiceVolume.ValueChanged += TrbVoiceVolume_ValueChanged;
129129

130130
chkScoreShuffle = new XNAClientCheckBox(WindowManager);
131-
chkScoreShuffle.Name = "chkScoreShuffle";
131+
chkScoreShuffle.Name = nameof(chkScoreShuffle);
132132
chkScoreShuffle.ClientRectangle = new Rectangle(
133133
lblScoreVolume.X,
134134
trbVoiceVolume.Bottom + TRACKBAR_Y_PADDING, 0, 0);
135135
chkScoreShuffle.Text = "Shuffle Music".L10N("Client:DTAConfig:ShuffleMusic");
136136
AddChild(chkScoreShuffle);
137137

138138
var lblClientVolume = new XNALabel(WindowManager);
139-
lblClientVolume.Name = "lblClientVolume";
139+
lblClientVolume.Name = nameof(lblClientVolume);
140140
lblClientVolume.ClientRectangle = new Rectangle(lblScoreVolume.X,
141141
chkScoreShuffle.Bottom + GROUP_SPACING + TRACKBAR_Y_OFFSET, 0, 0);
142142
lblClientVolume.Text = "Client Volume:".L10N("Client:DTAConfig:ClientVolume");
143143

144144
lblClientVolumeValue = new XNALabel(WindowManager);
145-
lblClientVolumeValue.Name = "lblClientVolumeValue";
145+
lblClientVolumeValue.Name = nameof(lblClientVolumeValue);
146146
lblClientVolumeValue.FontIndex = 1;
147147
lblClientVolumeValue.Text = "0";
148148
lblClientVolumeValue.ClientRectangle = new Rectangle(
149149
lblScoreVolumeValue.X,
150150
lblClientVolume.Y, 0, 0);
151151

152152
trbClientVolume = new XNATrackbar(WindowManager);
153-
trbClientVolume.Name = "trbClientVolume";
153+
trbClientVolume.Name = nameof(trbClientVolume);
154154
trbClientVolume.ClientRectangle = new Rectangle(
155155
trbScoreVolume.X,
156156
lblClientVolume.Y - TRACKBAR_Y_OFFSET,
@@ -162,7 +162,7 @@ public override void Initialize()
162162
trbClientVolume.ValueChanged += TrbClientVolume_ValueChanged;
163163

164164
chkMainMenuMusic = new XNAClientCheckBox(WindowManager);
165-
chkMainMenuMusic.Name = "chkMainMenuMusic";
165+
chkMainMenuMusic.Name = nameof(chkMainMenuMusic);
166166
chkMainMenuMusic.Text = "Main menu music".L10N("Client:DTAConfig:MainMenuMusic");
167167
chkMainMenuMusic.ClientRectangle = new Rectangle(
168168
lblScoreVolume.X,
@@ -171,14 +171,14 @@ public override void Initialize()
171171
AddChild(chkMainMenuMusic);
172172

173173
chkStopMusicOnMenu = new XNAClientCheckBox(WindowManager);
174-
chkStopMusicOnMenu.Name = "chkStopMusicOnMenu";
174+
chkStopMusicOnMenu.Name = nameof(chkStopMusicOnMenu);
175175
chkStopMusicOnMenu.Text = "Don't play main menu music in lobbies".L10N("Client:DTAConfig:NoLobbiesMusic");
176176
chkStopMusicOnMenu.ClientRectangle = new Rectangle(
177177
lblScoreVolume.X, chkMainMenuMusic.ClientRectangle.Bottom + CHECKBOX_SPACING, 0, 0);
178178
AddChild(chkStopMusicOnMenu);
179179

180180
chkStopGameLobbyMessageAudio = new XNAClientCheckBox(WindowManager);
181-
chkStopGameLobbyMessageAudio.Name = "chkStopGameLobbyMessageAudio";
181+
chkStopGameLobbyMessageAudio.Name = nameof(chkStopGameLobbyMessageAudio);
182182
chkStopGameLobbyMessageAudio.Text = "Don't play lobby message audio when game is running".L10N("Client:DTAConfig:NoGameLobbyMessageAudio");
183183
chkStopGameLobbyMessageAudio.ClientRectangle = new Rectangle(
184184
lblScoreVolume.X, chkStopMusicOnMenu.Bottom + CHECKBOX_SPACING, 0, 0);

‎DTAConfig/OptionPanels/DisplayOptionsPanel.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ public override void Initialize()
6969
Name = "DisplayOptionsPanel";
7070

7171
var lblIngameResolution = new XNALabel(WindowManager);
72-
lblIngameResolution.Name = "lblIngameResolution";
72+
lblIngameResolution.Name = nameof(lblIngameResolution);
7373
lblIngameResolution.ClientRectangle = new Rectangle(12, 14, 0, 0);
7474
lblIngameResolution.Text = "In-game Resolution:".L10N("Client:DTAConfig:InGameResolution");
7575

7676
ddIngameResolution = new XNAClientDropDown(WindowManager);
77-
ddIngameResolution.Name = "ddIngameResolution";
77+
ddIngameResolution.Name = nameof(ddIngameResolution);
7878
ddIngameResolution.ClientRectangle = new Rectangle(
7979
lblIngameResolution.Right + 12,
8080
lblIngameResolution.Y - 2, 120, 19);
@@ -97,13 +97,13 @@ public override void Initialize()
9797
}
9898

9999
var lblDetailLevel = new XNALabel(WindowManager);
100-
lblDetailLevel.Name = "lblDetailLevel";
100+
lblDetailLevel.Name = nameof(lblDetailLevel);
101101
lblDetailLevel.ClientRectangle = new Rectangle(lblIngameResolution.X,
102102
ddIngameResolution.Bottom + 16, 0, 0);
103103
lblDetailLevel.Text = "Detail Level:".L10N("Client:DTAConfig:DetailLevel");
104104

105105
ddDetailLevel = new XNAClientDropDown(WindowManager);
106-
ddDetailLevel.Name = "ddDetailLevel";
106+
ddDetailLevel.Name = nameof(ddDetailLevel);
107107
ddDetailLevel.ClientRectangle = new Rectangle(
108108
ddIngameResolution.X,
109109
lblDetailLevel.Y - 2,
@@ -114,13 +114,13 @@ public override void Initialize()
114114
ddDetailLevel.AddItem("High".L10N("Client:DTAConfig:DetailLevelHigh"));
115115

116116
var lblRenderer = new XNALabel(WindowManager);
117-
lblRenderer.Name = "lblRenderer";
117+
lblRenderer.Name = nameof(lblRenderer);
118118
lblRenderer.ClientRectangle = new Rectangle(lblDetailLevel.X,
119119
ddDetailLevel.Bottom + 16, 0, 0);
120120
lblRenderer.Text = "Renderer:".L10N("Client:DTAConfig:Renderer");
121121

122122
ddRenderer = new XNAClientDropDown(WindowManager);
123-
ddRenderer.Name = "ddRenderer";
123+
ddRenderer.Name = nameof(ddRenderer);
124124
ddRenderer.ClientRectangle = new Rectangle(
125125
ddDetailLevel.X,
126126
lblRenderer.Y - 2,
@@ -144,35 +144,35 @@ public override void Initialize()
144144
}
145145

146146
chkWindowedMode = new XNAClientCheckBox(WindowManager);
147-
chkWindowedMode.Name = "chkWindowedMode";
147+
chkWindowedMode.Name = nameof(chkWindowedMode);
148148
chkWindowedMode.ClientRectangle = new Rectangle(lblDetailLevel.X,
149149
ddRenderer.Bottom + 16, 0, 0);
150150
chkWindowedMode.Text = "Windowed Mode".L10N("Client:DTAConfig:WindowedMode");
151151
chkWindowedMode.CheckedChanged += ChkWindowedMode_CheckedChanged;
152152

153153
chkBorderlessWindowedMode = new XNAClientCheckBox(WindowManager);
154-
chkBorderlessWindowedMode.Name = "chkBorderlessWindowedMode";
154+
chkBorderlessWindowedMode.Name = nameof(chkBorderlessWindowedMode);
155155
chkBorderlessWindowedMode.ClientRectangle = new Rectangle(
156156
chkWindowedMode.X + 50,
157157
chkWindowedMode.Bottom + 24, 0, 0);
158158
chkBorderlessWindowedMode.Text = "Borderless Windowed Mode".L10N("Client:DTAConfig:BorderlessWindowedMode");
159159
chkBorderlessWindowedMode.AllowChecking = false;
160160

161161
chkBackBufferInVRAM = new XNAClientCheckBox(WindowManager);
162-
chkBackBufferInVRAM.Name = "chkBackBufferInVRAM";
162+
chkBackBufferInVRAM.Name = nameof(chkBackBufferInVRAM);
163163
chkBackBufferInVRAM.ClientRectangle = new Rectangle(
164164
lblDetailLevel.X,
165165
chkBorderlessWindowedMode.Bottom + 28, 0, 0);
166166
chkBackBufferInVRAM.Text = ("Back Buffer in Video Memory\n(lower performance, but is\nnecessary on some systems)").L10N("Client:DTAConfig:BackBuffer");
167167

168168
var lblClientResolution = new XNALabel(WindowManager);
169-
lblClientResolution.Name = "lblClientResolution";
169+
lblClientResolution.Name = nameof(lblClientResolution);
170170
lblClientResolution.ClientRectangle = new Rectangle(
171171
285, 14, 0, 0);
172172
lblClientResolution.Text = "Client Resolution:".L10N("Client:DTAConfig:ClientResolution");
173173

174174
ddClientResolution = new XNAClientPreferredItemDropDown(WindowManager);
175-
ddClientResolution.Name = "ddClientResolution";
175+
ddClientResolution.Name = nameof(ddClientResolution);
176176
ddClientResolution.ClientRectangle = new Rectangle(
177177
lblClientResolution.Right + 12,
178178
lblClientResolution.Y - 2,
@@ -213,7 +213,7 @@ .. ScreenResolution.GetWindowedResolutions(minWidth: 800, minHeight: 600),
213213
}
214214

215215
chkBorderlessClient = new XNAClientCheckBox(WindowManager);
216-
chkBorderlessClient.Name = "chkBorderlessClient";
216+
chkBorderlessClient.Name = nameof(chkBorderlessClient);
217217
chkBorderlessClient.ClientRectangle = new Rectangle(
218218
lblClientResolution.X,
219219
lblDetailLevel.Y, 0, 0);
@@ -240,14 +240,14 @@ to be resized (does not affect the selected client resolution).
240240
.L10N("Client:DTAConfig:IntegerScaledClientToolTip");
241241

242242
var lblClientTheme = new XNALabel(WindowManager);
243-
lblClientTheme.Name = "lblClientTheme";
243+
lblClientTheme.Name = nameof(lblClientTheme);
244244
lblClientTheme.ClientRectangle = new Rectangle(
245245
lblClientResolution.X,
246246
chkWindowedMode.Y, 0, 0);
247247
lblClientTheme.Text = "Client Theme:".L10N("Client:DTAConfig:ClientTheme");
248248

249249
ddClientTheme = new XNAClientDropDown(WindowManager);
250-
ddClientTheme.Name = "ddClientTheme";
250+
ddClientTheme.Name = nameof(ddClientTheme);
251251
ddClientTheme.ClientRectangle = new Rectangle(
252252
ddClientResolution.X,
253253
chkWindowedMode.Y,
@@ -285,21 +285,21 @@ to be resized (does not affect the selected client resolution).
285285
if (ClientConfiguration.Instance.ClientGameType == ClientType.TS)
286286
{
287287
lblCompatibilityFixes = new XNALabel(WindowManager);
288-
lblCompatibilityFixes.Name = "lblCompatibilityFixes";
288+
lblCompatibilityFixes.Name = nameof(lblCompatibilityFixes);
289289
lblCompatibilityFixes.FontIndex = 1;
290290
lblCompatibilityFixes.Text = "Compatibility Fixes (advanced):".L10N("Client:DTAConfig:TSCompatibilityFixAdv");
291291
AddChild(lblCompatibilityFixes);
292292
lblCompatibilityFixes.CenterOnParent();
293293
lblCompatibilityFixes.Y = Height - 103;
294294

295295
lblGameCompatibilityFix = new XNALabel(WindowManager);
296-
lblGameCompatibilityFix.Name = "lblGameCompatibilityFix";
296+
lblGameCompatibilityFix.Name = nameof(lblGameCompatibilityFix);
297297
lblGameCompatibilityFix.ClientRectangle = new Rectangle(132,
298298
lblCompatibilityFixes.Bottom + 20, 0, 0);
299299
lblGameCompatibilityFix.Text = "DTA/TI/TS Compatibility Fix:".L10N("Client:DTAConfig:TSCompatibilityFix");
300300

301301
btnGameCompatibilityFix = new XNAClientButton(WindowManager);
302-
btnGameCompatibilityFix.Name = "btnGameCompatibilityFix";
302+
btnGameCompatibilityFix.Name = nameof(btnGameCompatibilityFix);
303303
btnGameCompatibilityFix.ClientRectangle = new Rectangle(
304304
lblGameCompatibilityFix.Right + 20,
305305
lblGameCompatibilityFix.Y - 4, UIDesignConstants.BUTTON_WIDTH_133, UIDesignConstants.BUTTON_HEIGHT);
@@ -312,14 +312,14 @@ to be resized (does not affect the selected client resolution).
312312
btnGameCompatibilityFix.AllowClick = false;
313313

314314
lblMapEditorCompatibilityFix = new XNALabel(WindowManager);
315-
lblMapEditorCompatibilityFix.Name = "lblMapEditorCompatibilityFix";
315+
lblMapEditorCompatibilityFix.Name = nameof(lblMapEditorCompatibilityFix);
316316
lblMapEditorCompatibilityFix.ClientRectangle = new Rectangle(
317317
lblGameCompatibilityFix.X,
318318
lblGameCompatibilityFix.Bottom + 20, 0, 0);
319319
lblMapEditorCompatibilityFix.Text = "FinalSun Compatibility Fix:".L10N("Client:DTAConfig:TSFinalSunFix");
320320

321321
btnMapEditorCompatibilityFix = new XNAClientButton(WindowManager);
322-
btnMapEditorCompatibilityFix.Name = "btnMapEditorCompatibilityFix";
322+
btnMapEditorCompatibilityFix.Name = nameof(btnMapEditorCompatibilityFix);
323323
btnMapEditorCompatibilityFix.ClientRectangle = new Rectangle(
324324
btnGameCompatibilityFix.X,
325325
lblMapEditorCompatibilityFix.Y - 4,

0 commit comments

Comments
 (0)