birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed legacy Editor config spec

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2022-01-26 13:01:30 -06:00
parent 7a45aa5bbf
commit 8151856e83
28 changed files with 6 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Settings.cpp
-44
View File
@@ -129,8 +129,6 @@ SEditorSettings::SEditorSettings()
bVisualizeNavigationAccessibility = false;
navigationDebugAgentType = 0;
editorConfigSpec = CONFIG_VERYHIGH_SPEC; //arbitrary choice, but lets assume that we want things to initially look as good as possible in the editor.
viewports.bAlwaysShowRadiuses = false;
viewports.bSync2DViews = false;
viewports.fDefaultAspectRatio = 800.0f / 600.0f;
@@ -166,7 +164,6 @@ SEditorSettings::SEditorSettings()
bPreviewGeometryWindow = true;
bBackupOnSave = true;
backupOnSaveMaxCount = 3;
bApplyConfigSpecInEditor = true;
showErrorDialogOnLoad = 1;
consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
@@ -433,40 +430,6 @@ void SEditorSettings::LoadValue(const char* sSection, const char* sKey, QString&
}
}
//////////////////////////////////////////////////////////////////////////
void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemConfigSpec& value)
{
if (bSettingsManagerMode)
{
int valueCheck = 0;
if (GetIEditor()->GetSettingsManager())
{
GetIEditor()->GetSettingsManager()->LoadSetting(sSection, sKey, valueCheck);
}
if (valueCheck >= CONFIG_AUTO_SPEC && valueCheck < END_CONFIG_SPEC_ENUM)
{
value = (ESystemConfigSpec)valueCheck;
SaveValue(sSection, sKey, value);
}
}
else
{
const SettingsGroup sg(sSection);
auto valuecheck = static_cast<ESystemConfigSpec>(s_editorSettings()->value(sKey, QVariant::fromValue<int>(value)).toInt());
if (valuecheck >= CONFIG_AUTO_SPEC && valuecheck < END_CONFIG_SPEC_ENUM)
{
value = valuecheck;
if (GetIEditor()->GetSettingsManager())
{
GetIEditor()->GetSettingsManager()->SaveSetting(sSection, sKey, value);
}
}
}
}
//////////////////////////////////////////////////////////////////////////
void SEditorSettings::Save(bool isEditorClosing)
{
@@ -503,9 +466,6 @@ void SEditorSettings::Save(bool isEditorClosing)
SaveValue("Settings", "BackupOnSave", bBackupOnSave);
SaveValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
SaveValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
@@ -697,9 +657,6 @@ void SEditorSettings::Load()
LoadValue("Settings", "BackupOnSave", bBackupOnSave);
LoadValue("Settings", "SaveBackupMaxCount", backupOnSaveMaxCount);
LoadValue("Settings", "ApplyConfigSpecInEditor", bApplyConfigSpecInEditor);
LoadValue("Settings", "editorConfigSpec", editorConfigSpec);
LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
@@ -894,7 +851,6 @@ void SEditorSettings::PostInitApply()
REGISTER_CVAR2_CB("ed_toolbarIconSize", &gui.nToolbarIconSize, gui.nToolbarIconSize, VF_NULL, "Override size of the toolbar icons 0-default, 16,32,...", ToolbarIconSizeChanged);
GetIEditor()->SetEditorConfigSpec(editorConfigSpec, GetISystem()->GetConfigPlatform());
REGISTER_CVAR2("ed_backgroundUpdatePeriod", &backgroundUpdatePeriod, backgroundUpdatePeriod, 0, "Delay between frame updates (ms) when window is out of focus but not minimized. 0 = disable background update");
REGISTER_CVAR2("ed_showErrorDialogOnLoad", &showErrorDialogOnLoad, showErrorDialogOnLoad, 0, "Show error dialog on level load");
REGISTER_CVAR2_CB("ed_keepEditorActive", &keepEditorActive, 0, VF_NULL, "Keep the editor active, even if no focus is set", KeepEditorActiveChanged);