From 26d8ee0308de45d2da10b82d10d8cc1aa5577dd3 Mon Sep 17 00:00:00 2001 From: "Daniel J. Ramirez" Date: Mon, 16 Jan 2017 23:09:16 -0600 Subject: [PATCH] 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 .../icons/source/icon_copy_node_path.svg | 98 +++++++++++++++++ tools/editor/icons/source/icon_reparent.svg | 57 +++------- .../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 0000000000000000000000000000000000000000..056748d20bbb8106badc2d2383d6f573d86598e4 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zB|TjnLn2zAPIdGvpXLU-@f(@5f#f3x)}IR=)~mC|`Oo zU10rAhSgn9g1K7i+0U4}w8U?3H?_AvdFI}n;`0lOuWA`+hIPJTFzircxbJAf%;9Ll z8qpLX{J@xf5!-=ez9UO+Z(Y=Vg7ZM_3I4C0&&m_lt>Idc<^Jh#^efkt*{}39S2L-6 z|99sMpJkn3!>Td{tNfMa=f1A2Gj!;EGnp|fbv{pk_HUJjSvS=gubh$dc)`4}T;_A~ zuf1~(uI#>ktv~z#`-y*3{pz!q zNPj{M+9zANdG-OeSf=jf5z>h>dnXCEwyR#3~a=Cqd?blmV&u+4N znu?5>|BTkiE#_<2uJtsY5MI!5XW9z`gLtd!_UZx8HO{%5ICMX|==Cnnc9;8m<{#T| zeHu^qKg$O@6ZHfWX0~M&dVg8N7``X{sLG3MJ?H5sS7b2{ceisqDo(<+R&nEM3_Ps{5OmzvR^JV7>BJ zFQoC1XEFDTo10%m?Z5v^@6XnttN^ddwpgu0e>!I^-EuZQFC$~eMpKOx1qmKKi@wW@ zM;drGm@pm5;^f=;%*{*kT9p6O+SD!Af~TdHZrid&C-n9E|3~HX=Rcp(v;9E;0|Ntt Mr>mdKI;Vst0Ft{*sQ>@~ delta 588 zcmaFL`kiHhS-p;@i(^Pc>)SBfY>_|_+wzKLZs~~}H`Sz{o!zm(z%?l1#?7OCxs&!k z;14+TkC|JL+jH^OUPsQ1V*n#+2Jl$87HnI`Jh`R8>rAJ`-CNVB2j(8()j_L!~I zTrlyk-)?tr@2&ay3~cJ?TkD| z7Vhg_+nI3Bd(K;Pzuv*6oUw+vA!@DJ@iW^QY}h{>ejG5zopr030_G A0RR91 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 0000000000000000000000000000000000000000..f9a1bb19a4c2636b58aebb497769387179bcf684 GIT binary patch literal 787 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlJ8 zPI$UFhD5Z!oxVRiI8fxc{qw&b0+XDqZ98*wgiZ))yoi5rsVU@50=wge`o;%~WM^q= zURf9tdt{~FtAuu*M!(P(j}*F`#M^}~37t@r@S6BNZk_YzOS6CY%w86{M2_Q5`Mb*J zzfbOcKJR$z=e(jh3xZafWX*ck)!`%6CfI*8$)e9$Md+pbYQ`Ls*=K)-Xnp;9gJEe< z=9Nur&L8M_XYM=MN3A*c_Fo5vn$I@*N|R5%VUlonoxN-)Q%}USuZpwJUfX;d=N39R{-o_694z z4+mUV%TYPbL-{Uu-T2tREeR|{1lq1nrc(`y*ZNtZpAD>^%GX3Swu%&+A`rngJ zKDoU3p6m{`s7KdjkKbet@b*q#6)@vvUvTT8o~S4(>(GYyBi%;>ZQkoDWoH$B^o!mT zF~{`@@4W3RxmrK=$sAk|qxXHyt#`%pT72&tO0PUV_0u-=be^U?Btq#Ow3mr zf>z0NY?lca^vqIJ^IE&@*e*Y&84Owin^Dfg{)>gn>fXB4{r}26Q<}x0^Tgj2qn}IO zYKW!3)UmkhGo@LpJWvj}`m8oVZ;4vgf$86}4<^*s+P?n% zuR0+je4|cxiIr>>#QLQWH)Y^en8f>3eKpn{S`E wR^s~JMez>-p??`61)E;lDZ4Lp~_n=P_+yU|?YIboFyt=akR{0E(?}Z~y=R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d777f132d87ff6cfbf0497ea001a801267624df5 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG zto3wp46*24I?<8ukO2?N@s9Qz_Z?(Tt$q-;;CR1X|EJc0yX*-JYR0p#{Zn7? zyi9{9FqGdkp7qJ)+^f&U=j}Z><cewIci@lpVfmcz`=IWW_2F5kzdVkbKchBcs z8z&n!nK9t%qE-7=XDwOvnj!sK%%7BBk~bu;IZR>`G~icIx)@vk@9T{X-U`#NY;}xN zSSNEb%y=u~g^x`$OFbqtM>A%&glR9A>hO43t~&A3!kl|48&V(eF5oV1dh?%WQgd*2 z&Jwp3t5&Z1nkD{i0{7aox1TqeesfwKo$*zDeJZ=v$Nj zkxmi&Nd@2hdE1OmGzXqwun2z675Ad|cj39UtFl&qfAB|fYeQ?HTDOM?i{rg&1Jie} zaG(hGRK|&pEyy&{QPRe3XT4!cNiEL7(8A5T-G@y GGywpi+n-qg delta 276 zcmZo;KEO1=w4ULsr;B5VMeo{4iheAP0jngEe1=Z9r5?)bm|R{n|&{kehD!)oFet(B8YY+mHvKBscm z|7(=liw0W;p5@XoHAt|BgTmhk13ZCV`f z$W+HJE@*7w!L1s(c1g*EmLsauwk(T!+i1O~y5jk~;+-3mj?^43y=%K*dFHHjudSwf zEqyVce~ZrPUDH{g^yc2qZ%Y(lIk@Oxo4_LW1zjhKcIGg+1a7%dHEWrg!^CF$g(nX3 z*qonTX+Hbx%)Ng#9$1`P&o`~tU{cUK=Jo#tB{&t!UVZ%)yE5d~EcNbp3TGqh{U@bd zFT1OL=tGyqJB9^UB)8t`%-C*!<@)kP7lTeQpWY;Q$!|Hg%%Ur0Zk9dAnKJy9E&4v^ zW_nJF;b&v!R@7@qKXCF@tH!RFH1>@_tA5Nf@qNPj$ACv(eKO~)Wlxo5W-gPQu + + + + + + + + + + + + + + + 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);