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 zcmV-q0h|7bP)x$LFez4v>Hsl_CIH_-Gy@1h zGzD0KSQFqg2cibRV-Ccm+qI&L$O*uG$Pe|2=67JOtO}@VNAkm4>P2Lm>Mtp)0wnkT z+{_L+ei4AGb^tnWsdvuxseUm)jqH;FYGt1cP%HZ+fSTDS0o2SMNazExcO3I$`n{bn z)VtT#k5|A4$o`dHE0X6WfL#j+lIL+8ceUgE9bEug&5gt=i8$;40000M3xr*5Clb2tEfKF*vJ^<8*{Vp)}-DzK;J9#$VqN zy@DE0Sd>boUH})%@M5-YN5*u#T_IvXy9Z|tSOPu^MEo}!@u-OWszyKtI8=t0nGAfn zuF+4ZJmpCZ1Ali#@2l-d?jp=?!*ePO>PDM@mm@lUKdPf;i`_l(u^dSV@nKk8n2^XW z;A?d{#7&En<2wrQ`Fyv5RS(WGFa$6p&VTpQcpCJCN%GU!q|m1X`Z2I+Ob^`C(|w-u z+=Io%#Wtl>qKF_wTObhlVJ;liZ!f!R!hH%x_3KWJe18WtyOtyzHcyy^S+qB;t*uEj zkXLYk+?MDtFkd>?KPOP$(YtMBluh#<16x42%9b;JINg5n!2yYH>^S ztN~ZNXT>DwYc4~V$*3y>JHcV&n_+4;Ie%3^R78Fnrlvg=Pzm-0lsuuSR7$(Ywr$t+ z%vOqjD}MuCSFw~b=>HePy)PQ delta 588 zcmV-S0<-<)1@{DyHh(NhL_t(oh3!^7YZOrwJ$HD63mcIL*(Mw2&A6a2MN(MU*~Lz6 zlE2^&P{RHL3lR%RqqU7e320-H+EkLlChWTNHU_N1!m^= zgE)?tTdmet`{91SzsAg)02ZW_WZ$m>kuH8uZi@rJyb$6kfONvi)Xcm#sVSvK01g3s zBBJflXtW)M;mQ3}X3o_yZ-4CMsxyC>tUb?rM?@hrzo=jW03Io&9+w)>TDJiVGB`)B>pnCKp63mG z-+w?vcL96@fLg6K$IQ0?JO}W@c;9iHThRmr^mJbRuC`kS2YtJD5XxKUxZ^B)7%5A+5DN{&SY_3n=s8Bl``R9S2r?dx(Bq@ zZO3tL14Wp(_(wvBm7-Xdg637xL=wIN{f>i8a2SKoZ zf#9MYnkgyNp;TSOsV?eZhYW#ERp{a%ib5BM64DaLCKyVQ_g=0;^U|C6Oq-@vq#g*| zckX%T`^mlMp2vmrZgQNUQmHg*n&yg#Od5s}kHum*jzc68=|`&pY&4tA`BWXL2Sj&0i{5(xkrjmAj;0H%%&0K@?zk;uis5iEPN z**q!0P(J`?YX1SOK@)6kZS|a=o}TV`)c@TT$mMdU0`S*Y;4A<(fCqp&PVm4*sGEpv zMx)W2j^pfADwXdd^6XCnY#4@d!*QH_fbsG1=hbR8`bPk?f4;B#lgZ@Mquw3323q3R z9mm-NP)kc=s!*8ej#Gugj9OY6J5_*R#EZpIJnt>aVAWEsnT@Y&_ z5W4tXSy*_fJ5Qq%c7E+de*g6gnHvN^iOBtAGWn$KC>CewEI8dvlzO3`j&6Vkfa|(D zfx~s(gCHZ6^I?bh!P)N?_vqXX6Qx%5KGDuBA{zkP+uL>5b$49XrBh048^L zcQ0_5;3H7g=6zr;q$X;>m-cJHV10c(>-+wDU|3hNEQ@qH9eM%j(F-o46`U#*ZXxm- zsOdeR0|45$pk-jnFpQyiJdWcyJ#Rl@tr*w6q93&u#0<9mN#^Hw!ZV#$`w3@M@F3p| RHGlvB002ovPDHLkV1kORaBu(s 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!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^@JzX3_ zEP9ttbmTi^z{7I9qy5Hx2boi=AB62VxOxRkZTsKJ1q(a^MV*ws3FS_nnT~gVdk;>zwAeiO3b(|L=&QV@nj3)*XYh3Ob6Mw<&;$U0z+?mf literal 0 HcmV?d00001 diff --git a/tools/editor/icons/icon_reparent.png b/tools/editor/icons/icon_reparent.png index b3235e60c52d4b43d726b0b7a0f3beae82fd80c0..135ccee4adc49e8894b318c1eca2535ef34b6698 100644 GIT binary patch delta 346 zcmV-g0j2)H0)_*SHGcs+Nklb~5j@q*$1pQ|cP{)V6}z7a ztzI2glL1iGqN={DYNV>`0B6=*{ABtW*csM9k_Hhl4-OZ^^<#EBF?l5qA< z4TdtvgHgx;I8)~eUg(Ycan7x(YOD9){2{e~g>fc}NE8G?-g_`L?&==@j61*;&=HYR s5Co5dik))>GpmZoWE{ss|H#OE1LxI%s3?!++yDRo07*qoM6N<$f}z`=SpWb4 delta 276 zcmV+v0qg#T1Hb~1HGcs0NklXm4Ep*aFkMdlyp@xXa*t1 z*Z?@^=6&BE01s7F?V8yI@CjUo5Kc>XNRrajz9EG3T=%@p3JZua-er2Yl7aXBEz_Nq z3`*GgZ$n+zHh!-?K?Ofa9E5Qa|Du%Gg(NPEA+Z}fVguZoS&A_>-utIgaUT1(Zr#rT a_y%)yb%!Dy3Jm}N0000UqK~y-6rIJ5O!%!5(fA95W>YvRiNl7+`xH^kP94z<|+`8FC6hxe) z4sLd`qhCP+eg_v3GdM^KC0VVcbdZF^C6=_NTJ3>5ynA@(o^!ddBE)>db=^Inr)iq5 z>pGQ6rRbjzv@FZImj&dFZQE~#VGsntqQQm`q6eUg$a1-C07Ox=(0ZDtCP0ycKcUFM z3_Q=9c{iKQnZ5le;5g2&4wj8Dl2Yyium2Gk2_bgs_4-|@RN9&+i|!!JS$|KGWY>1x zC&KWGIPL(T)ETwfiD + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/tools/editor/icons/source/icon_reparent.svg b/tools/editor/icons/source/icon_reparent.svg index 65f101c8f73..79543fe0663 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 00000000000..1a0a0eebe3e --- /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 fc1fe43cefa..5326671f416 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 6247a9b5789..b3e4c8ed70c 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);