Skip to content

Commit 0d9d14f

Browse files
MyNameIsTrezMyNameIsTrez
committed
Last 30x using namespace RTE
1 parent 1578aaf commit 0d9d14f

30 files changed

Lines changed: 7524 additions & 7551 deletions

‎Source/Menus/SettingsGUI.cpp‎

Lines changed: 150 additions & 151 deletions
Large diffs are not rendered by default.

‎Source/Menus/SettingsInputGUI.cpp‎

Lines changed: 181 additions & 182 deletions
Large diffs are not rendered by default.

‎Source/Menus/SettingsInputMappingGUI.cpp‎

Lines changed: 154 additions & 155 deletions
Large diffs are not rendered by default.

‎Source/Menus/SettingsInputMappingWizardGUI.cpp‎

Lines changed: 938 additions & 939 deletions
Large diffs are not rendered by default.

‎Source/Menus/SettingsMiscGUI.cpp‎

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -9,84 +9,83 @@
99
#include "GUILabel.h"
1010
#include "GUISlider.h"
1111

12-
namespace RTE {
12+
using namespace RTE;
1313

14-
SettingsMiscGUI::SettingsMiscGUI(GUIControlManager* parentControlManager) :
15-
m_GUIControlManager(parentControlManager) {
16-
m_MiscSettingsBox = dynamic_cast<GUICollectionBox*>(m_GUIControlManager->GetControl("CollectionBoxMiscSettings"));
14+
SettingsMiscGUI::SettingsMiscGUI(GUIControlManager* parentControlManager) :
15+
m_GUIControlManager(parentControlManager) {
16+
m_MiscSettingsBox = dynamic_cast<GUICollectionBox*>(m_GUIControlManager->GetControl("CollectionBoxMiscSettings"));
1717

18-
m_SkipIntroCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxSkipIntro"));
19-
m_SkipIntroCheckbox->SetCheck(g_SettingsMan.SkipIntro());
18+
m_SkipIntroCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxSkipIntro"));
19+
m_SkipIntroCheckbox->SetCheck(g_SettingsMan.SkipIntro());
2020

21-
m_ShowToolTipsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowToolTips"));
22-
m_ShowToolTipsCheckbox->SetCheck(g_SettingsMan.ShowToolTips());
21+
m_ShowToolTipsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowToolTips"));
22+
m_ShowToolTipsCheckbox->SetCheck(g_SettingsMan.ShowToolTips());
2323

24-
m_ShowLoadingScreenProgressReportCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowLoadingScreenProgressReport"));
25-
m_ShowLoadingScreenProgressReportCheckbox->SetCheck(!g_SettingsMan.GetLoadingScreenProgressReportDisabled());
24+
m_ShowLoadingScreenProgressReportCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowLoadingScreenProgressReport"));
25+
m_ShowLoadingScreenProgressReportCheckbox->SetCheck(!g_SettingsMan.GetLoadingScreenProgressReportDisabled());
2626

27-
m_ShowAdvancedPerfStatsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowAdvancedPerfStats"));
28-
m_ShowAdvancedPerfStatsCheckbox->SetCheck(g_PerformanceMan.AdvancedPerformanceStatsEnabled());
27+
m_ShowAdvancedPerfStatsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxShowAdvancedPerfStats"));
28+
m_ShowAdvancedPerfStatsCheckbox->SetCheck(g_PerformanceMan.AdvancedPerformanceStatsEnabled());
2929

30-
m_MeasureLoadTimeCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxMeasureLoadingTime"));
31-
m_MeasureLoadTimeCheckbox->SetCheck(g_SettingsMan.IsMeasuringModuleLoadTime());
30+
m_MeasureLoadTimeCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxMeasureLoadingTime"));
31+
m_MeasureLoadTimeCheckbox->SetCheck(g_SettingsMan.IsMeasuringModuleLoadTime());
3232

33-
m_UseMonospaceConsoleFontCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxUseMonospaceConsoleFont"));
34-
m_UseMonospaceConsoleFontCheckbox->SetCheck(g_ConsoleMan.GetConsoleUseMonospaceFont());
33+
m_UseMonospaceConsoleFontCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxUseMonospaceConsoleFont"));
34+
m_UseMonospaceConsoleFontCheckbox->SetCheck(g_ConsoleMan.GetConsoleUseMonospaceFont());
3535

36-
m_DisableFactionBuyMenuThemesCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxDisableFactionBuyMenuThemes"));
37-
m_DisableFactionBuyMenuThemesCheckbox->SetCheck(g_SettingsMan.FactionBuyMenuThemesDisabled());
36+
m_DisableFactionBuyMenuThemesCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxDisableFactionBuyMenuThemes"));
37+
m_DisableFactionBuyMenuThemesCheckbox->SetCheck(g_SettingsMan.FactionBuyMenuThemesDisabled());
3838

39-
m_DisableFactionBuyMenuThemeCursorsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxDisableFactionBuyMenuThemeCursors"));
40-
m_DisableFactionBuyMenuThemeCursorsCheckbox->SetCheck(g_SettingsMan.FactionBuyMenuThemeCursorsDisabled());
39+
m_DisableFactionBuyMenuThemeCursorsCheckbox = dynamic_cast<GUICheckbox*>(m_GUIControlManager->GetControl("CheckboxDisableFactionBuyMenuThemeCursors"));
40+
m_DisableFactionBuyMenuThemeCursorsCheckbox->SetCheck(g_SettingsMan.FactionBuyMenuThemeCursorsDisabled());
4141

42-
m_SceneBackgroundAutoScaleLabel = dynamic_cast<GUILabel*>(m_GUIControlManager->GetControl("LabelSceneBackgroundAutoScaleSetting"));
43-
UpdateSceneBackgroundAutoScaleLabel();
42+
m_SceneBackgroundAutoScaleLabel = dynamic_cast<GUILabel*>(m_GUIControlManager->GetControl("LabelSceneBackgroundAutoScaleSetting"));
43+
UpdateSceneBackgroundAutoScaleLabel();
4444

45-
m_SceneBackgroundAutoScaleSlider = dynamic_cast<GUISlider*>(m_GUIControlManager->GetControl("SliderSceneBackgroundAutoScale"));
46-
m_SceneBackgroundAutoScaleSlider->SetValue(g_SettingsMan.GetSceneBackgroundAutoScaleMode());
47-
}
45+
m_SceneBackgroundAutoScaleSlider = dynamic_cast<GUISlider*>(m_GUIControlManager->GetControl("SliderSceneBackgroundAutoScale"));
46+
m_SceneBackgroundAutoScaleSlider->SetValue(g_SettingsMan.GetSceneBackgroundAutoScaleMode());
47+
}
4848

49-
void SettingsMiscGUI::SetEnabled(bool enable) const {
50-
m_MiscSettingsBox->SetVisible(enable);
51-
m_MiscSettingsBox->SetEnabled(enable);
52-
}
49+
void SettingsMiscGUI::SetEnabled(bool enable) const {
50+
m_MiscSettingsBox->SetVisible(enable);
51+
m_MiscSettingsBox->SetEnabled(enable);
52+
}
5353

54-
void SettingsMiscGUI::UpdateSceneBackgroundAutoScaleLabel() {
55-
switch (g_SettingsMan.GetSceneBackgroundAutoScaleMode()) {
56-
case 1:
57-
m_SceneBackgroundAutoScaleLabel->SetText("Stretch to fit screen");
58-
break;
59-
case 2:
60-
m_SceneBackgroundAutoScaleLabel->SetText("Always upscaled");
61-
break;
62-
default:
63-
m_SceneBackgroundAutoScaleLabel->SetText("Disabled");
64-
break;
65-
}
54+
void SettingsMiscGUI::UpdateSceneBackgroundAutoScaleLabel() {
55+
switch (g_SettingsMan.GetSceneBackgroundAutoScaleMode()) {
56+
case 1:
57+
m_SceneBackgroundAutoScaleLabel->SetText("Stretch to fit screen");
58+
break;
59+
case 2:
60+
m_SceneBackgroundAutoScaleLabel->SetText("Always upscaled");
61+
break;
62+
default:
63+
m_SceneBackgroundAutoScaleLabel->SetText("Disabled");
64+
break;
6665
}
67-
68-
void SettingsMiscGUI::HandleInputEvents(GUIEvent& guiEvent) {
69-
if (guiEvent.GetType() == GUIEvent::Notification) {
70-
if (guiEvent.GetControl() == m_SkipIntroCheckbox) {
71-
g_SettingsMan.SetSkipIntro(m_SkipIntroCheckbox->GetCheck());
72-
} else if (guiEvent.GetControl() == m_ShowToolTipsCheckbox) {
73-
g_SettingsMan.SetShowToolTips(m_ShowToolTipsCheckbox->GetCheck());
74-
} else if (guiEvent.GetControl() == m_ShowLoadingScreenProgressReportCheckbox) {
75-
g_SettingsMan.SetLoadingScreenProgressReportDisabled(!m_ShowLoadingScreenProgressReportCheckbox->GetCheck());
76-
} else if (guiEvent.GetControl() == m_ShowAdvancedPerfStatsCheckbox) {
77-
g_PerformanceMan.ShowAdvancedPerformanceStats(m_ShowAdvancedPerfStatsCheckbox->GetCheck());
78-
} else if (guiEvent.GetControl() == m_MeasureLoadTimeCheckbox) {
79-
g_SettingsMan.MeasureModuleLoadTime(m_MeasureLoadTimeCheckbox->GetCheck());
80-
} else if (guiEvent.GetControl() == m_UseMonospaceConsoleFontCheckbox) {
81-
g_ConsoleMan.SetConsoleUseMonospaceFont(m_UseMonospaceConsoleFontCheckbox->GetCheck());
82-
} else if (guiEvent.GetControl() == m_DisableFactionBuyMenuThemesCheckbox) {
83-
g_SettingsMan.SetFactionBuyMenuThemesDisabled(m_DisableFactionBuyMenuThemesCheckbox->GetCheck());
84-
} else if (guiEvent.GetControl() == m_DisableFactionBuyMenuThemeCursorsCheckbox) {
85-
g_SettingsMan.SetFactionBuyMenuThemeCursorsDisabled(m_DisableFactionBuyMenuThemeCursorsCheckbox->GetCheck());
86-
} else if (guiEvent.GetControl() == m_SceneBackgroundAutoScaleSlider) {
87-
g_SettingsMan.SetSceneBackgroundAutoScaleMode(m_SceneBackgroundAutoScaleSlider->GetValue());
88-
UpdateSceneBackgroundAutoScaleLabel();
89-
}
66+
}
67+
68+
void SettingsMiscGUI::HandleInputEvents(GUIEvent& guiEvent) {
69+
if (guiEvent.GetType() == GUIEvent::Notification) {
70+
if (guiEvent.GetControl() == m_SkipIntroCheckbox) {
71+
g_SettingsMan.SetSkipIntro(m_SkipIntroCheckbox->GetCheck());
72+
} else if (guiEvent.GetControl() == m_ShowToolTipsCheckbox) {
73+
g_SettingsMan.SetShowToolTips(m_ShowToolTipsCheckbox->GetCheck());
74+
} else if (guiEvent.GetControl() == m_ShowLoadingScreenProgressReportCheckbox) {
75+
g_SettingsMan.SetLoadingScreenProgressReportDisabled(!m_ShowLoadingScreenProgressReportCheckbox->GetCheck());
76+
} else if (guiEvent.GetControl() == m_ShowAdvancedPerfStatsCheckbox) {
77+
g_PerformanceMan.ShowAdvancedPerformanceStats(m_ShowAdvancedPerfStatsCheckbox->GetCheck());
78+
} else if (guiEvent.GetControl() == m_MeasureLoadTimeCheckbox) {
79+
g_SettingsMan.MeasureModuleLoadTime(m_MeasureLoadTimeCheckbox->GetCheck());
80+
} else if (guiEvent.GetControl() == m_UseMonospaceConsoleFontCheckbox) {
81+
g_ConsoleMan.SetConsoleUseMonospaceFont(m_UseMonospaceConsoleFontCheckbox->GetCheck());
82+
} else if (guiEvent.GetControl() == m_DisableFactionBuyMenuThemesCheckbox) {
83+
g_SettingsMan.SetFactionBuyMenuThemesDisabled(m_DisableFactionBuyMenuThemesCheckbox->GetCheck());
84+
} else if (guiEvent.GetControl() == m_DisableFactionBuyMenuThemeCursorsCheckbox) {
85+
g_SettingsMan.SetFactionBuyMenuThemeCursorsDisabled(m_DisableFactionBuyMenuThemeCursorsCheckbox->GetCheck());
86+
} else if (guiEvent.GetControl() == m_SceneBackgroundAutoScaleSlider) {
87+
g_SettingsMan.SetSceneBackgroundAutoScaleMode(m_SceneBackgroundAutoScaleSlider->GetValue());
88+
UpdateSceneBackgroundAutoScaleLabel();
9089
}
9190
}
92-
} // namespace RTE
91+
}

0 commit comments

Comments
 (0)