From 8933284518a22602b4a3e92a48cb0e1e38e8dba2 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Sat, 2 Dec 2023 20:08:01 +0100 Subject: [PATCH] UI: Icons for Area Join and Swap Icons provided by Alexey Adamitsky to represent screen area join and screen area swap. Pull Request: https://projects.blender.org/blender/blender/pulls/115712 --- release/datafiles/blender_icons.svg | 51 ++++++++++++++++-- .../blender_icons16/icon16_area_join.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_area_swap.dat | Bin 0 -> 1048 bytes .../blender_icons32/icon32_area_join.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_area_swap.dat | Bin 0 -> 4120 bytes scripts/startup/bl_ui/space_info.py | 4 +- .../blender/editors/datafiles/CMakeLists.txt | 2 + source/blender/editors/include/UI_icons.hh | 4 +- source/blender/editors/screen/screen_ops.cc | 4 +- 9 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_area_join.dat create mode 100644 release/datafiles/blender_icons16/icon16_area_swap.dat create mode 100644 release/datafiles/blender_icons32/icon32_area_join.dat create mode 100644 release/datafiles/blender_icons32/icon32_area_swap.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 811300f100b..a51cae9412b 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -45,9 +45,9 @@ inkscape:window-height="1009" id="namedview34335" showgrid="false" - inkscape:zoom="2.8284271" - inkscape:cx="296.80807" - inkscape:cy="340.64869" + inkscape:zoom="1.4142136" + inkscape:cx="229.45615" + inkscape:cy="319.96582" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -19192,6 +19192,51 @@ x="154.01895" y="563.3548" /> + + + + + + + + + + + + Rr4(4t3BgX%+4Ul7P z;|kK{UqR!sHZ$hSKfmwWIP}*4O}(x415b7S@GaZ! literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_area_swap.dat b/release/datafiles/blender_icons16/icon16_area_swap.dat new file mode 100644 index 0000000000000000000000000000000000000000..c6abc1abe22ab8d89fef3b3afed5d0d0de96fc95 GIT binary patch literal 1048 zcmbu7O$x$5427rlciEMP>rxM)%P#dGA|ir<;7MG%7eqXP)-R zwPky!$NQX9-zORvsP1`+UC?@94J4Yr#|eETGsw05(KbM10ht@T%fc?;->aFt0!st+ z9|Qg&{Rbe?wEr1>+~zNJnK2V?fi?xj+snS%`)z+0XI9Wp{Q~s=skqMl!rwLD)*sCC O<<4dHeZVJn2DY1W?Fww*%H(4y``_J3a37#O|5oS*^?xFc<{9C8KQFHke)9Y8 z^YwDA{C!-NiLdi-G~XI~mG{?pe$VBnemOgO?I+ms{AK)CasHJW^j*39OaCB#{+GUa b>CG}af8X0Xc&gIqXsFZC-mC(?CS<%FaNjJe9YVEH2_ zkCl(fi}00i->;}n5nia@0l6Qwcp*>D$yxj7^;+lAb4GZp{#<_K6XA1ut?|ew!dV}& zYxEcN?B4PI$l-hF4gJQ)My;m(ht3r`pE+sf+;|TpiT)?X*&0;b=#+3^-WyOdyc7PM zo2>zutk39p9P^Sl;3j|0H*3JW*8i2s3$>%v33|2u?+bae%-0$Ix6CW7!R(vp$}jTe z`Gop|!LATDI*K>pz)EYF;-aa4l@5lOJmySUMb{723m;(U&? z?@qy=?}~5qspdKdxa?20zvlOjSO32HqkjB-$-YAo?)R&={wu$G|K{F5l(?!z?{5_u WNuIC&W6Wt}_YeqOe1A^=%lr@7HI?xI literal 0 HcmV?d00001 diff --git a/scripts/startup/bl_ui/space_info.py b/scripts/startup/bl_ui/space_info.py index 8fcd097be9f..c865565c454 100644 --- a/scripts/startup/bl_ui/space_info.py +++ b/scripts/startup/bl_ui/space_info.py @@ -75,8 +75,8 @@ class INFO_MT_area(Menu): layout.operator("screen.region_quadview") layout.separator() - layout.operator("screen.area_split", text="Horizontal Split").direction = 'HORIZONTAL' - layout.operator("screen.area_split", text="Vertical Split").direction = 'VERTICAL' + layout.operator("screen.area_split", icon='SPLIT_HORIZONTAL', text="Horizontal Split").direction = 'HORIZONTAL' + layout.operator("screen.area_split", icon='SPLIT_VERTICAL', text="Vertical Split").direction = 'VERTICAL' layout.separator() diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 7da882a04a6..dbb05dab14f 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -342,6 +342,8 @@ set(ICON_NAMES force_fluidflow rigid_body rigid_body_constraint + area_join + area_swap split_horizontal split_vertical image_plane diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index f87715970c7..bba3f5f545b 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -420,8 +420,8 @@ DEF_ICON(RIGID_BODY) DEF_ICON(RIGID_BODY_CONSTRAINT) DEF_ICON_BLANK(677) DEF_ICON_BLANK(678) -DEF_ICON_BLANK(679) -DEF_ICON_BLANK(680) +DEF_ICON(AREA_JOIN) +DEF_ICON(AREA_SWAP) DEF_ICON(SPLIT_HORIZONTAL) DEF_ICON(SPLIT_VERTICAL) DEF_ICON(IMAGE_PLANE) diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 91a539da184..a3ff92cac19 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -3778,7 +3778,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent uiItemFullO(layout, "SCREEN_OT_area_join", IFACE_("Join Areas"), - ICON_NONE, + ICON_AREA_JOIN, nullptr, WM_OP_INVOKE_DEFAULT, UI_ITEM_NONE, @@ -3791,7 +3791,7 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, const wmEvent uiItemFullO(layout, "SCREEN_OT_area_swap", IFACE_("Swap Areas"), - ICON_NONE, + ICON_AREA_SWAP, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE,