Skip to content

Commit fcff71b

Browse files
authored
Merge pull request o3de#17642 from aws-lumberyard-dev/daimini/SliceLevelUiRedCode/OutlinerSliceFavorites
Slice Level UI Removal | Delete legacy Entity Outliner and Slice Favorites Gem
2 parents f1b110f + 50e0c36 commit fcff71b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+13
-9429
lines changed

Code/Editor/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ly_add_target(
1515
NAMESPACE Legacy
1616
OUTPUT_SUBDIRECTORY EditorPlugins
1717
AUTOMOC
18-
AUTOUIC
1918
AUTORCC
2019
FILES_CMAKE
2120
componententityeditorplugin_files.cmake

Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "UI/QComponentEntityEditorMainWindow.h"
1414
#include "UI/QComponentEntityEditorOutlinerWindow.h"
15-
#include "UI/QComponentLevelEntityEditorMainWindow.h"
1615
#include "UI/ComponentPalette/ComponentPaletteSettings.h"
1716

1817
#include <AzCore/Component/ComponentApplicationBus.h>
@@ -155,56 +154,19 @@ ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEdito
155154
LyViewPane::CategoryTools,
156155
pinnedInspectorOptions);
157156

158-
bool prefabSystemEnabled = false;
159-
AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
157+
// Add the Outliner to the Tools Menu
158+
ViewPaneOptions outlinerOptions;
159+
outlinerOptions.canHaveMultipleInstances = true;
160+
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
161+
// Override the default behavior for component mode enter/exit and imgui enter/exit
162+
// so that we don't automatically disable and enable the Entity Outliner. This will be handled separately.
163+
outlinerOptions.isDisabledInComponentMode = false;
164+
outlinerOptions.isDisabledInImGuiMode = false;
160165

161-
if (prefabSystemEnabled)
162-
{
163-
// Add the new Outliner to the Tools Menu
164-
165-
ViewPaneOptions outlinerOptions;
166-
outlinerOptions.canHaveMultipleInstances = true;
167-
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
168-
// Override the default behavior for component mode enter/exit and imgui enter/exit
169-
// so that we don't automatically disable and enable the Entity Outliner. This will be handled separately.
170-
outlinerOptions.isDisabledInComponentMode = false;
171-
outlinerOptions.isDisabledInImGuiMode = false;
172-
173-
RegisterViewPane<QEntityOutlinerWindow>(
174-
LyViewPane::EntityOutliner,
175-
LyViewPane::CategoryTools,
176-
outlinerOptions);
177-
}
178-
else
179-
{
180-
ViewPaneOptions levelInspectorOptions;
181-
levelInspectorOptions.canHaveMultipleInstances = false;
182-
levelInspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
183-
levelInspectorOptions.paneRect = QRect(50, 50, 400, 700);
184-
RegisterViewPane<QComponentLevelEntityEditorInspectorWindow>(
185-
LyViewPane::LevelInspector, LyViewPane::CategoryTools, levelInspectorOptions);
186-
187-
// Add the Legacy Outliner to the Tools Menu
188-
ViewPaneOptions outlinerOptions;
189-
outlinerOptions.canHaveMultipleInstances = true;
190-
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
191-
// Override the default behavior for component mode enter/exit and imgui enter/exit
192-
// so that we don't automatically disable and enable the Entity Outliner. This will be handled separately.
193-
outlinerOptions.isDisabledInComponentMode = false;
194-
outlinerOptions.isDisabledInImGuiMode = false;
195-
196-
// this pane was originally introduced with this name, so layout settings are all saved with that name, despite the preview label being removed.
197-
outlinerOptions.saveKeyName = "Entity Outliner (PREVIEW)";
198-
199-
RegisterViewPane<QComponentEntityEditorOutlinerWindow>(
200-
LyViewPane::EntityOutliner,
201-
LyViewPane::CategoryTools,
202-
outlinerOptions);
203-
204-
AzToolsFramework::ViewPaneOptions options;
205-
options.preferedDockingArea = Qt::NoDockWidgetArea;
206-
RegisterViewPane<SliceRelationshipWidget>(LyViewPane::SliceRelationships, LyViewPane::CategoryTools, options);
207-
}
166+
RegisterViewPane<QEntityOutlinerWindow>(
167+
LyViewPane::EntityOutliner,
168+
LyViewPane::CategoryTools,
169+
outlinerOptions);
208170

209171
ComponentEntityEditorPluginInternal::RegisterSandboxObjects();
210172

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss

Lines changed: 0 additions & 164 deletions
This file was deleted.

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerCacheBus.h

Lines changed: 0 additions & 68 deletions
This file was deleted.

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)