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

Remove deprecated prefab support from UI Editor (#1754)

Browse Source 
* Remove old prefab support from UI Editor

Signed-off-by: abrmich <abrmich@amazon.com>

* Delete deprecated prefab files that are no longer supported in UI Editor

Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2021-07-02 15:42:09 -07:00
committed by GitHub
parent 497059bea7
commit 9dbafa72a8
30 changed files with 1 additions and 3220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/HierarchyMenu.cpp
+1 -40
View File
@@ -26,8 +26,7 @@ HierarchyMenu::HierarchyMenu(HierarchyWidget* hierarchy,
QTreeWidgetItemRawPtrQList selectedItems = hierarchy->selectedItems();
if (showMask & (Show::kNew_EmptyElement | Show::kNew_ElementFromPrefabs |
Show::kNew_EmptyElementAtRoot | Show::kNew_ElementFromPrefabsAtRoot))
if (showMask & (Show::kNew_EmptyElement | Show::kNew_EmptyElementAtRoot))
{
QMenu* menu = (addMenuForNewElement ? addMenu("&New...") : this);
@@ -40,11 +39,6 @@ HierarchyMenu::HierarchyMenu(HierarchyWidget* hierarchy,
{
New_ElementFromSlice(hierarchy, selectedItems, menu, (showMask & Show::kNew_InstantiateSliceAtRoot), optionalPos);
}
if (showMask & (Show::kNew_ElementFromPrefabs | Show::kNew_ElementFromPrefabsAtRoot))
{
New_ElementFromPrefabs(hierarchy, selectedItems, menu, (showMask & Show::kNew_ElementFromPrefabsAtRoot), optionalPos);
}
}
if (showMask & (Show::kNewSlice | Show::kPushToSlice))
@@ -52,11 +46,6 @@ HierarchyMenu::HierarchyMenu(HierarchyWidget* hierarchy,
SliceMenuItems(hierarchy, selectedItems, showMask);
}
if (showMask & Show::kSavePrefab)
{
SavePrefab(hierarchy, selectedItems);
}
addSeparator();
if (showMask & Show::kCutCopyPaste)
@@ -192,21 +181,6 @@ void HierarchyMenu::CutCopyPaste(HierarchyWidget* hierarchy,
}
}
void HierarchyMenu::SavePrefab(HierarchyWidget* hierarchy,
QTreeWidgetItemRawPtrQList& selectedItems)
{
QAction* action = PrefabHelpers::CreateSavePrefabAction(hierarchy);
// Only enable "save as prefab" option if exactly one element is selected
// in the hierarchy pane
if (selectedItems.size() != 1)
{
action->setEnabled(false);
}
addAction(action);
}
void HierarchyMenu::SliceMenuItems(HierarchyWidget* hierarchy,
QTreeWidgetItemRawPtrQList& selectedItems,
size_t showMask)
@@ -404,19 +378,6 @@ void HierarchyMenu::New_EmptyElement(HierarchyWidget* hierarchy,
optionalPos));
}
void HierarchyMenu::New_ElementFromPrefabs(HierarchyWidget* hierarchy,
QTreeWidgetItemRawPtrQList& selectedItems,
QMenu* menu,
bool addAtRoot,
const QPoint* optionalPos)
{
PrefabHelpers::CreateAddPrefabMenu(hierarchy,
selectedItems,
menu,
addAtRoot,
optionalPos);
}
void HierarchyMenu::New_ElementFromSlice(HierarchyWidget* hierarchy,
QTreeWidgetItemRawPtrQList& selectedItems,
QMenu* menu,