From 6c750e68bd6104589816d195cb802d8774230674 Mon Sep 17 00:00:00 2001 From: Ahanu Dewhirst <16126069+Orcjett@users.noreply.github.com> Date: Wed, 17 Jul 2024 01:15:47 +1000 Subject: [PATCH] [#2485] Add icons for component visibility --- .../openrocket/swing/gui/theme/UITheme.java | 22 ++++++++++++++++++ .../info/openrocket/swing/gui/util/Icons.java | 4 ++++ .../resources/pix/icons/component-hidden.png | Bin 0 -> 1558 bytes .../pix/icons/component-hidden_dark.png | Bin 0 -> 1553 bytes .../pix/icons/component-hidden_light.png | Bin 0 -> 364 bytes 5 files changed, 26 insertions(+) create mode 100644 swing/src/main/resources/pix/icons/component-hidden.png create mode 100644 swing/src/main/resources/pix/icons/component-hidden_dark.png create mode 100644 swing/src/main/resources/pix/icons/component-hidden_light.png diff --git a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java index 46f523dbf..a7a18e7c6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java +++ b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java @@ -99,6 +99,8 @@ public class UITheme { Icon getCDOverrideIcon(); Icon getCDOverrideSubcomponentIcon(); + Icon getVisibilityHiddenIcon(); + Border getBorder(); Border getMarginBorder(); Border getUnitSelectorBorder(); @@ -424,6 +426,11 @@ public class UITheme { return Icons.CD_OVERRIDE_SUBCOMPONENT_LIGHT; } + @Override + public Icon getVisibilityHiddenIcon() { + return Icons.COMPONENT_HIDDEN_LIGHT; + } + @Override public Border getBorder() { return new FlatBorder(); @@ -810,6 +817,11 @@ public class UITheme { return Icons.CD_OVERRIDE_SUBCOMPONENT_DARK; } + @Override + public Icon getVisibilityHiddenIcon() { + return Icons.COMPONENT_HIDDEN_DARK; + } + @Override public Border getBorder() { return new FlatBorder(); @@ -1196,6 +1208,11 @@ public class UITheme { return Icons.CD_OVERRIDE_SUBCOMPONENT_DARK; } + @Override + public Icon getVisibilityHiddenIcon() { + return Icons.COMPONENT_HIDDEN_DARK; + } + @Override public Border getBorder() { return new FlatBorder(); @@ -1601,6 +1618,11 @@ public class UITheme { return getCurrentTheme().getCDOverrideSubcomponentIcon(); } + @Override + public Icon getVisibilityHiddenIcon() { + return getCurrentTheme().getVisibilityHiddenIcon(); + } + @Override public Border getBorder() { return getCurrentTheme().getBorder(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java b/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java index cf3c6fd75..0f9550811 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java @@ -117,6 +117,10 @@ public class Icons { public static final Icon CD_OVERRIDE_SUBCOMPONENT_LIGHT = loadImageIcon("pix/icons/cd-override-subcomponent_light.png", "CD Override Subcomponent"); public static final Icon CD_OVERRIDE_SUBCOMPONENT_DARK = loadImageIcon("pix/icons/cd-override-subcomponent_dark.png", "CD Override Subcomponent"); + public static final Icon COMPONENT_HIDDEN = loadImageIcon("pix/icons/component-hidden.png", "Component Hidden"); + public static final Icon COMPONENT_HIDDEN_DARK = loadImageIcon("pix/icons/component-hidden_dark.png", "Component Hidden"); + public static final Icon COMPONENT_HIDDEN_LIGHT = loadImageIcon("pix/icons/component-hidden_light.png", "Component Hidden"); + // MANUFACTURERS ICONS public static final Icon RASAERO = loadImageIcon("pix/icons/RASAero_16.png", "RASAero Icon"); public static final Icon ROCKSIM = loadImageIcon("pix/icons/Rocksim_16.png", "Rocksim Icon"); diff --git a/swing/src/main/resources/pix/icons/component-hidden.png b/swing/src/main/resources/pix/icons/component-hidden.png new file mode 100644 index 0000000000000000000000000000000000000000..a9df29fa64ccc9d8aca114f1e07103e4914f5159 GIT binary patch literal 1558 zcmV+x2I={UP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHlH4E+MgLhvmVhLL#Bwm0s_Y=k&jmlGduH;g zHxxsN@)un&*;p#3z+hxMJe*_>|RCOshXn;x&1)hx-D< zBpBs5wR-wj*!As(YYp0-?ZMA0>}Q}W@)=O(%8W^WOcHiJ?3B(xWj`jlxIL!2@iDg3 zaiww|vfaUs5$EC2kPIqy#X`co3rSqPA3idVBo(8fCsFvJ$DG9ih9u?81cE$0-YsB! z6zEChYZl(Cf6v~D&-Jv+J1z665hkBrApKnYCGo?;a%aTP7mTh@A4MLc`xyK2bTwrt zn$L<_V$&4{j?h2Jx-Fv_4#nJ7D`*~TY(U;)iyK;_LJTS+P@+zi2JLHX)R1E0oed*% zV_7yAQ{N(pzoG;we>%Qhp*mS8D&nYBC_;r$E41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rz!Aa3Y zO8j3^Xc6PVaX;SOd)&PP{LLy;&7K6HYL<~nC52pmRS3Nzgb0EdKtf`sJ|~K4c#f}o z`1pDk=ULw8{v7>E!DN6>Af9EqVG(Z-Pj6Z}=Y8TRD@zLTIq|qb7bJeH9AV~VO#zCY)(!g-6cTCKD8J^2g61#M-S>oiA@!XlO+ zLV%1qDyYIjoK}q#6B*i1diaMOzep~bToo{KET9GzlH&*egWuhn#mNabDVzj?FSh+L z3WRonR>QWxk8Qhk0tB9cE3MMDH$92^2;CCXm+cz17iZ~vZY_xA%??{b}x2is`? z000JJOGiWi{{a60|De66lK=n!32;bRa{vGUb^rhXb^%U%CI|ok00(qQO+^Rj2M+}s zF(RY(LI3~(AW1|)R5;6}(=jW>VH5`N-{q!I;tMDfqbwHc#%B;&#bS{xr2LUZDP>R? zOvH*+ln0b^*x1v=w>1V_0*1uKP?kFk#oui-pfsF}ui88y_=TF7G|$X9s5O+lc6S_|&5 zl|0ljP$17W>0kr5c?Mae+`xP?^9+U}{k4RA5Zn4*V2&53I&bDBgh} zpGSxz=nL^`baaU4l#mMK7dDk2$#0Mf>|wG=+P@YU{L8QU0^lh>B`aUp3;+NC07*qo IM6N<$f|onaMF0Q* literal 0 HcmV?d00001 diff --git a/swing/src/main/resources/pix/icons/component-hidden_dark.png b/swing/src/main/resources/pix/icons/component-hidden_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..b7258cff0054af9c82973040aa7b2f3e1ed9d566 GIT binary patch literal 1553 zcmV+s2JZQZP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJlI$i7h2L34mVhLL#Bwk{RoOw7p96M#x@RWI zy>;(Ps@jwR3t7nL19~Qmzy6%z4_s6-hot7YmfcmFZOT` zFie70&PS`4e}!E?UUCZ{R&ZnKy6{w7}lZ)GPst2EK zyBv2a*Dc2#>}>HIo(;*MQddkQ%tJ`xuKo0pbtkE44K<0v4;iDc;sFgyxiWzuFQ0b{ z7@q}t5&6*zpVhy6pTy^S+2xa#`O*lTZwE-f7k^9qG_l+n@#}!eBh*)s=j=Y`IKQr@ z3`O&`qPE!d2m?pxpJcz5Q4F`DZ@Ux}k2N+R@3F-LrBNXUl^G~er%IE?ZW}eEn0T}ivw2U5kz3-I~UsXmOWo1$IPAJ%7kEqSN^ete;fRn66S16 zB8q-%g}itzQKYfRtr}hcLi6ILTi{2z@W-e1vzBUt+mhMwfi)gyh(qaPZOP^=@Kdzs z7NTJN3IK^Pw;~x55QrIjfHFm6HX`Wg0927V_6Z*#K&sr4BqtG^N5;-;ZoFf(eOWp4 zGUIFl2$hVz5!b0~u$OWML%IzC!ef`e0P3+u-OVcRWeekL50e6h3ezkoEdIx$3dIx$3dIx$3 z`u_)#i9a6jPht2QnggAu@@$&b0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$i zQ>7x+4t5Z6$WR@`f~csYR-p(LLaorMgUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pw zX9p)m7b)?7Nufoo2gm(*ckglc4iIW3rdb_hfTr7KG9DAtnN>0HiU4{M!Zb!?W*Kvm zltA0@bq^n3@1i`b{kcC!kD9d@;1h{wnPJ+*8^lwaw!wLyILr#NN_mbp%I z5OFMG2@*sosGx`vY(#0*NwJWm{a73Sfa{mYrI4!#MveuPp+R>2;D7MDTPrs)?j;3d zK5#ex~VC9z~v6m|76If z>`H!`LM{iqpV2pEfWBLxd(G>uv5(USAVpmzZh(VBU^q|N>uuiM)!N&?XBz$e0Kj5$ z#(11?z5oCK24YJ`L;(K){{a7>y{D4^000SaNLh0L004FX004FYPJ1Q@00007bV*G` z2j~Y54>}zw&u#Gl009+AL_t(I%caw?PLx3u#qqO3LnS75Bs>HqiOCmj40cvqLu0uV zmIeuy6c#ijv^;{n2{p-9KEQUEKr}AIV%eX~teKsq5cejxn9Tgoz4v_g>mkd;lPnqk zE6^nwCP~odCXO(~PmJ*mpRtA)xWY@!3H0zDcNXIwd+2bBof%idXBF@p`*@0VY!`T3 z?k`F=e+51@75DK5BfKr}ujbA9OrXQGxqMdO-Kui`fze*ACYdCeCRwRm?j;!{xk>UR z$#s&i&6kj5G8^HrF>JdsY=qbN&{Y4}ns{7Bc~{Nc$8#KDQo*N%S=fWE#_cx77}QKF z(BV5yszv&N%hK{jyLk0sZo~dH>%*{gkjG?i+28pO_|0k+2?- zG7x6;t5)LxG9*h}BT9nv(@M${i&7cN%ggmL^RkPR6AM!H@{7`Ezq647DthVZ;uvDl zd-al`esiM8(U0>t%$RUP#jYh#DKnzw?3I~ES2(*bOf-?u5z4lAD({TEbdr6;M1eNWp@6tt-~+DXGmZ%5ZJ2Y=(BxxJomKt~ zuIF;s+zzIzK49hbNtEhl6gS-8VKU#!r;m5dV<~Ay`=!=zKRMmIT%h*g?4;sam#tGd z_Z(w>yz&y?yNd^9&jr7&+pu7&nAwXv-72eZ_`dsH+37wpW%rexeUWckZ!_5OKASDZ zlW#p=X;tW|w&*!OetGck=s8hre{ib(o9(aMn)Y91m%JXve$hN!4CrYFPgg&ebxsLQ E0H2PLv;Y7A literal 0 HcmV?d00001