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>
main
Danilo Aimini 5 years ago committed by GitHub
parent b331eea9ca
commit 02f340abbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,21 +0,0 @@
<RCC>
<qresource prefix="/">
<file alias="sort_a_to_z.svg">Icons/sort_a_to_z.svg</file>
<file alias="sort_manually.svg">Icons/sort_manually.svg</file>
<file alias="sort_z_to_a.svg">Icons/sort_z_to_a.svg</file>
<file alias="visibility_default.svg">Icons/visibility_default.svg</file>
<file alias="visibility_default_hover.svg">Icons/visibility_default_hover.svg</file>
<file alias="visibility_default_transparent.svg">Icons/visibility_default_transparent.svg</file>
<file alias="visibility_on.svg">Icons/visibility_on.svg</file>
<file alias="visibility_on_hover.svg">Icons/visibility_on_hover.svg</file>
<file alias="visibility_on_transparent.svg">Icons/visibility_on_transparent.svg</file>
<file alias="lock_default.svg">Icons/lock_default.svg</file>
<file alias="lock_default_hover.svg">Icons/lock_default_hover.svg</file>
<file alias="lock_default_transparent.svg">Icons/lock_default_transparent.svg</file>
<file alias="lock_on.svg">Icons/lock_on.svg</file>
<file alias="lock_on_hover.svg">Icons/lock_on_hover.svg</file>
<file alias="lock_on_transparent.svg">Icons/lock_on_transparent.svg</file>
</qresource>
</RCC>

@ -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);
}

@ -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<int>(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<int>(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<int>(DisplaySortMode::ZtoA));
sortZtoA->setCheckable(true);

@ -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

@ -10,11 +10,6 @@
<qresource prefix="/Level">
<file alias="level.svg">Level/level.svg</file>
</qresource>
<qresource prefix="/Notifications">
<file alias="checkmark.svg">Notifications/checkmark.svg</file>
<file alias="download.svg">Notifications/download.svg</file>
<file alias="link.svg">Notifications/link.svg</file>
</qresource>
<qresource prefix="/Menu">
<file alias="resolution.svg">Menu/resolution.svg</file>
<file alias="debug.svg">Menu/debug.svg</file>
@ -31,4 +26,26 @@
<file alias="menu.svg">Menu/menu.svg</file>
<file alias="helpers.svg">Menu/helpers.svg</file>
</qresource>
<qresource prefix="/Notifications">
<file alias="checkmark.svg">Notifications/checkmark.svg</file>
<file alias="download.svg">Notifications/download.svg</file>
<file alias="link.svg">Notifications/link.svg</file>
</qresource>
<qresource prefix="/Outliner">
<file alias="sort_a_to_z.svg">Outliner/sort_a_to_z.svg</file>
<file alias="sort_manually.svg">Outliner/sort_manually.svg</file>
<file alias="sort_z_to_a.svg">Outliner/sort_z_to_a.svg</file>
<file alias="visibility_default.svg">Outliner/visibility_default.svg</file>
<file alias="visibility_default_hover.svg">Outliner/visibility_default_hover.svg</file>
<file alias="visibility_default_transparent.svg">Outliner/visibility_default_transparent.svg</file>
<file alias="visibility_on.svg">Outliner/visibility_on.svg</file>
<file alias="visibility_on_hover.svg">Outliner/visibility_on_hover.svg</file>
<file alias="visibility_on_transparent.svg">Outliner/visibility_on_transparent.svg</file>
<file alias="lock_default.svg">Outliner/lock_default.svg</file>
<file alias="lock_default_hover.svg">Outliner/lock_default_hover.svg</file>
<file alias="lock_default_transparent.svg">Outliner/lock_default_transparent.svg</file>
<file alias="lock_on.svg">Outliner/lock_on.svg</file>
<file alias="lock_on_hover.svg">Outliner/lock_on_hover.svg</file>
<file alias="lock_on_transparent.svg">Outliner/lock_on_transparent.svg</file>
</qresource>
</RCC>

@ -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;
}

@ -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<int>(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<int>(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<int>(DisplaySortMode::ZtoA));
sortZtoA->setCheckable(true);

@ -48,6 +48,12 @@
#include <AzToolsFramework/UI/Outliner/ui_EntityOutlinerWidget.h>
// 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);

Loading…
Cancel
Save