Removed unused Qt classes and do some more code clean up
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
+1
-14
@@ -33,9 +33,7 @@ AZ_POP_DISABLE_WARNING
|
||||
#include <QScopedValueRollback>
|
||||
#include <QClipboard>
|
||||
#include <QMenuBar>
|
||||
#include <QCheckBox>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QPixmap>
|
||||
|
||||
// Aws Native SDK
|
||||
#include <aws/sts/STSClient.h>
|
||||
@@ -71,12 +69,10 @@ AZ_POP_DISABLE_WARNING
|
||||
#include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
|
||||
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
|
||||
#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
|
||||
#include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
|
||||
#include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
|
||||
|
||||
// AzQtComponents
|
||||
#include <AzQtComponents/Components/StyleManager.h>
|
||||
#include <AzQtComponents/Components/Widgets/CheckBox.h>
|
||||
#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
|
||||
#include <AzQtComponents/Components/WindowDecorationWrapper.h>
|
||||
#include <AzQtComponents/Utilities/QtPluginPaths.h>
|
||||
@@ -742,12 +738,10 @@ void CCryEditApp::OnFileSave()
|
||||
}
|
||||
else
|
||||
{
|
||||
//auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();
|
||||
auto prefabEditorEntityOwnershipService = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
|
||||
AzToolsFramework::Prefab::TemplateId rootPrefabTemplateId = prefabEditorEntityOwnershipService->GetRootPrefabTemplateId();
|
||||
auto prefabIntegrationInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabIntegrationInterface>::Get();
|
||||
prefabIntegrationInterface->ExecuteSavePrefabsDialog(rootPrefabTemplateId, true);
|
||||
// prefabSystemComponentInterface->AreDirtyTemplatesPresent(rootPrefabTemplateId)
|
||||
prefabIntegrationInterface->ExecuteSavePrefabDialog(rootPrefabTemplateId, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3204,13 +3198,6 @@ bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
|
||||
switch (1 - prefabSaveSelection)
|
||||
{
|
||||
case QDialogButtonBox::AcceptRole:
|
||||
if (!GetIEditor()->GetDocument()->DoFileSave())
|
||||
{
|
||||
// if the file save operation failed, assume that the user was informed of why
|
||||
// already and treat it as a cancel
|
||||
wasCreateLevelOperationCancelled = true;
|
||||
return false;
|
||||
}
|
||||
bIsDocModified = false;
|
||||
break;
|
||||
case QDialogButtonBox::RejectRole:
|
||||
|
||||
@@ -13,16 +13,7 @@
|
||||
|
||||
// Qt
|
||||
#include <QDateTime>
|
||||
#include <QCheckBox>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QGroupBox>
|
||||
#include <QListWidget>
|
||||
#include <QScrollArea>
|
||||
#include <QSizePolicy>
|
||||
#include <AzQtComponents/Components/FlowLayout.h>
|
||||
#include <AzQtComponents/Components/StyleManager.h>
|
||||
#include <AzQtComponents/Components/Widgets/CheckBox.h>
|
||||
#include <AzQtComponents/Components/Widgets/CardHeader.h>
|
||||
|
||||
// AzCore
|
||||
#include <AzCore/Component/TransformBus.h>
|
||||
|
||||
@@ -97,7 +97,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
|
||||
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.")
|
||||
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.");
|
||||
|
||||
editContext->Class<GlobalSaveSettings>("Global Save Settings (File > Save & Ctrl+S)", "")
|
||||
editContext->Class<GlobalSaveSettings>("Global Save Settings (File>Save & Ctrl+S)", "")
|
||||
->DataElement(
|
||||
AZ::Edit::UIHandlers::ComboBox, &GlobalSaveSettings::m_saveAllPrefabsPreference, "Save Prefabs Preference",
|
||||
"This option controls whether prefabs should be saved along with the level")
|
||||
|
||||
@@ -245,11 +245,6 @@ QTableWidget#recentLevelTable::item {
|
||||
qproperty-iconSize: 16px 16px;
|
||||
}
|
||||
|
||||
QListWidget::item
|
||||
{
|
||||
border : none;
|
||||
}
|
||||
|
||||
#SavePrefabDialog, #SaveAllFilesDialog
|
||||
{
|
||||
min-width : 640px;
|
||||
|
||||
Reference in New Issue
Block a user