diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-11-30 15:29:15 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-12-03 08:53:14 +0000 |
| commit | 4e40714dee6cf4fee908d8651989a19b010ad5f6 (patch) | |
| tree | 1aa2f68229c9089c57b8f2782fb67d298ebdb80e | |
| parent | 20c750c766f0f871e46169dfef3bc016b35be25b (diff) | |
Add materialdef icons
Task-number: QT3DS-2786
Change-Id: Ic0dedd658f9a9a951b7d3bbdb52056c0490bcc5b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp | 12 | ||||
| -rw-r--r-- | src/Authoring/Studio/images.qrc | 4 | ||||
| -rw-r--r-- | src/Authoring/Studio/images/matdef-active.png | bin | 0 -> 579 bytes | |||
| -rw-r--r-- | src/Authoring/Studio/images/matdef-active@2x.png | bin | 0 -> 774 bytes | |||
| -rw-r--r-- | src/Authoring/Studio/images/matdef-disabled.png | bin | 0 -> 613 bytes | |||
| -rw-r--r-- | src/Authoring/Studio/images/matdef-disabled@2x.png | bin | 0 -> 788 bytes |
6 files changed, 16 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp index c4e7e703..0fbf52f9 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp +++ b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp @@ -196,6 +196,10 @@ const QString &CStudioObjectTypes::GetNormalIconName(EStudioObjectType inType) static QString theString = QStringLiteral("qml_used.png"); return theString; } + case OBJTYPE_MATERIALDATA: { + static QString theString = QStringLiteral("matdef-active.png"); + return theString; + } default: { static QString theString = QStringLiteral("Objects-Model-Normal.png"); return theString; @@ -293,6 +297,10 @@ const QString &CStudioObjectTypes::GetDisabledIconName(EStudioObjectType inType) static QString theString = QStringLiteral("qml_notUsed.png"); return theString; } + case OBJTYPE_MATERIALDATA: { + static QString theString = QStringLiteral("matdef-disabled.png"); + return theString; + } default: { static QString theString = QStringLiteral("Objects-Model-Disabled.png"); return theString; @@ -382,6 +390,10 @@ const QString &CStudioObjectTypes::GetHighlightIconName(EStudioObjectType inType static QString theString = QStringLiteral("presentation_used.png"); return theString; } + case OBJTYPE_MATERIALDATA: { + static QString theString = QStringLiteral("matdef-active.png"); + return theString; + } default: { static QString theString = QStringLiteral("Objects-Model-Normal.png"); return theString; diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc index 28dab9a5..e57eee1d 100644 --- a/src/Authoring/Studio/images.qrc +++ b/src/Authoring/Studio/images.qrc @@ -282,6 +282,10 @@ <file>images/timeline_text_shown@2x.png</file> <file>images/timeline_text_hidden.png</file> <file>images/timeline_text_hidden@2x.png</file> + <file>images/matdef-active.png</file> + <file>images/matdef-active@2x.png</file> + <file>images/matdef-disabled.png</file> + <file>images/matdef-disabled@2x.png</file> </qresource> <qresource prefix="/startup"> <file alias="open_dialog.png">images/open_dialog.png</file> diff --git a/src/Authoring/Studio/images/matdef-active.png b/src/Authoring/Studio/images/matdef-active.png Binary files differnew file mode 100644 index 00000000..89861be9 --- /dev/null +++ b/src/Authoring/Studio/images/matdef-active.png diff --git a/src/Authoring/Studio/images/matdef-active@2x.png b/src/Authoring/Studio/images/matdef-active@2x.png Binary files differnew file mode 100644 index 00000000..5098de4e --- /dev/null +++ b/src/Authoring/Studio/images/matdef-active@2x.png diff --git a/src/Authoring/Studio/images/matdef-disabled.png b/src/Authoring/Studio/images/matdef-disabled.png Binary files differnew file mode 100644 index 00000000..09bf4ad8 --- /dev/null +++ b/src/Authoring/Studio/images/matdef-disabled.png diff --git a/src/Authoring/Studio/images/matdef-disabled@2x.png b/src/Authoring/Studio/images/matdef-disabled@2x.png Binary files differnew file mode 100644 index 00000000..eeb66286 --- /dev/null +++ b/src/Authoring/Studio/images/matdef-disabled@2x.png |
