diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-05 13:57:53 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-06 08:11:27 +0000 |
commit | 9afb5c5f8878cff5de2e9aab4492e228c4020809 (patch) | |
tree | cd36f763be741607bc68886952b415cc028011d1 /src/Authoring/Studio | |
parent | b75a1c4afda43917dfb694178dac8717b8b7c35e (diff) |
Update data input icons
Task-number: QT3DS-2269
Change-Id: Ic9776d9d0ad24fc97e5d5e160eda21c4e9a8f494
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio')
14 files changed, 12 insertions, 12 deletions
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 @@ <file>images/Objects-edit-disabled@2x.png</file> <file>images/Objects-edit-normal.png</file> <file>images/Objects-edit-normal@2x.png</file> - <file>images/Objects-DataInput-Normal.png</file> - <file>images/Objects-DataInput-Normal@2x.png</file> - <file>images/Objects-DataInput-Disabled.png</file> - <file>images/Objects-DataInput-Disabled@2x.png</file> + <file>images/Objects-DataInput-Active.png</file> + <file>images/Objects-DataInput-Active@2x.png</file> + <file>images/Objects-DataInput-Inactive.png</file> + <file>images/Objects-DataInput-Inactive@2x.png</file> + <file>images/Objects-DataInput-White.png</file> + <file>images/Objects-DataInput-White@2x.png</file> <file>images/Asset-import-Normal.png</file> <file>images/Asset-import-Normal@2x.png</file> <file>images/arrow_up.png</file> @@ -285,8 +287,6 @@ <file>images/remote-disabled@2x.png</file> <file>images/Assets-Model.png</file> <file>images/Assets-Model@2x.png</file> - <file>images/Objects-DataInput-White.png</file> - <file>images/Objects-DataInput-White@2x.png</file> <file>images/presentation_edit.png</file> <file>images/presentation_edit@2x.png</file> <file>images/presentation_notUsed.png</file> diff --git a/src/Authoring/Studio/images/Objects-DataInput-Active.png b/src/Authoring/Studio/images/Objects-DataInput-Active.png Binary files differnew file mode 100644 index 00000000..cef46028 --- /dev/null +++ b/src/Authoring/Studio/images/Objects-DataInput-Active.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png Binary files differnew file mode 100644 index 00000000..94330a8e --- /dev/null +++ b/src/Authoring/Studio/images/Objects-DataInput-Active@2x.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-Disabled.png b/src/Authoring/Studio/images/Objects-DataInput-Disabled.png Binary files differdeleted file mode 100644 index f1c3533b..00000000 --- a/src/Authoring/Studio/images/Objects-DataInput-Disabled.png +++ /dev/null diff --git a/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png Binary files differdeleted file mode 100644 index 18e6b0fb..00000000 --- a/src/Authoring/Studio/images/Objects-DataInput-Disabled@2x.png +++ /dev/null diff --git a/src/Authoring/Studio/images/Objects-DataInput-Inactive.png b/src/Authoring/Studio/images/Objects-DataInput-Inactive.png Binary files differnew file mode 100644 index 00000000..6bed14ee --- /dev/null +++ b/src/Authoring/Studio/images/Objects-DataInput-Inactive.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png Binary files differnew file mode 100644 index 00000000..b04b43b1 --- /dev/null +++ b/src/Authoring/Studio/images/Objects-DataInput-Inactive@2x.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-Normal.png b/src/Authoring/Studio/images/Objects-DataInput-Normal.png Binary files differdeleted file mode 100644 index 60a0c23e..00000000 --- a/src/Authoring/Studio/images/Objects-DataInput-Normal.png +++ /dev/null diff --git a/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png b/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png Binary files differdeleted file mode 100644 index d9f39837..00000000 --- a/src/Authoring/Studio/images/Objects-DataInput-Normal@2x.png +++ /dev/null diff --git a/src/Authoring/Studio/images/Objects-DataInput-White.png b/src/Authoring/Studio/images/Objects-DataInput-White.png Binary files differindex 346f1c86..f97b5a80 100644 --- a/src/Authoring/Studio/images/Objects-DataInput-White.png +++ b/src/Authoring/Studio/images/Objects-DataInput-White.png diff --git a/src/Authoring/Studio/images/Objects-DataInput-White@2x.png b/src/Authoring/Studio/images/Objects-DataInput-White@2x.png Binary files differindex a5e1a406..21905429 100644 --- a/src/Authoring/Studio/images/Objects-DataInput-White@2x.png +++ b/src/Authoring/Studio/images/Objects-DataInput-White@2x.png |