From ef412c36c6a38528147bf34543d044b803dea56d Mon Sep 17 00:00:00 2001 From: tim <59872808+trhyder@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:48:33 -0400 Subject: [PATCH] Cancel and Apply buttons (#5435) * Cancel button added back in, Green apply replaced with CHECKMARK * 2-point arc icon added --------- Co-authored-by: tim --- .../bonsai/bim/data/icons/dm_2-point_arc.png | Bin 0 -> 608 bytes src/bonsai/bonsai/bim/data/icons/dm_apply.png | Bin 508 -> 0 bytes .../bonsai/bim/data/icons/lm_2-point_arc.png | Bin 0 -> 651 bytes src/bonsai/bonsai/bim/data/icons/lm_apply.png | Bin 506 -> 0 bytes src/bonsai/bonsai/bim/module/cad/workspace.py | 10 +- src/bonsai/scripts/bonsai_icons.svg | 352 +++++++++++++++++- 6 files changed, 336 insertions(+), 26 deletions(-) create mode 100644 src/bonsai/bonsai/bim/data/icons/dm_2-point_arc.png delete mode 100644 src/bonsai/bonsai/bim/data/icons/dm_apply.png create mode 100644 src/bonsai/bonsai/bim/data/icons/lm_2-point_arc.png delete mode 100644 src/bonsai/bonsai/bim/data/icons/lm_apply.png diff --git a/src/bonsai/bonsai/bim/data/icons/dm_2-point_arc.png b/src/bonsai/bonsai/bim/data/icons/dm_2-point_arc.png new file mode 100644 index 0000000000000000000000000000000000000000..b694894b8554d2902f0b9b2a7f10a795f8c0ae6b GIT binary patch literal 608 zcmV-m0-ybfP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10qsdd zK~z|U&6hD~6Hyq)fB&Nug`$IW(^bJH6j7=r4gs^pO$BEW+=>)YNG>#}>88@5L&4px zMT(Od0@juy4qk2$XK@jPE)H7qIkdEw%O$DF-NpZM@Ba7R_kKLSd+&QPGe#+Aq_YEK zfp)*8P|^SZAApUJcMZrTF?kd~9jJ!9Dv*;`sbW@V_s6zfTKN+fz|nI+wt&NXj!piQ zUwN%&X*OMeLrq|I2b@j$?za5OjkEy{Wz1lvG=aDS~*E_%3OUu^g z69oVe5>59W*b;Ce6#3y%R$?fCgCNb)EI4m~$$;HLy4^1)VgUfq=h8VGXCnl$!|wP6 zySVVZ+ql>cBb#3QisKZ4Ujh3RW51Vrjf?d(w5cZ_K@Zwp-I8A}rUC#!_Sq}oT|1eo zsR0;f(3%5U0sFE%_i8Et0G3_+f>>)a#awCt`+5<2FY43%@$>*PwJor30p}#gPtT+V zu$K$GZ8ud2_v^M1HTIwRp%{8g&{>kjt-dv8(g0m+%qW0HpgkSo<>R6X>c6^}=f literal 0 HcmV?d00001 diff --git a/src/bonsai/bonsai/bim/data/icons/dm_apply.png b/src/bonsai/bonsai/bim/data/icons/dm_apply.png deleted file mode 100644 index 78f3c601c1bad6ee71cede849a0adfa23609c3df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmVpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10f|XO zK~z|U?UubS192F~KhL!#5w;RGF^EK4%wji~CH@4Hw?tEIDxxYRB$)gSVr4@70fOtI zF^ECLW)Kq9J_c>lo?czgOAYrOpS$NipL>4y@)K31kue%d_XIovPvAcY_n(JhUn_8kkz-ndUPi9>w88=7;sVlIrhhNC-#(ld5_)hE!`I}D6| z^bv0rTJ0pnjE8LDk(KFMa9aV5EN4-TTFRd!#Egd! zIdTgJkXkz;$s}fh4NLhML&qrSJs2lIr$v94aC*`S{7ZqN#5}NODL(-(Kzk+I`JFo! zs3B1q7jVY{MTu(5QKHv1_VPIX5^6ZL30NP@(yQhQUY9^oVjY+R-hezRt8T_#9>+^i y(R9Ahj$t(EKpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10vJg| zK~z|U#h0;b6Hy$;Kfg-^1<}bt&{e_3MXDtZ!d<4gsi353YOJ~yDWaqK2UI#Zw8krH zw3{NuDK8*cmEu1j&f+L^u#5Hm9NLt-OA~X+-Q_zS-+S-(KKHxdyZ1X$RmLf2tg8e0 z&V}cBeN$nKkyHTyRP~eNIBP-AT6iW2X|-DQpjRvw>#AB1zfuRsu(f|( zZ!P{w3Ls7mJOKNV{N^w5D=XqxC$k3V=pb+v>}T<(*JXL?V%7iw=>#gP;!m&2^0ni` zM3ByRU}qN?RW+djA|Bwi%SRVcO2Dxmu{N+$)7ckqMgiz4V~hwQG|Fem$vny>x-)1& z?`f_1Fg8G3iC;MhJOSLUo62Lo@p3*@002P*zdQ@F033)=+#MtnBLVCN@vDGrT3u?Sn0B?e!sYUH1b(yWPGpEWn^WX1?E` zQ8h@9nJPfP9*kcL#X;JWVppcnngNfiL_ lWRJZcRALRuuo`<2{sV-{%Y;=#VDpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10f$LM zK~z|U?Up?+1W^<~&zlg7?>g2k^Uwjsdz7<$6?{% zaR$DM>DUag>`1>reh5Qv$(yG@M`;rqBzGtMz<(3~kW73I)kR188F&TSO4I&V?pvUY zgd>8(eG7o+b`*-i#$Fu0zl3VpD~LD`CZKC!;eiAIG`X_`%mN=k4%LM)V=oThTTs%J wvDz?m4I1CR2@9@B;5Vb@e?*Z$Bv5mKPdit&CL7mNQvd(}07*qoM6N<$g3a&I_5c6? diff --git a/src/bonsai/bonsai/bim/module/cad/workspace.py b/src/bonsai/bonsai/bim/module/cad/workspace.py index 7fb643c9bc..d0d61f4157 100644 --- a/src/bonsai/bonsai/bim/module/cad/workspace.py +++ b/src/bonsai/bonsai/bim/module/cad/workspace.py @@ -322,12 +322,10 @@ def add_header_apply_button(layout, text, apply_operator, cancel_operator, ui_co ) row = layout.row(align=True) - row.operator( - apply_operator, - text="Apply" if ui_context != "TOOL_HEADER" else "", - icon_value=custom_icon_previews["APPLY"].icon_id, - ) - row.label(text="", icon="EVENT_TAB") if ui_context != "TOOL_HEADER" else row + row.operator(apply_operator, text="Apply" if ui_context!="TOOL_HEADER" else "", icon="CHECKMARK") + row.label(text="", icon="EVENT_TAB") if ui_context!="TOOL_HEADER" else row + row = layout.row(align=True) if ui_context!="TOOL_HEADER" else row + row.operator(cancel_operator, text="Cancel" if ui_context!="TOOL_HEADER" else "", icon="CANCEL") row = layout.row(align=True) row.label(text="Tools") diff --git a/src/bonsai/scripts/bonsai_icons.svg b/src/bonsai/scripts/bonsai_icons.svg index 6c9278e70a..2bf26bbe10 100644 --- a/src/bonsai/scripts/bonsai_icons.svg +++ b/src/bonsai/scripts/bonsai_icons.svg @@ -15,6 +15,7 @@ inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + sodipodi:nodetypes="ccc" />