From 685a1b0342dd68f071ec1af806be3d344fd2ab17 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 16 Aug 2022 22:23:43 +0200
Subject: [PATCH] Add icons to buttons

---
 core/resources/pix/icons/down.png             | Bin 912 -> 1863 bytes
 core/resources/pix/icons/up.png               | Bin 906 -> 1879 bytes
 .../FlightConfigurationId.java                |   3 +-
 .../sf/openrocket/gui/main/BasicFrame.java    |  17 +++++++---
 .../sf/openrocket/gui/main/RocketActions.java |  30 ++++++++++++++++++
 .../openrocket/gui/main/SimulationPanel.java  |  10 +++---
 .../src/net/sf/openrocket/gui/util/Icons.java |   1 +
 7 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/core/resources/pix/icons/down.png b/core/resources/pix/icons/down.png
index f3bc4cd0932ce493d38a058dabf802a9c111277e..29cc3aa67be14416645f573069e72d1db76a9a42 100644
GIT binary patch
literal 1863
zcmbVNeQeZZ81JUcu{onr6c*90hY4T3_U+y6uFZ~R?xx$^&260H^bf+@_U&D_>xXT3
zcbgdJB1QuQg}*>t03}93P=qN9!u(9+4<QC3agjt4A~7ZdHAn)}`Sx~qP93<=r0v`G
z_xzsU^YK1?wWIy<s*36gf*`6|nj>BKez$v;m*MNfzfD1Wn{PHhZ4*T0z3y2;?AW=G
zAm)9h#^O#q+9pVb=7q8$B5zhRF`6Li>a!-4dXYnlD52_M>eA6Mid5w=wI&c{qh=#Y
zs?7ryT0PJnlLmSvUZ(0-k#$)C6KKeRWL8V*wvY`|IbH#;-Pa67<{(aQm}+nxlJRH<
z*=SgZ40-`Au`Ejld9TPSArbNHN|IwazyOW`0h$8>7Z5;z%pVl?XUU4t6?rW04L^mc
zq~n+Z!(=iUZ^q{}tONsio@ZE&;W!#2XuDr`V3yWxPk|wVY{^nhM>TZPWrU*9=Y%P&
zbvg*mEYj+BK2bPjOct69@Um`DIiM^Rab};D$~l)M2BnaObjQY6P{f)^!!hinaRch&
z=YKfB$&E&fK4#UTX+;;d)0D<x<P$P0+K%;`i0MMM(Pv4hDUD@%+-OXp(L&HMte9b>
z3Z?2ONG3U-mm`-(p`_|=5X)wmpa^tOn8J1AXco{u5Cgmr@C$x!1q%e0orXpYSylRH
zLPIpDjd3i-2>?U6zoEEoWaz;E1<R747?uWc$f^bth%xm9MHUk&G#V+x!j7>zUrt3d
zDzxaf19b_tM8Xt~+N-Lv5DbX5Fc3mCtN0b#@0WQx1Ok9YK9Peyf2|}2#e#jrkow%(
z7VKqguPCAjMLs|WfsdvAKoqe(QfMUC`T#^e;1`SjpR`oGyI|^;dE7ncHigiv+PGZ(
z`8}~3J)2*pR5I5G0+ihT4pWj_SR_;V*Xk@8m|FzXw3#Hrq&F$|G|V;>Cj%|ikiglR
zLqjn)l5fNG&Bf2HeE$_cYXjbz_<U-mB-9fKk4%Pg!(rUfGF=$v-!;p9n=yt8a6H@G
zWpS+HhvHyHI;OVp*lnw?Yaob{6)lm5SZMR!ZO7V68}8dM29~6+m#!K*r{7UC?qzmW
zZFqCud+Si+;r9<7+<pF@wq1dmj(0)z^2%3EH&4#rQ-0KUNZQ>iAKG8@+`jFj_VMq1
zqn`aE7ruGM8|;X8FJ15k{mImKAHLZ7(V9QTZd>+9S1a+tl)UlSTioEKf%f&oRq>~u
z@DO*_Q$wRCZkN;K;ZJuwI7s?mYE6{hPc2#d(B7)$lM_E&>k;u>CdSXL9obqzOn!cv
zyDEL{KU4R7vZC{gw6^WaS09`&ufB48>g;Qq$h&$Lml+lOw{eXfzkGS$kwqtyXRZ@e
z<>1f!9((<Xm2BI^mrsqtUk@xCDLXRk*?RQ>;+MBahdmP~^+lT(Y+*`HUHnNQUjKc2
r>zB&Mn>LR9cp>yoX?N#D=bxpM*M_<m_nh77{_0wq+9L-ZT{rX>F~M&X

delta 889
zcmV-<1BU#^4v+_sB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0009bNkl<Zc-mt8|NlP&B>*6RSU?1${&XP02o_*sVyHFJ6l;<e
z<^22a&tH%%P>hk`)yJRAC$GGo{_o$vEU-eLz5g#{FaQJ)*na?qU;h{we*OU)!phF9
z*PLa-;9)Jt{N?w5hJSzmG4OFPGn~Hmior2@z2?{Nf1y@GECdK3hzq!w8UBN8`v(^L
z$;JGi;rL4ihJ|Ms7`}h`!QiFF%%I5uvVh?i!+)stY|LQA00G1Va}EO&Bg|WWKmu<*
zGca6v@}1$z!+&oKk6wRg06HD0A7ll{?f)TqfB+zXz%Kaz@4qC&_dg;GfBygc`STC&
zuirp*|Nb&C{`}7H|JQe*k?ahAfMVai{NiNz_D2oqRW=4rmXAQKj{yP*YyclG`!-!2
zF<GFZ?~FhG2#fHuG2Hz2li|nL?+ibI`1{xY3_M({41YF85*A<n{M*aH#>{!++2_|l
zt(pJ<1U7)<Kci4vk+ra{svyI!-+vgyxEUFa9{$4c>-$e2{=xA6!#@T|K{19I&DQLk
zY>YB*KmTC}DcTPX1b_enhrz3tpOdF8z4Tj<myKcLwSNrJOFl7dyYz*D5$JrDKR+1`
zUVg{m)qik_p>yS324P+nhS{rbGCX+jF%zU0Ab=o&$i{qN&HC%}mTkGo;Hbt547e{0
zx1WAx`1kV%!{1*&8SX#*#BlQR8-`#jQHDe3-!d#(duuHNGt+vIR)7Fvf~KB7e;Jt?
z3OkSAVgL1op}~Wj;rr+B3}1lw>z8i~AK!gpsDFu+V=&baU?}Q2`}F&-Ka~vZOg}+d
z0RjjSja)1*UOoF<nBI8om!AnQL!uQo!?TxP7@j@*#1LjJ%uo`h#8BLKp5fNbHw_G&
zthZs&2oOLl@I(y~U}xE~WAB5GlAbeleZ|HMZ-F+yeapcxt5Aobcf~D+Wt;9!We{MW
z!*YO>eE<RoVgM`+F#{Q#EcFv-Uy@>DWlCv`*91!aXPCJ94nxDlb88tmSaKQA@*Y3{
zv0!8`P>SSW%IcnT`NffouS(cinOP4Ue>MeZOC?YaBkKYL5F@4886dy_0S`NUs78Az
P00000NkvXXu0mjfm?)`x

diff --git a/core/resources/pix/icons/up.png b/core/resources/pix/icons/up.png
index 184c118b63424218e82ea1a7d8acf4aa7f4741dc..b5b342aba7b9323c401d4d858b9e4ce1dc262a9c 100644
GIT binary patch
literal 1879
zcmbVN4{X#_81Lp#*<4(h2F8??E|5*=wS9NDyVl*v*bVM*x6N_LLHM(G?Yp~XcWrIE
z?KWJDix@$cm|+kmpkWvd0a0U!#^8_`Bw>a~gkZoWYC;APO;|FrM3}F)yL0Nmg{Hl}
zw!iQ9{k}i%yB*Dqs|)iN<`V=_==XVB@V&^o9(@@9mW@q9e4DHJHW&m^P;6Z}#K8Uq
z1Tp8d91NMEK!YHv2^*BuFtQ~R8b%XD^@^kh#WrM;VHA}W5B0~FLlh}X9%{Wazy`EB
z6q9}3I$GP^7!<qPL|&p+)R5Il0TU#U3CUz4t{6hnL#22HytZC56q$mUZ62!Da!7^(
z&19XbBhqE#Xpv=E(#6}tY{VT#JiD9(EZ`UpFr1SHoB*5x=Oohyh5hMLL}>A@N_)dk
z9x7&<n!qrfot?H$yG_-j49D|4!vY2X8Y5_<OEF=RR*dotgBKa1E^DT&Dx}2-!)m+f
zp|IAeAQD=ZRx#3v!YN~tP-8e7YXy}8N@5nLwd?Veb4g@S93_xq8W_uEv06+uRU@X}
zgF5^99}aMG1A(lM8MP!5Sr>*`-+{wOCuByn5$w_s(}E1OT^CV(2bNiGMWYFII)bLE
z2URtmDOGbuG70Q9Kvo2xC@WSFmD5a+7n;aJ;kp5u<!Cz><aoj95FB6`%Lyzy1r4Z@
z9O;@4b<<o`5CFkCoy%D8Hx##x1WowAU`Z4rs-A#2WH|w&h|!cNMP?Hz)Twb*$BwZ&
zdrCzhAovx-go=p#UJr$%w#l+2xE&H#B|$e0c*#yXfaIdxEDvc1L@p=b9K2KFGxlCp
zY`1Egv6rxYn6tBCz`1Bvask>QNh}SeFrXpJxx*3%Sk~pp*f;4i-d!;Mz&zHTvzkKi
z$p$W0S9(vZMK7jTahXi@fdECTzde*_6&6WU`n5bm24)w*6m4e=Vbc4QdkSW#5wjEO
zs5XkTHH(H~?j_%V9rqVMyYl^4{EQ9wVB*uM6=P6|B0Mq~$_j_EM$1%Tn19zS^=;Z1
z%E0k#vzFPhiXXCr87Y`r$7A>PADVU&M9#B*Z*9=scdY;9nune*+CH?oZ=<jGKw!()
zr=Q%O=NC!~3YN$%8$y-6vGNLP<7mN$iI1QAwRrE+>s4fa{+`=&q$NMTd-a{R-G!0$
zmwfwwAK|0dhKIS&F6}D57K*om%6;e8)pe~J+)xsDr6_lC-o&PL#}CY}ICwO7^yE*E
zyjnCgpQw2IM)#dVr{22MFc{)PXHGob({phr>>Hgo_QjEr&zE1gKJKgBQRb`J<iB$B
zR`>0vO26IJe_nZGc)$Z*`=;=TgU8SA9hfM&T(gB(aAU#d@J;iBuS#n6jMLRkxAd{R
zQ)1cfVC%V0FA$ec40^WyylozFZcXW($;B%VJ)XPumu=6?1xMfe{^(<k>ueV%e)C=J
zV9%B<qWiy#tX}`-zUJZg`;Xn7eBtiWPsTeY7i~ElxzgBB^JnYfp);4uU&`SYzC1S4
SbEMGv>+{z)dOup(+WQxKe{}Ky

delta 883
zcmV-(1C0FF4vGhmB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0009VNkl<Zc-mt8|NlP&B>*6RSU?0LV;7q6e?|s|e<dcyQgv)>
zOf1KaKj{IgYGPnu`i-LMe;ETn05L&~0aC0?Ad`Tce?a`ZJAW_Nr0d|mFrNMU!#S#|
ztZIPb(;;$Ttx(Ls01!Z67cj6h12u#6{$*hJ`?okP)uedh1ZRd-cbOPI{a|2dZMA3k
z`-dU9v+L+fpew2wI9P#}GJ>@N1P}|{KoI!*$KJtNxoP?o7lu{0nHc7s{m=0I>ko$S
z@Bc8gwOcXVxqth<Z0*|X7Z_OCRx_|d3;+lqh!>cFoL_$g1VwnJ%$n@Nb>RaG!;%aC
z894s^V&MG$gJI#(PYmnMd}NqD*^Wh4L8zVK`)^5DH~<6?)BpxXrvLw{y1MLic$GvL
zS`RTW{P^*k;m?mB41d0VXZZW`2SerZrwk9i{%4px!GBJfot3$T;n!cV>j44?V!-!5
zre6LUxycE7414b|FbJ~zW)NZi&hYi?cZP4De}ehaybKJBcRge9bdzQXi&T#X8sG}j
z3J?H60KWeK|Ns907bcj~$IR#d_xb$)^!NM!|NHm<l)UW!FoE9xCv(&Pah%xy@$BsX
z;pFT8?|<*@|I^py{~#@#;s5{t00Ic?j6a+#9Nja{ef{(M?+=EbfB8CU%~`oQ*dYN3
z#B9tg46ok&WGHJp^XL2TzaKd`nK^#4K^zYdKwtyje)!?GZpBq0hF`!?V`8k!&(I5D
z0BZXA<r~A#uiqH{|6yl%{qZNm`Ym@4Fns${#DBod#Ks`R@e!mKAb=nN!Nhp~A2-{5
z1}<R8b25Kq1xC?VU;_B~@hijkPv026eC7nI;bGtr<NWmH)33`6e}H<JA<+mBKrDzv
z4G{oFDGL*j$pK7t0<3=+xY+(Ma5Db`Chq^B*kWN|V+7Ig!~+mOED$CziLyeo01G4A
zFKl44jCBxUuvTGb`1AV@gQy@I!@Xxfudo1B0bR$)hDdw>0R%CC7vYd!ObmCM=Urq_
zmgN5X?;j-X1GO+bdGnq52Mg0f25uIloWQ^U5I~HSW@mr^0|3XRFs?|=gJ%E$002ov
JPDHLkV1jAsv+V!?

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
index bea02944f..cdf63e201 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
@@ -83,12 +83,11 @@ public final class FlightConfigurationId implements Comparable<FlightConfigurati
 		
 	}
 
-	//extracted this method because maybe, just maybe, this info could be used somewhere else
 	/**
 	 * gets if the id is the default
 	 * @return	if the id is default
 	 */
-	private boolean isDefaultId() {
+	public boolean isDefaultId() {
 		return this.key == FlightConfigurationId.DEFAULT_VALUE_UUID;
 	}
 	
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index e9c10880e..eee8d5dcb 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -412,24 +412,31 @@ public class BasicFrame extends JFrame {
 
 
 		// Buttons
-		JButton button = new SelectColorButton(actions.getMoveUpAction());
+		JButton button = new SelectColorButton();
+		button.setHorizontalAlignment(SwingConstants.LEFT);
+		RocketActions.tieActionToButton(button, actions.getMoveUpAction());
 		panel.add(button, "sizegroup buttons, aligny 65%");
 
-		button = new SelectColorButton(actions.getMoveDownAction());
+		button = new SelectColorButton();
+		button.setHorizontalAlignment(SwingConstants.LEFT);
+		RocketActions.tieActionToButton(button, actions.getMoveDownAction());
 		panel.add(button, "sizegroup buttons, aligny 0%");
 
 		button = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(button, actions.getEditAction());
+		button.setHorizontalAlignment(SwingConstants.LEFT);
+		RocketActions.tieActionToButton(button, actions.getEditAction());
 		button.setMnemonic(0);
 		panel.add(button, "sizegroup buttons, gaptop 20%");
 
 		button = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(button, actions.getDuplicateAction());
+		button.setHorizontalAlignment(SwingConstants.LEFT);
+		RocketActions.tieActionToButton(button, actions.getDuplicateAction());
 		button.setMnemonic(0);
 		panel.add(button, "sizegroup buttons");
 
 		button = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(button, actions.getDeleteAction());
+		button.setHorizontalAlignment(SwingConstants.LEFT);
+		RocketActions.tieActionToButton(button, actions.getDeleteAction());
 		button.setMnemonic(0);
 		panel.add(button, "sizegroup buttons");
 
diff --git a/swing/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
index 15ed1d597..25a4f4f63 100644
--- a/swing/src/net/sf/openrocket/gui/main/RocketActions.java
+++ b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
@@ -219,6 +219,34 @@ public class RocketActions {
 		button.setAction(action);
 		button.setIcon(null);
 	}
+
+	/**
+	 * Tie an action to a JButton, without using the text of the action for the button.
+	 *
+	 * For any smartass that wants to know why you don't just initialize the JButton with the action:
+	 * this causes a bug where the text of the icon becomes much smaller than is intended.
+	 *
+	 * @param button button to tie the action to
+	 * @param action action to tie to the button
+	 * @param text text to display on the button
+	 */
+	public static void tieActionToButton(JButton button, Action action, String text) {
+		button.setAction(action);
+		button.setText(text);
+	}
+
+	/**
+	 * Tie an action to a JButton.
+	 *
+	 * For any smartass that wants to know why you don't just initialize the JButton with the action:
+	 * this causes a bug where the text of the icon becomes much smaller than is intended.
+	 *
+	 * @param button button to tie the action to
+	 * @param action action to tie to the button
+	 */
+	public static void tieActionToButton(JButton button, Action action) {
+		button.setAction(action);
+	}
 	
 	
 	////////  Helper methods for the actions
@@ -1061,6 +1089,7 @@ public class RocketActions {
 		public MoveUpAction() {
 			//// Move up
 			this.putValue(NAME, trans.get("RocketActions.MoveUpAct.Moveup"));
+			this.putValue(SMALL_ICON, Icons.UP);
 			//// Move this component upwards.
 			this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.MoveUpAct.ttip.Moveup"));
 			clipboardChanged();
@@ -1136,6 +1165,7 @@ public class RocketActions {
 		public MoveDownAction() {
 			//// Move down
 			this.putValue(NAME, trans.get("RocketActions.MoveDownAct.Movedown"));
+			this.putValue(SMALL_ICON, Icons.DOWN);
 			//// Move this component downwards.
 			this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.MoveDownAct.ttip.Movedown"));
 			clipboardChanged();
diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index cd46a4880..6b5316c6b 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -125,31 +125,31 @@ public class SimulationPanel extends JPanel {
 
 		//// New simulation button
 		JButton newButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(newButton, newSimulationAction, trans.get("simpanel.but.newsimulation"));
+		RocketActions.tieActionToButton(newButton, newSimulationAction, trans.get("simpanel.but.newsimulation"));
 		newButton.setToolTipText(trans.get("simpanel.but.ttip.newsimulation"));
 		this.add(newButton, "skip 1, gapright para");
 
 		//// Edit simulation button
 		editButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(editButton, editSimulationAction, trans.get("simpanel.but.editsimulation"));
+		RocketActions.tieActionToButton(editButton, editSimulationAction, trans.get("simpanel.but.editsimulation"));
 		editButton.setToolTipText(trans.get("simpanel.but.ttip.editsim"));
 		this.add(editButton, "gapright para");
 
 		//// Run simulations
 		runButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(runButton, runSimulationAction, trans.get("simpanel.but.runsimulations"));
+		RocketActions.tieActionToButton(runButton, runSimulationAction, trans.get("simpanel.but.runsimulations"));
 		runButton.setToolTipText(trans.get("simpanel.but.ttip.runsimu"));
 		this.add(runButton, "gapright para");
 
 		//// Delete simulations button
 		deleteButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(deleteButton, deleteSimulationAction, trans.get("simpanel.but.deletesimulations"));
+		RocketActions.tieActionToButton(deleteButton, deleteSimulationAction, trans.get("simpanel.but.deletesimulations"));
 		deleteButton.setToolTipText(trans.get("simpanel.but.ttip.deletesim"));
 		this.add(deleteButton, "gapright para");
 
 		//// Plot / export button
 		plotButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(plotButton, plotSimulationAction, trans.get("simpanel.but.plotexport"));
+		RocketActions.tieActionToButton(plotButton, plotSimulationAction, trans.get("simpanel.but.plotexport"));
 		this.add(plotButton, "wrap para");
 
 
diff --git a/swing/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java
index 5478bff00..9f133a222 100644
--- a/swing/src/net/sf/openrocket/gui/util/Icons.java
+++ b/swing/src/net/sf/openrocket/gui/util/Icons.java
@@ -59,6 +59,7 @@ public class Icons {
 	public static final Icon EDIT_UNDO = loadImageIcon("pix/icons/edit-undo.png", trans.get("Icons.Undo"));
 	public static final Icon EDIT_REDO = loadImageIcon("pix/icons/edit-redo.png", trans.get("Icons.Redo"));
 	public static final Icon EDIT_EDIT = loadImageIcon("pix/icons/edit-edit.png", "Edit");
+	public static final Icon EDIT_RENAME = loadImageIcon("pix/icons/edit-rename.png", "Rename");
 	public static final Icon EDIT_CUT = loadImageIcon("pix/icons/edit-cut.png", "Cut");
 	public static final Icon EDIT_COPY = loadImageIcon("pix/icons/edit-copy.png", "Copy");
 	public static final Icon EDIT_PASTE = loadImageIcon("pix/icons/edit-paste.png", "Paste");