diff options
author | Titta Heikkala <titta.heikkala@qt.io> | 2016-06-21 09:29:54 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@qt.io> | 2016-06-21 06:39:20 +0000 |
commit | fcecb4d399ce183c7bcb926d282959b6c699b39b (patch) | |
tree | a98be49c2832f4652bdb6165531350be9a53b5e4 | |
parent | 2974fd8d933e48a8472dfccff62994adbf6e60e7 (diff) |
Added new image for invalid drag and removed old unused images
Change-Id: I2de6149d77f949cbc6ed43e7547021639881166f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
23 files changed, 2 insertions, 21 deletions
diff --git a/editorlib/images.qrc b/editorlib/images.qrc index bc543c7..09810c1 100644 --- a/editorlib/images.qrc +++ b/editorlib/images.qrc @@ -1,16 +1,7 @@ <RCC> <qresource prefix="/qt3deditorlib/"> - <file>images/addroot.png</file> <file>images/camera.png</file> - <file>images/cross.png</file> - <file>images/down.png</file> - <file>images/layer.png</file> <file>images/light.png</file> - <file>images/light_basic.png</file> - <file>images/light_directional.png</file> - <file>images/light_point.png</file> - <file>images/light_spot.png</file> - <file>images/material.png</file> <file>images/mesh.png</file> <file>images/mesh_cuboid.png</file> <file>images/mesh_custom.png</file> @@ -24,20 +15,10 @@ <file>images/qtlogo.png</file> <file>images/qtlogo_normal.png</file> <file>images/qtlogo_specular.png</file> - <file>images/transform.png</file> - <file>images/transform_matrix.png</file> - <file>images/transform_srt.png</file> - <file>images/up.png</file> <file>images/arrow.png</file> - <file>images/layer-large.png</file> - <file>images/light_basic-large.png</file> - <file>images/light_point-large.png</file> <file>images/light_spot-large.png</file> - <file>images/light_directional-large.png</file> <file>images/visible_off.png</file> <file>images/visible_on.png</file> - <file>images/keyboard_input.png</file> - <file>images/logic.png</file> <file>images/lock_locked.png</file> <file>images/lock_open.png</file> <file>images/property_material_hidden.png</file> @@ -96,5 +77,6 @@ <file>images/cut.png</file> <file>images/paste.png</file> <file>images/copy.png</file> + <file>images/no_drag.png</file> </qresource> </RCC> diff --git a/editorlib/images/addroot.png b/editorlib/images/addroot.png Binary files differdeleted file mode 100644 index dc1b58d..0000000 --- a/editorlib/images/addroot.png +++ /dev/null diff --git a/editorlib/images/cross.png b/editorlib/images/cross.png Binary files differdeleted file mode 100644 index f39315e..0000000 --- a/editorlib/images/cross.png +++ /dev/null diff --git a/editorlib/images/down.png b/editorlib/images/down.png Binary files differdeleted file mode 100644 index 632743e..0000000 --- a/editorlib/images/down.png +++ /dev/null diff --git a/editorlib/images/keyboard_input.png b/editorlib/images/keyboard_input.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/keyboard_input.png +++ /dev/null diff --git a/editorlib/images/layer-large.png b/editorlib/images/layer-large.png Binary files differdeleted file mode 100644 index 79df9fd..0000000 --- a/editorlib/images/layer-large.png +++ /dev/null diff --git a/editorlib/images/layer.png b/editorlib/images/layer.png Binary files differdeleted file mode 100644 index 32ba154..0000000 --- a/editorlib/images/layer.png +++ /dev/null diff --git a/editorlib/images/light_basic-large.png b/editorlib/images/light_basic-large.png Binary files differdeleted file mode 100644 index 21a43e2..0000000 --- a/editorlib/images/light_basic-large.png +++ /dev/null diff --git a/editorlib/images/light_basic.png b/editorlib/images/light_basic.png Binary files differdeleted file mode 100644 index 3233750..0000000 --- a/editorlib/images/light_basic.png +++ /dev/null diff --git a/editorlib/images/light_directional-large.png b/editorlib/images/light_directional-large.png Binary files differdeleted file mode 100644 index 8746fc6..0000000 --- a/editorlib/images/light_directional-large.png +++ /dev/null diff --git a/editorlib/images/light_directional.png b/editorlib/images/light_directional.png Binary files differdeleted file mode 100644 index 907c2df..0000000 --- a/editorlib/images/light_directional.png +++ /dev/null diff --git a/editorlib/images/light_point-large.png b/editorlib/images/light_point-large.png Binary files differdeleted file mode 100644 index 2ee26c7..0000000 --- a/editorlib/images/light_point-large.png +++ /dev/null diff --git a/editorlib/images/light_point.png b/editorlib/images/light_point.png Binary files differdeleted file mode 100644 index 9a4e945..0000000 --- a/editorlib/images/light_point.png +++ /dev/null diff --git a/editorlib/images/light_spot-large.png b/editorlib/images/light_spot-large.png Binary files differdeleted file mode 100644 index 5b50840..0000000 --- a/editorlib/images/light_spot-large.png +++ /dev/null diff --git a/editorlib/images/light_spot.png b/editorlib/images/light_spot.png Binary files differdeleted file mode 100644 index e045aea..0000000 --- a/editorlib/images/light_spot.png +++ /dev/null diff --git a/editorlib/images/logic.png b/editorlib/images/logic.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/logic.png +++ /dev/null diff --git a/editorlib/images/material.png b/editorlib/images/material.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/material.png +++ /dev/null diff --git a/editorlib/images/no_drag.png b/editorlib/images/no_drag.png Binary files differnew file mode 100644 index 0000000..22884dc --- /dev/null +++ b/editorlib/images/no_drag.png diff --git a/editorlib/images/transform.png b/editorlib/images/transform.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/transform.png +++ /dev/null diff --git a/editorlib/images/transform_matrix.png b/editorlib/images/transform_matrix.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/transform_matrix.png +++ /dev/null diff --git a/editorlib/images/transform_srt.png b/editorlib/images/transform_srt.png Binary files differdeleted file mode 100644 index c2e6ede..0000000 --- a/editorlib/images/transform_srt.png +++ /dev/null diff --git a/editorlib/images/up.png b/editorlib/images/up.png Binary files differdeleted file mode 100644 index 9ea8a53..0000000 --- a/editorlib/images/up.png +++ /dev/null diff --git a/editorlib/qml/EntityTree.qml b/editorlib/qml/EntityTree.qml index b03e4e7..9e8abc6 100644 --- a/editorlib/qml/EntityTree.qml +++ b/editorlib/qml/EntityTree.qml @@ -230,8 +230,7 @@ Item { // TODO: because it cannot be safely deleted, which is needed when // TODO: reparenting, which does duplicate+delete (QTBUG-52723). meshType = EditorUtils.InvalidEntity - // TODO: make a proper "invalid drag" icon - meshDragImage = "images/cross.png" + meshDragImage = "images/no_drag.png" } else if (itemType === EditorSceneItem.Light) { meshType = EditorUtils.LightEntity meshDragImage = "images/light_large.png" |