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

Merge branch 'development' into cmake/warn_virtual

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-09 11:50:40 -07:00
parent d836503814 9976ee2b8e
commit 9f6d4125b8
248 changed files with 9491 additions and 10706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp
+1 -1
View File
@@ -342,7 +342,7 @@ namespace AzQtComponents
config.toolTipPaddingInPixels = 5;
config.headerIconSizeInPixels = CardHeader::defaultIconSize();
config.rootLayoutSpacing = 0;
config.warningIcon = QStringLiteral(":/Cards/img/UI20/Cards/warning.svg");
config.warningIcon = QStringLiteral(":/Notifications/warning.svg");
config.warningIconSize = {24, 24};
config.disabledIconAlpha = 0.25;
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/VectorInput.cpp
+3 -3
View File
@@ -303,7 +303,7 @@ VectorInput::~VectorInput()
void VectorInput::setLabel(int index, const QString& label)
{
AZ_Warning("PropertyGrid", index < m_elementCount,
"This control handles only %i controls", m_elementCount)
"This control handles only %i controls", m_elementCount);
if (index < m_elementCount)
{
m_elements[index]->setLabel(label);
@@ -313,7 +313,7 @@ void VectorInput::setLabel(int index, const QString& label)
void VectorInput::setLabelStyle(int index, const QString& qss)
{
AZ_Warning("PropertyGrid", index < m_elementCount,
"This control handles only %i controls", m_elementCount)
"This control handles only %i controls", m_elementCount);
if (index < m_elementCount)
{
m_elements[index]->getLabelWidget()->setStyleSheet(qss);
@@ -323,7 +323,7 @@ void VectorInput::setLabelStyle(int index, const QString& qss)
void VectorInput::setValuebyIndex(double value, int elementIndex)
{
AZ_Warning("PropertyGrid", elementIndex < m_elementCount,
"This control handles only %i controls", m_elementCount)
"This control handles only %i controls", m_elementCount);
if (elementIndex < m_elementCount)
{
m_elements[elementIndex]->setValue(value);
Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
-1
View File
@@ -424,7 +424,6 @@
<file>img/UI20/Cards/menu_ico.png</file>
<file>img/UI20/Cards/error_icon.png</file>
<file>img/UI20/Cards/warning.png</file>
<file>img/UI20/Cards/warning.svg</file>
<file>img/UI20/Cards/search.png</file>
<file>img/UI20/Cards/close.png</file>
<file>img/UI20/Cards/error-conclict-state.svg</file>
Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/warning.svg → Code/Framework/AzQtComponents/AzQtComponents/Images/Notifications/warning.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+1
View File
@@ -30,6 +30,7 @@
<file alias="checkmark.svg">Notifications/checkmark.svg</file>
<file alias="download.svg">Notifications/download.svg</file>
<file alias="link.svg">Notifications/link.svg</file>
<file alias="warning.svg">Notifications/warning.svg</file>
</qresource>
<qresource prefix="/Outliner">
<file alias="sort_a_to_z.svg">Outliner/sort_a_to_z.svg</file>