From 8004743b6403e229cbd22a770be45df5fabf5c2c Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 8 Nov 2022 11:51:05 +0100 Subject: [PATCH] Add icons for mass/CG/CD subcomponent override --- .../pix/icons/cd-override-subcomponent.png | Bin 0 -> 2315 bytes .../pix/icons/cg-override-subcomponent.png | Bin 0 -> 1837 bytes .../pix/icons/mass-override-subcomponent.png | Bin 0 -> 2137 bytes swing/src/net/sf/openrocket/gui/util/Icons.java | 3 +++ 4 files changed, 3 insertions(+) create mode 100644 core/resources/pix/icons/cd-override-subcomponent.png create mode 100644 core/resources/pix/icons/cg-override-subcomponent.png create mode 100755 core/resources/pix/icons/mass-override-subcomponent.png diff --git a/core/resources/pix/icons/cd-override-subcomponent.png b/core/resources/pix/icons/cd-override-subcomponent.png new file mode 100644 index 0000000000000000000000000000000000000000..228cb95f3b795ae933a4232004f9be8dbd8e236f GIT binary patch literal 2315 zcmbVN4Nw$i7(OSFB7w6pDUw{*CQ01eAMS5APC|~KOOGEpO$;6OcK42jyWMMd;SS7d zP!lnKBg+zN8YeQ-u{8ftRQi?FjPVB>&`8UPIvED3Q0zN6Zm7^4cV>6L{l4dW-{*ba z_j`AFPF6-_L~MjgrHZs`zgYo}IK8;i$Q=S*yjuqaqLfBKo$lCPpQ zabagG7bmZn9UkMHA6F2TaxJ{^yRR+Zr9C_Tp-grAhNz!6$@_ZLzwd6}yvP59rNuw) zxvtzT1)wm)p<*JI>JmGDtyi^f+tt3=aG@uAYO|pNPg&CSLfwVQdzbIr z^H=S(Ba7JfZ;NX$l3B`(%MnL1*pf+ok>?#-3MMXbdFy>^u@xVZpO@q%wRSwY#JOhc zWWIKX_Q!7Ol3ubbRIm1r#tyGtaG-kp`fd9=sw*?UeP+hoY@cne`R0vZ{KCSO-`AzTbET`}7BRlh_{9(Nua~`gtZntOWA&5SXlvTXb6ipNfxZZ`a- zFA;s$*0fv4iA{g>HYnn)?$>&I@9WK!yiX@wP6DZUz>}FTgIw(h+#{~Ow6R{L3hUr) zbCtQ)nG_?sH8d;QIgQWl0ce#fDcR?tnG#Nc?3|MqOtAmJVHo0B6a1Xcidj9WToIpH zA#r&XSvIDkgdtftc^Z`DqksW7r_hkk?Gj|lXM+3fQeYgIMq#KQqLi56lz>BME+~^! zQQ{zj21ghS!yp5xv11OSog=ZS5P=amiW4ZVLkOHAbQG?Gf)@<@NvwmKWlj%z179Y% zNKrf#ih8|XjW7fTfr z47d&i;r4{g3UW{=AQ|eTJt(fh0zvfyStf+@luE9C=PZMAF3!yfiVU!L2iBkh%nnpfGFz zY86@DQ9cBU;|ON7;W&k9sYGJ}1_pyrP&O>B(Ekf&8Ok9_ZW@HlyJ;tfdITp7g@mM1 zMVBZ6$ADep(0L2!R+8x8U0~tAU8|q3)k;|eS)m1nvzSdV&_~1bEJbP)2}VzH2*Z#B zqGebDA@!sIvD*oQfzVk%T6;}ESL=ta{kh8T5h zBB^CC(m~^c`?Dn;oI~1m&vpW*Gf+NMCNG1;mIqHy9`{0U?JilJyGa1u-~6DR?W zg@e=lFbdpV1OsNhMI11Chr$?u$)ZE?(h`^A1Zv$y>7loyFVkgrCVzM7`w#iyOZDE! z2c>0-Xu-*W=8D3BaL_;#8b}QK@0|6o4QW_|aL@$vBj@ldTL@-P43vwJKI(Rk2l zt+69Nc}u`zmm>Rrc{TFDeN@%BF*D~)&3gGK z-6?U8u1tr&(H(4fbYnxTe!uYBudS`uPbB%&xvPGR`oQ>Ze#YMB8@(&mg&WVF-sCuw zy(YiylH{2G=Y$tO?fyQ0(#}KkM;=wTJ%2c<#9Y(9p?ijT->T9Vk7ai_&n$a+UGnap zn5acJro2CMUPFGz?yEvt&6hixd+MvCXhY}6*3*~ZO@-mBPjP1^jJZ7O@xszm*AJ|$ zPB>S5v8$<~XTsJ)LQAAGO8bTJ{f$SpJNw?2>lkZtboA33N{R4!tKt*RHTE`DT#GsQ gUaR)zEBK93H+L0eeRM?qZs6BwNy{>CpI%t`H&EtM%m4rY literal 0 HcmV?d00001 diff --git a/core/resources/pix/icons/cg-override-subcomponent.png b/core/resources/pix/icons/cg-override-subcomponent.png new file mode 100644 index 0000000000000000000000000000000000000000..1107ec954d81afd9352ef15ebea3219856d7e411 GIT binary patch literal 1837 zcmbVNeQ4Zd7|)PNTdlP?#uRZe6}sti$(#F3*sZorYp?aXdOft8SbQ&e?=HK`$C9*n zS6Y=a=VVZI;K_+!J+koVJm3soBN{EZk7d-yh(n~ z@A*9+?~^Bcy6>s2xuu36h}uwx7;*0SyuRvMe0}FF|CjhyZFKCj2;#b%oO2T~F}aN( zHqR;1KD#e`uOR8F3(9&7xw5K((FC!(DQiF}g={j05{ee2emU_zMJjTTdcYfI!$vDg zDjh>6>K*EiN<%4$m#L;bx#4id$GTcnwc^6E+XitMrG%`DwxT%$F%e|x1Ez%92C>WrCmKU&H4(IRGpg(9 za;bXCl1a|(;>aCgC@Go~#LhJ)NQ5>DQn+p$%>vpDqJS5?9>K%i#R7q4i_owxEAiYK zC;&7YhyskjP|qb$+%___;s1hVNr>yF3USDa3KNJiv;;*~5-GImY2Cz*u{w7_MK~;k zG|PsXghFDF!cn^vMHYB(JnmyTiDo5UqCH-SXdZffbifzm;xYoj7xR?uMO_+jYFoCK zv3)?6{49`pn&nuQ_ITVZ4c&g32A()Vz8H%81F^FGUQ@xl3#PA{$JujEQwSZ3h0B#I z?TKD=u(V1mWT6iPC^`Kdq$H=XNTy1!m31<(u?UK^nIyubS15N8X6bP|15MPNz}ebB zLot_=Z^6MUi{DuJ{v&?<2E01)rPNAEs3i~{nGEHG!#Ja*SQzHtH7k5uGlt4=JlmXQ zWvt?d%3wwsrZ(}|ouU5_31U-yNNkSo7#}$Uy3XCV<i4+%#e^w)2xnLgfi z_oqqa#n-ogt5LPHsix*zSGqo2+|+N;4&Bxdcfz{VQPKNqWCEW4bJxQB=*n-iZZTYV!;rT;HhYr-|7GJ*kk;cDT5?`%0Tm&84UfMqX&FSSA&`&EDr=p$i z59(eM^Ly)a@A=MmSI?Z8|12``@kzJ->*f=Iv5%fRJJ&S1kQ(9MzGmwA{l0Une?R2> O&_Zq9;!MlKqyGRJNo=wzs=Y zF_{=)iwg{bF$N?VAY?KH5=h)KSVqK%$R7}gM&(yDhD@0V8W1PG-tI0#2NGhFwy&?B z?~l*-`+4s*EvlYBu3%b$!{Hd`_jwni_XKp0&Cf&6x{Kp@^cti4mYHa7l6{YIyt{R( z!;#mj1VdIRus{&CxD!ZP7&=pN9ibhL^0_G;h^wK6g<(WdJ@`P^5gbz_55ANQPyxLX zMipO!0hcsX2gQcfA}`@{=V0Y20Xc|63t*{uOf`j+2T%JI(Ab_PaV!n7R(tRYJ0KPc zEW#=^17e($CPa#&FphVIDY+~RdFok=p%|K^8IooRh87rBpjj+);V7OV$--jqbD3!9 z%Y#QPOBYBonM^v9E~jQhNSfz)l43}PArOKv>s1S+2-TdK_27l3Xehd+XewrV1Ys>< zd2p2L5Q(^+bE}$}LZOn8DWH?Ild?&rfs&ZR=?Np24lao#jKMfmEfZns99EBNmS#q^ zJGjpMzAXSMZXl40F=8(9crJu#Rn;LHnSzXnHiPv#Bo{+dOBf=oszYhcwAtuFr2&DZ z89_~pWm~lMySBOF&J{2j6&q}F6|zInVM`RfdMNb zs9N_RDDqC}o1pIQ$5%qLIixf4pAt;}8@8*WW~QgmR&5V+ zrv&=Qoik8Hl`_yNGV6tF7aWdJs^41?EN)G-R;ZIICVN+MC(DjCdRs5Pb;42mQ(*F# zDHGOzRdu}gnSE{FKGZZxfAfjPv3lO2eQVeIW@-n1zI6H0m1~j04O^rI{)5-sYX;lT zJ@0*|diUO=7cN{W((_*JI{epfYrdO47_I5qTvXWf)Hc^j@5Oby4xgH4J^A>Fr#Ewt zCA#ymiDJ2L)8+B!Ww#*ob?!KRYR(r|=WcJ@PON?H*4ID8>T1Is^GjNMv7NOqf4aY~ zxvlu)&OaK?PA%WF@%@JfDnsXA>RGHtTcY2)zy8vrRCAS zhIxCIe=|MQ|K-`U6VA`r_|e3jmp*SgxZ?PM8H01$+uP3cb9o;W>=+zeI-73poIbks z`pUk9l;qaDa-_Ha#-G~2?{zC0_a6GBIJ)M?lHOlm9NjTHxaC~ld$%6kwZHpj{}d)< PAO8NTYVU{hR=xf=TWsIe literal 0 HcmV?d00001 diff --git a/swing/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java index f3bdcd413..76190fbc1 100644 --- a/swing/src/net/sf/openrocket/gui/util/Icons.java +++ b/swing/src/net/sf/openrocket/gui/util/Icons.java @@ -94,8 +94,11 @@ public class Icons { public static final Icon FAVORITE = loadImageIcon("pix/icons/star_gold.png", "Favorite"); public static final Icon CG_OVERRIDE = loadImageIcon("pix/icons/cg-override.png", "CG Override"); + public static final Icon CG_OVERRIDE_SUBCOMPONENT = loadImageIcon("pix/icons/cg-override-subcomponent.png", "CG Override Subcomponent"); public static final Icon CD_OVERRIDE = loadImageIcon("pix/icons/cd-override.png", "CD Override"); + public static final Icon CD_OVERRIDE_SUBCOMPONENT = loadImageIcon("pix/icons/cd-override-subcomponent.png", "CD Override Subcomponent"); public static final Icon MASS_OVERRIDE = loadImageIcon("pix/icons/mass-override.png", "Mass Override"); + public static final Icon MASS_OVERRIDE_SUBCOMPONENT = loadImageIcon("pix/icons/mass-override-subcomponent.png", "Mass Override Subcomponent"); // MANUFACTURERS ICONS public static final Icon RASAERO_ICON = loadImageIcon("pix/icons/RASAero_16.png", "RASAero Icon");