From 9afb5c5f8878cff5de2e9aab4492e228c4020809 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 5 Sep 2018 13:57:53 +0300 Subject: Update data input icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-2269 Change-Id: Ic9776d9d0ad24fc97e5d5e160eda21c4e9a8f494 Reviewed-by: Mahmoud Badri Reviewed-by: Tomi Korpipää --- .../Client/Code/Core/Utility/StudioObjectTypes.cpp | 4 ++-- .../Studio/Palettes/Inspector/InspectorControlView.qml | 4 ++-- src/Authoring/Studio/Palettes/Slide/SlideView.qml | 4 ++-- .../TimelineGraphicsView/ui/TimelineToolbar.cpp | 4 ++-- src/Authoring/Studio/images.qrc | 12 ++++++------ .../Studio/images/Objects-DataInput-Active.png | Bin 0 -> 610 bytes .../Studio/images/Objects-DataInput-Active@2x.png | Bin 0 -> 817 bytes .../Studio/images/Objects-DataInput-Disabled.png | Bin 642 -> 0 bytes .../Studio/images/Objects-DataInput-Disabled@2x.png | Bin 947 -> 0 bytes .../Studio/images/Objects-DataInput-Inactive.png | Bin 0 -> 626 bytes .../Studio/images/Objects-DataInput-Inactive@2x.png | Bin 0 -> 796 bytes .../Studio/images/Objects-DataInput-Normal.png | Bin 660 -> 0 bytes .../Studio/images/Objects-DataInput-Normal@2x.png | Bin 901 -> 0 bytes src/Authoring/Studio/images/Objects-DataInput-White.png | Bin 363 -> 590 bytes .../Studio/images/Objects-DataInput-White@2x.png | Bin 601 -> 740 bytes 15 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 src/Authoring/Studio/images/Objects-DataInput-Active.png create mode 100644 src/Authoring/Studio/images/Objects-DataInput-Active@2x.png delete mode 100644 src/Authoring/Studio/images/Objects-DataInput-Disabled.png delete mode 100644 src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png create mode 100644 src/Authoring/Studio/images/Objects-DataInput-Inactive.png create mode 100644 src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png delete mode 100644 src/Authoring/Studio/images/Objects-DataInput-Normal.png delete mode 100644 src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png (limited to 'src') diff --git a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp index b8ce037c..9eefe944 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp +++ b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp @@ -177,7 +177,7 @@ const QString &CStudioObjectTypes::GetNormalIconName(EStudioObjectType inType) return theString; } case OBJTYPE_DATAINPUT: { - static QString theString = QStringLiteral("Objects-DataInput-Normal.png"); + static QString theString = QStringLiteral("Objects-DataInput-Active.png"); return theString; } case OBJTYPE_PRESENTATION: { @@ -279,7 +279,7 @@ const QString &CStudioObjectTypes::GetDisabledIconName(EStudioObjectType inType) return theString; } case OBJTYPE_DATAINPUT: { - static QString theString = QStringLiteral("Objects-DataInput-Disabled.png"); + static QString theString = QStringLiteral("Objects-DataInput-Inactive.png"); return theString; } case OBJTYPE_PRESENTATION: { diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml index e91aa5a5..4c591e77 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.qml @@ -283,8 +283,8 @@ Rectangle { source: { _resDir + (controlled - ? "Objects-DataInput-Normal.png" - : "Objects-DataInput-Disabled.png") + ? "Objects-DataInput-Active.png" + : "Objects-DataInput-Inactive.png") } } StyledTooltip { diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.qml b/src/Authoring/Studio/Palettes/Slide/SlideView.qml index 3e60b76b..0e5d1dcb 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.qml +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.qml @@ -364,8 +364,8 @@ Rectangle { property bool controlled: parent.controlled source: { _resDir + (controlled - ? "Objects-DataInput-Normal.png" - : "Objects-DataInput-Disabled.png") + ? "Objects-DataInput-Active.png" + : "Objects-DataInput-Inactive.png") } } StyledTooltip { diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp index 2bdeb2c5..7469fdd7 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp @@ -56,8 +56,8 @@ TimelineToolbar::TimelineToolbar() : QToolBar() static const QIcon iconLast = QIcon(":/images/playback_tools_low-04.png"); static const QIcon iconZoomIn = QIcon(":/images/zoom_in.png"); static const QIcon iconZoomOut = QIcon(":/images/zoom_out.png"); - m_iconDiActive = QIcon(":/images/Objects-DataInput-Normal.png"); - m_iconDiInactive = QIcon(":/images/Objects-DataInput-Disabled.png"); + m_iconDiActive = QIcon(":/images/Objects-DataInput-Active.png"); + m_iconDiInactive = QIcon(":/images/Objects-DataInput-Inactive.png"); m_iconStop = QIcon(":/images/playback_tools_low-01.png"); m_iconPlay = QIcon(":/images/playback_tools_low-02.png"); diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc index ef0fc1bd..3f2d3c5c 100644 --- a/src/Authoring/Studio/images.qrc +++ b/src/Authoring/Studio/images.qrc @@ -238,10 +238,12 @@ images/Objects-edit-disabled@2x.png images/Objects-edit-normal.png images/Objects-edit-normal@2x.png - images/Objects-DataInput-Normal.png - images/Objects-DataInput-Normal@2x.png - images/Objects-DataInput-Disabled.png - images/Objects-DataInput-Disabled@2x.png + images/Objects-DataInput-Active.png + images/Objects-DataInput-Active@2x.png + images/Objects-DataInput-Inactive.png + images/Objects-DataInput-Inactive@2x.png + images/Objects-DataInput-White.png + images/Objects-DataInput-White@2x.png images/Asset-import-Normal.png images/Asset-import-Normal@2x.png images/arrow_up.png @@ -285,8 +287,6 @@ images/remote-disabled@2x.png images/Assets-Model.png images/Assets-Model@2x.png - images/Objects-DataInput-White.png - images/Objects-DataInput-White@2x.png images/presentation_edit.png images/presentation_edit@2x.png images/presentation_notUsed.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-Active.png b/src/Authoring/Studio/images/Objects-DataInput-Active.png new file mode 100644 index 00000000..cef46028 Binary files /dev/null and b/src/Authoring/Studio/images/Objects-DataInput-Active.png differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png new file mode 100644 index 00000000..94330a8e Binary files /dev/null and b/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Disabled.png b/src/Authoring/Studio/images/Objects-DataInput-Disabled.png deleted file mode 100644 index f1c3533b..00000000 Binary files a/src/Authoring/Studio/images/Objects-DataInput-Disabled.png and /dev/null differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png deleted file mode 100644 index 18e6b0fb..00000000 Binary files a/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png and /dev/null differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Inactive.png b/src/Authoring/Studio/images/Objects-DataInput-Inactive.png new file mode 100644 index 00000000..6bed14ee Binary files /dev/null and b/src/Authoring/Studio/images/Objects-DataInput-Inactive.png differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png new file mode 100644 index 00000000..b04b43b1 Binary files /dev/null and b/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Normal.png b/src/Authoring/Studio/images/Objects-DataInput-Normal.png deleted file mode 100644 index 60a0c23e..00000000 Binary files a/src/Authoring/Studio/images/Objects-DataInput-Normal.png and /dev/null differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png deleted file mode 100644 index d9f39837..00000000 Binary files a/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png and /dev/null differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-White.png b/src/Authoring/Studio/images/Objects-DataInput-White.png index 346f1c86..f97b5a80 100644 Binary files a/src/Authoring/Studio/images/Objects-DataInput-White.png and b/src/Authoring/Studio/images/Objects-DataInput-White.png differ diff --git a/src/Authoring/Studio/images/Objects-DataInput-White@2x.png b/src/Authoring/Studio/images/Objects-DataInput-White@2x.png index a5e1a406..21905429 100644 Binary files a/src/Authoring/Studio/images/Objects-DataInput-White@2x.png and b/src/Authoring/Studio/images/Objects-DataInput-White@2x.png differ -- cgit v1.2.3