From 26d8ee0308de45d2da10b82d10d8cc1aa5577dd3 Mon Sep 17 00:00:00 2001 From: "Daniel J. Ramirez" Date: Mon, 16 Jan 2017 23:09:16 -0600 Subject: Added some missing icons and modified others --- tools/editor/icons/2x/icon_copy_node_path.png | Bin 0 -> 356 bytes tools/editor/icons/2x/icon_reparent.png | Bin 631 -> 741 bytes tools/editor/icons/2x/icon_script_remove.png | Bin 0 -> 787 bytes tools/editor/icons/icon_copy_node_path.png | Bin 0 -> 248 bytes tools/editor/icons/icon_reparent.png | Bin 320 -> 390 bytes tools/editor/icons/icon_script_remove.png | Bin 0 -> 411 bytes tools/editor/icons/source/icon_copy_node_path.svg | 98 +++++++++++++++++++++ tools/editor/icons/source/icon_reparent.svg | 57 ++++--------- tools/editor/icons/source/icon_script_remove.svg | 99 ++++++++++++++++++++++ tools/editor/property_editor.cpp | 2 +- tools/editor/scene_tree_dock.cpp | 8 +- 11 files changed, 217 insertions(+), 47 deletions(-) create mode 100644 tools/editor/icons/2x/icon_copy_node_path.png create mode 100644 tools/editor/icons/2x/icon_script_remove.png create mode 100644 tools/editor/icons/icon_copy_node_path.png create mode 100644 tools/editor/icons/icon_script_remove.png create mode 100644 tools/editor/icons/source/icon_copy_node_path.svg create mode 100644 tools/editor/icons/source/icon_script_remove.svg diff --git a/tools/editor/icons/2x/icon_copy_node_path.png b/tools/editor/icons/2x/icon_copy_node_path.png new file mode 100644 index 0000000000..056748d20b Binary files /dev/null and b/tools/editor/icons/2x/icon_copy_node_path.png differ diff --git a/tools/editor/icons/2x/icon_reparent.png b/tools/editor/icons/2x/icon_reparent.png index 2473a3b362..3063da4b43 100644 Binary files a/tools/editor/icons/2x/icon_reparent.png and b/tools/editor/icons/2x/icon_reparent.png differ diff --git a/tools/editor/icons/2x/icon_script_remove.png b/tools/editor/icons/2x/icon_script_remove.png new file mode 100644 index 0000000000..f9a1bb19a4 Binary files /dev/null and b/tools/editor/icons/2x/icon_script_remove.png differ diff --git a/tools/editor/icons/icon_copy_node_path.png b/tools/editor/icons/icon_copy_node_path.png new file mode 100644 index 0000000000..d777f132d8 Binary files /dev/null and b/tools/editor/icons/icon_copy_node_path.png differ diff --git a/tools/editor/icons/icon_reparent.png b/tools/editor/icons/icon_reparent.png index b3235e60c5..135ccee4ad 100644 Binary files a/tools/editor/icons/icon_reparent.png and b/tools/editor/icons/icon_reparent.png differ diff --git a/tools/editor/icons/icon_script_remove.png b/tools/editor/icons/icon_script_remove.png new file mode 100644 index 0000000000..c200b01690 Binary files /dev/null and b/tools/editor/icons/icon_script_remove.png differ diff --git a/tools/editor/icons/source/icon_copy_node_path.svg b/tools/editor/icons/source/icon_copy_node_path.svg new file mode 100644 index 0000000000..9f33c5e54d --- /dev/null +++ b/tools/editor/icons/source/icon_copy_node_path.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/tools/editor/icons/source/icon_reparent.svg b/tools/editor/icons/source/icon_reparent.svg index 65f101c8f7..79543fe066 100644 --- a/tools/editor/icons/source/icon_reparent.svg +++ b/tools/editor/icons/source/icon_reparent.svg @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="-1.4011549" - inkscape:cy="8.7567876" + inkscape:zoom="22.627416" + inkscape:cx="11.980115" + inkscape:cy="8.5519429" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -46,7 +46,10 @@ inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" - inkscape:window-maximized="1"> + inkscape:window-maximized="1" + inkscape:snap-midpoints="true" + inkscape:snap-smooth-nodes="true" + inkscape:object-nodes="true"> @@ -59,7 +62,7 @@ image/svg+xml - + @@ -68,45 +71,15 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - - - - - + d="M 3 2 A 2 2 0 0 0 1 4 A 2 2 0 0 0 2 5.7304688 L 2 11.271484 A 2 2 0 0 0 1 13 A 2 2 0 0 0 3 15 A 2 2 0 0 0 4.7304688 14 L 11.271484 14 A 2 2 0 0 0 13 15 A 2 2 0 0 0 15 13 A 2 2 0 0 0 13 11 A 2 2 0 0 0 11.269531 12 L 4.7285156 12 A 2 2 0 0 0 4 11.269531 L 4 5.7285156 A 2 2 0 0 0 5 4 A 2 2 0 0 0 3 2 z " + transform="translate(0,1036.3622)" + id="circle4277" /> + style="opacity:1;fill:#84ffb1;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 9 1 L 5 4 L 9 7 L 9 5 A 3 3 0 0 1 12 8 L 12 10 L 14 10 L 14 8 A 5.0000172 5.0000172 0 0 0 9 3 L 9 1 z " + transform="translate(0,1036.3622)" + id="path4289" /> diff --git a/tools/editor/icons/source/icon_script_remove.svg b/tools/editor/icons/source/icon_script_remove.svg new file mode 100644 index 0000000000..1a0a0eebe3 --- /dev/null +++ b/tools/editor/icons/source/icon_script_remove.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index fc1fe43cef..5326671f41 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -3731,7 +3731,7 @@ void PropertyEditor::update_tree() { item->set_cell_mode(1, TreeItem::CELL_MODE_STRING); item->set_editable( 1, !read_only ); item->set_text(1,obj->get(p.name)); - item->add_button(1, get_icon("Collapse", "EditorIcons")); + item->add_button(1, get_icon("CopyNodePath", "EditorIcons")); } break; case Variant::OBJECT: { diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 6247a9b578..b3e4c8ed70 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -711,7 +711,7 @@ void SceneTreeDock::_notification(int p_what) { button_add->set_icon(get_icon("Add","EditorIcons")); button_instance->set_icon(get_icon("Instance","EditorIcons")); button_create_script->set_icon(get_icon("ScriptCreate","EditorIcons")); - button_clear_script->set_icon(get_icon("Remove", "EditorIcons")); + button_clear_script->set_icon(get_icon("ScriptRemove", "EditorIcons")); filter_icon->set_texture(get_icon("Zoom","EditorIcons")); @@ -1808,7 +1808,7 @@ void SceneTreeDock::_tree_rmb(const Vector2& p_menu_pos) { //menu->add_icon_item(get_icon("Connect","EditorIcons"),TTR("Edit Connections"),TOOL_CONNECT); menu->add_separator(); menu->add_icon_shortcut(get_icon("ScriptCreate", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/attach_script"), TOOL_ATTACH_SCRIPT); - menu->add_icon_shortcut(get_icon("Remove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/clear_script"), TOOL_CLEAR_SCRIPT); + menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/clear_script"), TOOL_CLEAR_SCRIPT); menu->add_separator(); } @@ -1820,9 +1820,9 @@ void SceneTreeDock::_tree_rmb(const Vector2& p_menu_pos) { if (selection.size()==1) { menu->add_separator(); menu->add_icon_shortcut(get_icon("Blend","EditorIcons"),ED_GET_SHORTCUT("scene_tree/merge_from_scene"), TOOL_MERGE_FROM_SCENE); - menu->add_icon_shortcut(get_icon("Save","EditorIcons"),ED_GET_SHORTCUT("scene_tree/save_branch_as_scene"), TOOL_NEW_SCENE_FROM); + menu->add_icon_shortcut(get_icon("CreateNewSceneFrom","EditorIcons"),ED_GET_SHORTCUT("scene_tree/save_branch_as_scene"), TOOL_NEW_SCENE_FROM); menu->add_separator(); - menu->add_icon_shortcut(get_icon("Duplicate","EditorIcons"), ED_GET_SHORTCUT("scene_tree/copy_node_path"), TOOL_COPY_NODE_PATH); + menu->add_icon_shortcut(get_icon("CopyNodePath","EditorIcons"), ED_GET_SHORTCUT("scene_tree/copy_node_path"), TOOL_COPY_NODE_PATH); } menu->add_separator(); menu->add_icon_shortcut(get_icon("Remove","EditorIcons"), ED_SHORTCUT("scene_tree/delete", TTR("Delete Node(s)"), KEY_DELETE), TOOL_ERASE); -- cgit v1.2.3