From 02f340abbd8c7b39ba5012c9b18320a2c9799f57 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Thu, 1 Jul 2021 18:37:44 -0700 Subject: [PATCH] Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- .../ComponentEntityEditorOutlinerWindow.qrc | 21 --------------- .../UI/Outliner/EntityOutliner.qss | 24 ++++++++--------- .../Outliner/OutlinerDisplayOptionsMenu.cpp | 6 ++--- .../componententityeditorplugin_files.cmake | 1 - .../Images/Outliner}/lock_default.svg | 0 .../Images/Outliner}/lock_default_hover.svg | 0 .../Outliner}/lock_default_transparent.svg | 0 .../Images/Outliner}/lock_on.svg | 0 .../Images/Outliner}/lock_on_hover.svg | 0 .../Images/Outliner}/lock_on_transparent.svg | 0 .../Images/Outliner}/sort_a_to_z.svg | 0 .../Images/Outliner}/sort_manually.svg | 0 .../Images/Outliner}/sort_z_to_a.svg | 0 .../Images/Outliner}/visibility_default.svg | 0 .../Outliner}/visibility_default_hover.svg | 0 .../visibility_default_transparent.svg | 0 .../Images/Outliner}/visibility_on.svg | 0 .../Images/Outliner}/visibility_on_hover.svg | 0 .../Outliner}/visibility_on_transparent.svg | 0 .../AzQtComponents/Images/resources.qrc | 27 +++++++++++++++---- .../UI/Outliner/EntityOutliner.qss | 24 ++++++++--------- .../EntityOutlinerDisplayOptionsMenu.cpp | 6 ++--- .../UI/Outliner/EntityOutlinerWidget.cpp | 8 ++++++ 23 files changed, 60 insertions(+), 57 deletions(-) delete mode 100644 Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_default.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_default_hover.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_default_transparent.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_on.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_on_hover.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/lock_on_transparent.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/sort_a_to_z.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/sort_manually.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/sort_z_to_a.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_default.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_default_hover.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_default_transparent.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_on.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_on_hover.svg (100%) rename Code/{Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons => Framework/AzQtComponents/AzQtComponents/Images/Outliner}/visibility_on_transparent.svg (100%) diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc deleted file mode 100644 index 07f79dcb5c..0000000000 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/ComponentEntityEditorOutlinerWindow.qrc +++ /dev/null @@ -1,21 +0,0 @@ - - - Icons/sort_a_to_z.svg - Icons/sort_manually.svg - Icons/sort_z_to_a.svg - - Icons/visibility_default.svg - Icons/visibility_default_hover.svg - Icons/visibility_default_transparent.svg - Icons/visibility_on.svg - Icons/visibility_on_hover.svg - Icons/visibility_on_transparent.svg - - Icons/lock_default.svg - Icons/lock_default_hover.svg - Icons/lock_default_transparent.svg - Icons/lock_on.svg - Icons/lock_on_hover.svg - Icons/lock_on_transparent.svg - - diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss index e3dadf6f22..624c89aad7 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss @@ -93,37 +93,37 @@ OutlinerCheckBox#VisibilityMixed::indicator:checked OutlinerCheckBox#Visibility::indicator:checked , OutlinerCheckBox#VisibilityMixed::indicator:checked { - image: url(:/visibility_default.svg); + image: url(:/Outliner/visibility_default.svg); } OutlinerCheckBox#Visibility::indicator:unchecked , OutlinerCheckBox#VisibilityMixed::indicator:unchecked { - image: url(:/visibility_on.svg); + image: url(:/Outliner/visibility_on.svg); } OutlinerCheckBox#VisibilityLayerOverride::indicator:checked { - image: url(:/visibility_default_transparent.svg); + image: url(:/Outliner/visibility_default_transparent.svg); } OutlinerCheckBox#VisibilityLayerOverride::indicator:unchecked { - image: url(:/visibility_on_transparent.svg); + image: url(:/Outliner/visibility_on_transparent.svg); } OutlinerCheckBox#VisibilityHover::indicator:checked , OutlinerCheckBox#VisibilityMixedHover::indicator:checked , OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:checked { - image: url(:/visibility_default_hover.svg); + image: url(:/Outliner/visibility_default_hover.svg); } OutlinerCheckBox#VisibilityHover::indicator:unchecked , OutlinerCheckBox#VisibilityMixedHover::indicator:unchecked , OutlinerCheckBox#VisibilityLayerOverrideHover::indicator:unchecked { - image: url(:/visibility_on_hover.svg); + image: url(:/Outliner/visibility_on_hover.svg); } @@ -132,35 +132,35 @@ OutlinerCheckBox#VisibilityHover::indicator:unchecked OutlinerCheckBox#Lock::indicator:checked , OutlinerCheckBox#LockMixed::indicator:checked { - image: url(:/lock_on.svg); + image: url(:/Outliner/lock_on.svg); } OutlinerCheckBox#Lock::indicator:unchecked , OutlinerCheckBox#LockMixed::indicator:unchecked { - image: url(:/lock_default.svg); + image: url(:/Outliner/lock_default.svg); } OutlinerCheckBox#LockLayerOverride::indicator:checked { - image: url(:/lock_on_transparent.svg); + image: url(:/Outliner/lock_on_transparent.svg); } OutlinerCheckBox#LockLayerOverride::indicator:unchecked { - image: url(:/lock_default_transparent.svg); + image: url(:/Outliner/lock_default_transparent.svg); } OutlinerCheckBox#LockHover::indicator:checked , OutlinerCheckBox#LockMixedHover::indicator:checked , OutlinerCheckBox#LockLayerOverrideHover::indicator:checked { - image: url(:/lock_on_hover.svg); + image: url(:/Outliner/lock_on_hover.svg); } OutlinerCheckBox#LockHover::indicator:unchecked , OutlinerCheckBox#LockMixedHover::indicator:unchecked , OutlinerCheckBox#LockLayerOverrideHover::indicator:unchecked { - image: url(:/lock_default_hover.svg); + image: url(:/Outliner/lock_default_hover.svg); } diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp index edc3950336..c1af8d76d7 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerDisplayOptionsMenu.cpp @@ -16,15 +16,15 @@ namespace EntityOutliner DisplayOptionsMenu::DisplayOptionsMenu(QWidget* parent) : QMenu(parent) { - auto sortManually = addAction(QIcon(QStringLiteral(":/sort_manually.svg")), tr("Sort: Manually")); + auto sortManually = addAction(QIcon(QStringLiteral(":/Outliner/sort_manually.svg")), tr("Sort: Manually")); sortManually->setData(static_cast(DisplaySortMode::Manually)); sortManually->setCheckable(true); - auto sortAtoZ = addAction(QIcon(QStringLiteral(":/sort_a_to_z.svg")), tr("Sort: A to Z")); + auto sortAtoZ = addAction(QIcon(QStringLiteral(":/Outliner/sort_a_to_z.svg")), tr("Sort: A to Z")); sortAtoZ->setData(static_cast(DisplaySortMode::AtoZ)); sortAtoZ->setCheckable(true); - auto sortZtoA = addAction(QIcon(QStringLiteral(":/sort_z_to_a.svg")), tr("Sort: Z to A")); + auto sortZtoA = addAction(QIcon(QStringLiteral(":/Outliner/sort_z_to_a.svg")), tr("Sort: Z to A")); sortZtoA->setData(static_cast(DisplaySortMode::ZtoA)); sortZtoA->setCheckable(true); diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake index c22385dd80..1f7c3c0388 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/componententityeditorplugin_files.cmake @@ -12,7 +12,6 @@ set(FILES SandboxIntegration.h SandboxIntegration.cpp ComponentEntityEditorPlugin_precompiled.h - UI/ComponentEntityEditorOutlinerWindow.qrc UI/QComponentEntityEditorMainWindow.h UI/QComponentEntityEditorMainWindow.cpp UI/QComponentLevelEntityEditorMainWindow.h diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_hover.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_hover.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_transparent.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_transparent.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_default_transparent.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_hover.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_hover.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_transparent.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_transparent.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/lock_on_transparent.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_a_to_z.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_a_to_z.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_a_to_z.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_a_to_z.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_manually.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_manually.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_manually.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_manually.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_z_to_a.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_z_to_a.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/sort_z_to_a.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/sort_z_to_a.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_hover.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_hover.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_transparent.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_transparent.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_default_transparent.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_hover.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_hover.svg diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_transparent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_transparent.svg similarity index 100% rename from Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_transparent.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Images/Outliner/visibility_on_transparent.svg diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc index 74610dca90..c72687359b 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc +++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc @@ -10,11 +10,6 @@ Level/level.svg - - Notifications/checkmark.svg - Notifications/download.svg - Notifications/link.svg - Menu/resolution.svg Menu/debug.svg @@ -31,4 +26,26 @@ Menu/menu.svg Menu/helpers.svg + + Notifications/checkmark.svg + Notifications/download.svg + Notifications/link.svg + + + Outliner/sort_a_to_z.svg + Outliner/sort_manually.svg + Outliner/sort_z_to_a.svg + Outliner/visibility_default.svg + Outliner/visibility_default_hover.svg + Outliner/visibility_default_transparent.svg + Outliner/visibility_on.svg + Outliner/visibility_on_hover.svg + Outliner/visibility_on_transparent.svg + Outliner/lock_default.svg + Outliner/lock_default_hover.svg + Outliner/lock_default_transparent.svg + Outliner/lock_on.svg + Outliner/lock_on_hover.svg + Outliner/lock_on_transparent.svg + diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss index ce2171d748..a8447ffc00 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss @@ -87,24 +87,24 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:checked AzToolsFramework--EntityOutlinerCheckBox#Visibility::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:checked { - image: url(:/visibility_default.svg); + image: url(:/Outliner/visibility_default.svg); } AzToolsFramework--EntityOutlinerCheckBox#Visibility::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixed::indicator:unchecked { - image: url(:/visibility_on.svg); + image: url(:/Outliner/visibility_on.svg); margin-top: 3px; } AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverridden::indicator:checked { - image: url(:/visibility_default_transparent.svg); + image: url(:/Outliner/visibility_default_transparent.svg); } AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverridden::indicator:unchecked { - image: url(:/visibility_on_transparent.svg); + image: url(:/Outliner/visibility_on_transparent.svg); margin-top: 3px; } @@ -112,7 +112,7 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixedHover::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverriddenHover::indicator:checked { - image: url(:/visibility_default_hover.svg); + image: url(:/Outliner/visibility_default_hover.svg); margin-top: 3px; } @@ -120,7 +120,7 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityMixedHover::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#VisibilityOverriddenHover::indicator:unchecked { - image: url(:/visibility_on_hover.svg); + image: url(:/Outliner/visibility_on_hover.svg); margin-top: 3px; } @@ -130,24 +130,24 @@ AzToolsFramework--EntityOutlinerCheckBox#VisibilityHover::indicator:unchecked AzToolsFramework--EntityOutlinerCheckBox#Lock::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#LockMixed::indicator:checked { - image: url(:/lock_on.svg); + image: url(:/Outliner/lock_on.svg); margin-top: 1px; } AzToolsFramework--EntityOutlinerCheckBox#Lock::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#LockMixed::indicator:unchecked { - image: url(:/lock_default.svg); + image: url(:/Outliner/lock_default.svg); } AzToolsFramework--EntityOutlinerCheckBox#LockOverridden::indicator:checked { - image: url(:/lock_on_transparent.svg); + image: url(:/Outliner/lock_on_transparent.svg); } AzToolsFramework--EntityOutlinerCheckBox#LockOverridden::indicator:unchecked { - image: url(:/lock_default_transparent.svg); + image: url(:/Outliner/lock_default_transparent.svg); margin-top: 1px; } @@ -155,7 +155,7 @@ AzToolsFramework--EntityOutlinerCheckBox#LockHover::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#LockMixedHover::indicator:checked , AzToolsFramework--EntityOutlinerCheckBox#LockOverriddenHover::indicator:checked { - image: url(:/lock_on_hover.svg); + image: url(:/Outliner/lock_on_hover.svg); margin-top: 1px; } @@ -163,6 +163,6 @@ AzToolsFramework--EntityOutlinerCheckBox#LockHover::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#LockMixedHover::indicator:unchecked , AzToolsFramework--EntityOutlinerCheckBox#LockOverriddenHover::indicator:unchecked { - image: url(:/lock_default_hover.svg); + image: url(:/Outliner/lock_default_hover.svg); margin-top: 1px; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp index 73d5c5cbc4..d33be96b98 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerDisplayOptionsMenu.cpp @@ -17,15 +17,15 @@ namespace AzToolsFramework DisplayOptionsMenu::DisplayOptionsMenu(QWidget* parent) : QMenu(parent) { - auto sortManually = addAction(QIcon(QStringLiteral(":/sort_manually.svg")), tr("Sort: Manually")); + auto sortManually = addAction(QIcon(QStringLiteral(":/Outliner/sort_manually.svg")), tr("Sort: Manually")); sortManually->setData(static_cast(DisplaySortMode::Manually)); sortManually->setCheckable(true); - auto sortAtoZ = addAction(QIcon(QStringLiteral(":/sort_a_to_z.svg")), tr("Sort: A to Z")); + auto sortAtoZ = addAction(QIcon(QStringLiteral(":/Outliner/sort_a_to_z.svg")), tr("Sort: A to Z")); sortAtoZ->setData(static_cast(DisplaySortMode::AtoZ)); sortAtoZ->setCheckable(true); - auto sortZtoA = addAction(QIcon(QStringLiteral(":/sort_z_to_a.svg")), tr("Sort: Z to A")); + auto sortZtoA = addAction(QIcon(QStringLiteral(":/Outliner/sort_z_to_a.svg")), tr("Sort: Z to A")); sortZtoA->setData(static_cast(DisplaySortMode::ZtoA)); sortZtoA->setCheckable(true); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp index 8324877d95..96479bb54c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp @@ -48,6 +48,12 @@ #include +// This has to live outside of any namespaces due to issues on Linux with calls to Q_INIT_RESOURCE if they are inside a namespace +void initEntityOutlinerWidgetResources() +{ + Q_INIT_RESOURCE(resources); +} + namespace { const int queuedChangeDelay = 16; // milliseconds @@ -143,6 +149,8 @@ namespace AzToolsFramework , m_sortContentQueued(false) , m_dropOperationInProgress(false) { + initEntityOutlinerWidgetResources(); + m_gui = new Ui::EntityOutlinerWidgetUI(); m_gui->setupUi(this);