From 927ea2aaca9e7cf887d0851a957a41f36267da93 Mon Sep 17 00:00:00 2001 From: Charles <46334090+charlestian23@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:02:18 -0400 Subject: [PATCH 1/5] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cb3711be1..b6c68de5f 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,6 @@ An example for the Battleship puzzle demonstrates the proper format for XML file ``` Element values are dependent on the type of `edu.rpi.legup.puzzle`. + +## Licensing +Some of the icons used in Legup were taken from or derived from the icons found on https://fonts.google.com/icons, which is licensed under the [Apache-2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html). From 340f3166ce45dc26829c6e7abdff88acfddd23fe Mon Sep 17 00:00:00 2001 From: charlestian23 Date: Tue, 19 Jul 2022 16:05:25 -0400 Subject: [PATCH 2/5] New home screen icons New home screen icons created. new_puzzle_file.tif provided in case new_puzzle_file.png wants to be modified in the future. --- src/main/java/edu/rpi/legup/ui/HomePanel.java | 6 +++--- .../resources/edu/rpi/legup/homepanel/edit.png | Bin 2039 -> 0 bytes .../edu/rpi/legup/homepanel/newpuzzle.png | Bin 1014 -> 0 bytes .../edu/rpi/legup/homepanel/openproof.png | Bin 1615 -> 0 bytes .../images/Legup/homepanel/new_puzzle_file.png | Bin 0 -> 2271 bytes .../images/Legup/homepanel/new_puzzle_file.tif | Bin 0 -> 15380 bytes .../legup/images/Legup/homepanel/proof_file.png | Bin 0 -> 784 bytes .../images/Legup/homepanel/puzzle_file.png | Bin 0 -> 1424 bytes 8 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/edu/rpi/legup/homepanel/edit.png delete mode 100644 src/main/resources/edu/rpi/legup/homepanel/newpuzzle.png delete mode 100644 src/main/resources/edu/rpi/legup/homepanel/openproof.png create mode 100644 src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png create mode 100644 src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.tif create mode 100644 src/main/resources/edu/rpi/legup/images/Legup/homepanel/proof_file.png create mode 100644 src/main/resources/edu/rpi/legup/images/Legup/homepanel/puzzle_file.png diff --git a/src/main/java/edu/rpi/legup/ui/HomePanel.java b/src/main/java/edu/rpi/legup/ui/HomePanel.java index 48ccea450..2916e8413 100644 --- a/src/main/java/edu/rpi/legup/ui/HomePanel.java +++ b/src/main/java/edu/rpi/legup/ui/HomePanel.java @@ -69,7 +69,7 @@ private void initButtons() { } }; - ImageIcon button0Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/openproof.png"); + ImageIcon button0Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/proof_file.png"); this.buttons[0].setIcon(resizeButtonIcon(button0Icon, this.buttonSize, this.buttonSize)); this.buttons[0].setHorizontalTextPosition(AbstractButton.CENTER); this.buttons[0].setVerticalTextPosition(AbstractButton.BOTTOM); @@ -82,7 +82,7 @@ private void initButtons() { setMaximumSize(getSize()); } }; - ImageIcon button1Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/edit.png"); + ImageIcon button1Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png"); this.buttons[1].setIcon(resizeButtonIcon(button1Icon, this.buttonSize, this.buttonSize)); this.buttons[1].setHorizontalTextPosition(AbstractButton.CENTER); this.buttons[1].setVerticalTextPosition(AbstractButton.BOTTOM); @@ -95,7 +95,7 @@ private void initButtons() { setMaximumSize(getSize()); } }; - ImageIcon button2Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/edit.png"); // PLACEHOLDER + ImageIcon button2Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/puzzle_file.png"); this.buttons[2].setIcon(resizeButtonIcon(button2Icon, this.buttonSize, this.buttonSize)); this.buttons[2].setHorizontalTextPosition(AbstractButton.CENTER); this.buttons[2].setVerticalTextPosition(AbstractButton.BOTTOM); diff --git a/src/main/resources/edu/rpi/legup/homepanel/edit.png b/src/main/resources/edu/rpi/legup/homepanel/edit.png deleted file mode 100644 index af7cb9d4ab2f8193a7b7770056b72efa07ed97eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2039 zcmb_ddo-JA8jlEq(v(Of?t+>TH13y-x<+%PTDM3lO!6hJ)fSyPrnRjoZTVu2T{TLL zZVfssMYO_JTN1utj#AYs)4Ii0*D7UtT-s9mWoCQ!|K0uLd7txpp7(t&zw^G&TXZx$ zR8NPfgFqnk=!b$MVLhM{G!kB|eY^)@rFJ?pG!W4|Y`O>oRC2)K00cr(s=Lk8fU$PQ zA@*qm0%xldHF~7YDgvP;q6Y^==OipY8O^Wz5*s}Fez*3AYOvZoMdC};^+C?vj;7c9KQ08%>}_`9`>1)8Q=Xlcoa}vOD_ZFJ!KDFk8b8B{)^+#{LS8r`euYPI1KSftUs~IEWD^LVk*2v#nWhkOccf(YMx5{H_ zf>ZMn;x&Waa#fmXc?}jlJpbMd(ECJERlV~^-7hd4C@%Yo#@5AxvPy8>u=yr!gD@RK zGMwG3DxGQa{ZUevQOj`UbV8hCMKNdZ!q2a|!>IRH5IVCD|Gxj171VQpOK+C*fGG z4P}{s5-o~3VuV+akP95gfg`n)k|I|udO><#Vhr^WbWme)t*n>+3OB6uVUVdT5>mdy zqXT(M?rmP&N-8fwlr#Yk@o-HrFtjUBC?@V2&9?a&q9X!G=YJ4PyL3c5=}6Pit?!5krF zfq-ez=YGZwW}|aIiBcKY|Ki_zoeKe2!(@AmIA!BbraECP&&yxPjfk=+H5sVX>{HW0 zEmdt6sG25be@%+}<;Tl^*K}zZZT*OpsSo8uJ6Z9GdR@*KYVS9VuMBih`&#F5OsXPS zYe6$j@H-eJC;tZwVfz;}bx;AVi)PBuDhZ2mkvpc5pKS8psPi(Bje65b+sNtlLv3c{ zg}mck&|(Sxj9q#$@<^I)p1yx#T)cZ5{5s_We&g#=S?362zN-r2WGSnP(q5|PfU8rbQsS5b#oCxX~&GSuqs&Rom zvA5%Dc8huKRo$V=4SBaYzh)|J2Y9gB4>#7e?u4s*xb@ZyFl05dwq*orD$)T9#@6<~ zv%@@O-QP4w;30(|WOA?vWLPFha^QiJjw~yN9FDPgV^<=`=6*fa)$}}IO#nOm?%=`x zG=YcYClGSgKvpNb1s)vO(QDF0;beKh1B@v@Uf7dw93{rL;h0!7S^s@aM2VTwOoskyPveat({2coIHC3{;U!7knrH< IKyLoO0FR!HdH?_b diff --git a/src/main/resources/edu/rpi/legup/homepanel/newpuzzle.png b/src/main/resources/edu/rpi/legup/homepanel/newpuzzle.png deleted file mode 100644 index 24ebfd346f1fb65207ea17759fee1ace388a6a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)K$^jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85qP=L734qNaX_q19P{hi(^Pd+}leB6J;C)m<^xK|MK&&fX~)G zW|a+d-v0XO(70iRfSBl^MNSbR9Nk=rfr>g>Ev~Ip7u;vPX8!vrUoW?mD!g9K`P$){ zzwoujHS^WhFh|<^MzC+Ho3(*2<*!Mi?1^8QhpZ+HPKCGr*QeCU)d%%mQD3wDiAU|B zD(_JymT>r99iMgL{x7p36t&>ww?$p<+6<&FEZc#d4A%YY0Y9r`?G?6cb>P2 zZ}_!)$J6DH!Yf$g*KMuR+U@sv*Zh{V_mAqXUNif6UG0wV>XWo{SW1P3He*hX&BXiCA_)g_H7RPtac*8Kw;!vmf$B%q(`41(zTNLu% zmwD)NjQ8N8?|OMR7ycED$ZY@i`bS-RnZu`7%3q!pTo>E>JbAuuRq>AO?zrtY_F9|# zDtO;;Z1TpFVte`S>~LKl`s|YOm#D(84abZ(9v0hccW1Zj`tzIr=jX{^s8A5QvFLj5 z?d>m2U)Eclm$`5v;aJ15%O8F*_VT3hWSDfacV`Jr=DNzj#^MGv)J;#wtTLup);%&7%ng7 zy%)M--JvV_ZO7+6j#;=%Y%}*&OSadt`96PsrSz9U1#)M9Si#uaDlrFW>sP6Lnjzd* zx6X)NaW3^zE8Nv_cr_6^Zj}|SwTv+=pOE7GZ9NFko(MaHT%ai z`zc&ktv@t5l{!5)vRM@n+q%+wkKxDHlm9O?U$9Z;G51x@xj-L*LZr^v=AF!QkXwP? z`FSHDF!#{X^$$+(e^>(bI#A&{#$KCeycs4BFLD2PU}UEqay_YRp_Te?_JFg=aSLy? zSD!C@S6XAgU?W#ByU8!@q!*!65zx?a^gT_{9JeTx8xCAlP=k@(YcD{@h zgJg%tffZGdh;>e3pJ%z?V()EslX-2|`7=}uGaVK;AN-{kk>H@*EXge8EB9x5F);ao zlUm-LeXi?0Kb(KCH~P!6!n@E!2}yvj68?67+r1;T{oCP~>GXC#%df#kdnQCc0zjf(@WB$jt-Q8jPvaP=3>Aj=6_MEfJ9~|3r`=7d4Eo=P0 zkUw1SA59D0cXa>JSMC-I5551ywJ+v${kwx4=YSdg_;4)L;3f5g@9*mwEU!g>cX62q QsxlZnUHx3vIVCg!0LJeEMgRZ+ diff --git a/src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png b/src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png new file mode 100644 index 0000000000000000000000000000000000000000..8d55c14c9356069be9d5c0f0e58c897fa1b48e3b GIT binary patch literal 2271 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 JZ`;VW{ttS!#4`W@ literal 0 HcmV?d00001 diff --git a/src/main/resources/edu/rpi/legup/images/Legup/homepanel/proof_file.png b/src/main/resources/edu/rpi/legup/images/Legup/homepanel/proof_file.png new file mode 100644 index 0000000000000000000000000000000000000000..13da1b285f6b7e6a8f59eab820c415ad7e44f9a0 GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85k7JL734vVty3^1JhDZ7srr_xVLkCyF?NNT&fqh2gZEg_>1G7 zL*S9aXAT9gU>BVJYKGvKMdE=`2Btqhm)cb9Zt8r~ZrhYFx5x09L~@VeGlsa<_lNQy z_J7!TWBbF{4@!R|{&8Jp4}AGa@WVs^1=A(w0aA>CaW$! zP6l`P0QQTHj1O*byppieVUUq@lyzcfYj~`*Lixo7hJp~5QU+NWhQ7`P$1Xo)e9*y> zWf7~ukR$KdyR4g~VXg9tgCz?YHsrFHPSX=(*w(Y4?Gh{Vfil4>9=kFaZfG@0d5H5d z+;$0g{NfQ~LN`a2#NK9x4Kk)(Rt|hwBBc#7S2UtTA9$4ikuJ8(5;@9v{d}s<4#&G? z$v_@h_7#KWioh$3MFERfFh5z~7RY|Wv3C*Qgk~vMSp{}vV-N~o%wwoncIkDG?}wgU zZ;usS(Wtu6czzi(3*U#5D;fx8Naj`ZulZt?ENrtlZ}&!^+um7ju;vTsVHSDJaMZ%V z5XRJzXE+~HHFqQDyuj^uBl@IV`K>&bDGkx~_(X zz3ez+S7Aev%mN8^jbl*e3{J+Vy$2p<{Qo?^^uf2HW%~|2;V7)OeD7@fPVNYIjT zzpCD=fsfMm99qpf-^sKn_2Z{qW_x({w`9HOdbG8-qBdDu;9>C(>yX9a0`b-riJ80k z|4%bl{8v%OU*Gm>g6E_4vnovW>mF|VdCnZ1xQ_WeE&0VA%)4}6RFL{)U@B(tboFyt I=akR{09%tv_5c6? literal 0 HcmV?d00001 diff --git a/src/main/resources/edu/rpi/legup/images/Legup/homepanel/puzzle_file.png b/src/main/resources/edu/rpi/legup/images/Legup/homepanel/puzzle_file.png new file mode 100644 index 0000000000000000000000000000000000000000..4ee4d30e5a1b4d858cf32082ae21b7d69ee850cb GIT binary patch literal 1424 zcmV;B1#kL^P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vG#Hvj-3HvuzPpLzfQ1tm#DK~#8N?VY<$ z?M4)axrB?jG*loVDg-1EAfP}z1k_ZB29RiwprD{g6$wQm0feAMJVc69zGdzy~qcOFBE?$xJGnI@)FSeFBRO$heFa4K2vZf9U4hWSXTV5;7&M1l9TYMf;-WW zNlL=k3hpFBCm9LfE4UNPc6WEPi;Ig^!JOQ&6p)03pA_85>4yB>axf=%EG0xQA$9>E zY6&R_0MSZFMF5CWLP`QabP|46a3>P001%ag6a|22B%~?;L?Iz%0U&q@sS5x>OX!0D z5Uhk>6x;!)CIAE}p-%!pa1#0^00bqWj{-n268b6t1RMhy)Q}a(jE5H=YwPK0Yo2T$&Vc zc6O#4jfUIcdxTlF(TD((larJ88c%aj^YJ~iYNHVWCU^u;<81*Liva$>Y6;li-_JHS zHZ+@?n;NQjc6PG4xw(A5t^lf+mzVXWsl6@6>+9>;_V#vmetuqCQVaqL|94Ck0q&*c zpjld4swE+L0gH=^d2?txuBNeDbL+Y_jRBsn>O2yX7r<@j;x^H(%isjy>Bvm)O)mtX zNp_>k>at~3Y6!qY^dlQ3z z!e34BUj?|h%Y3zs2=D~!p-Fb5?3%{Dy6UzmJ_R)O_byXAdpaWIf?I$jg3{>&*S4G zyFHB;78bJC*H;k`Q$#?=i9rB&P#O`?PPl{8h=6v&9h61{w3EWW71qTcaA+FOFYCa$ zcb;z)+`;t$oO|cNA8+Fht`B^!=sX`Q3U5m$49@u@MG$#Xa0i((4~k$iuJ}s99cYTY zQ;aEs3M4!$3hxgj0G@Up6~Q&%&bk5*&+imJD!3Dg30!L8PxImhH<;&qi9{liNF)-8 eL=tO;hW-J7X3KGRYA?(H0000 Date: Tue, 19 Jul 2022 16:45:57 -0400 Subject: [PATCH 3/5] Changed toolbar icons --- src/main/java/edu/rpi/legup/ui/LegupPanel.java | 2 ++ .../edu/rpi/legup/ui/ProofEditorPanel.java | 8 +++++++- .../edu/rpi/legup/ui/PuzzleEditorPanel.java | 8 +++++++- .../edu/rpi/legup/images/Legup/Check All.png | Bin 1063 -> 292 bytes .../edu/rpi/legup/images/Legup/Check.png | Bin 1063 -> 189 bytes .../edu/rpi/legup/images/Legup/Directions.png | Bin 1183 -> 479 bytes .../edu/rpi/legup/images/Legup/Hint.png | Bin 1328 -> 648 bytes .../edu/rpi/legup/images/Legup/Submit.png | Bin 2234 -> 268 bytes .../legup/images/Legup/homepanel/Check All.png | Bin 0 -> 292 bytes 9 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/edu/rpi/legup/images/Legup/homepanel/Check All.png diff --git a/src/main/java/edu/rpi/legup/ui/LegupPanel.java b/src/main/java/edu/rpi/legup/ui/LegupPanel.java index de5f70f76..5a1637c16 100644 --- a/src/main/java/edu/rpi/legup/ui/LegupPanel.java +++ b/src/main/java/edu/rpi/legup/ui/LegupPanel.java @@ -6,5 +6,7 @@ public abstract class LegupPanel extends JPanel { /** * Alerts panel that it will be going visible now */ + + protected final int TOOLBAR_ICON_SCALE = 40; public abstract void makeVisible(); } diff --git a/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java b/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java index ffeaa994b..187295887 100644 --- a/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java +++ b/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java @@ -404,7 +404,13 @@ private void setupToolBar() { for (int i = 0; i < ToolbarName.values().length; i++) { String toolBarName = ToolbarName.values()[i].toString(); URL resourceLocation = ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/Legup/" + toolBarName + ".png"); - JButton button = new JButton(toolBarName, new ImageIcon(resourceLocation)); + + // Scale the image icons down to make the buttons smaller + ImageIcon imageIcon = new ImageIcon(resourceLocation); + Image image = imageIcon.getImage(); + imageIcon = new ImageIcon(image.getScaledInstance(this.TOOLBAR_ICON_SCALE, this.TOOLBAR_ICON_SCALE, Image.SCALE_SMOOTH)); + + JButton button = new JButton(toolBarName, imageIcon); button.setFocusPainted(false); getToolBarButtons()[i] = button; } diff --git a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java index 92dd83df9..22e841c42 100644 --- a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java +++ b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java @@ -139,7 +139,13 @@ private void setupToolBar() { for (int i = 0; i < ToolbarName.values().length; i++) { String toolBarName = ToolbarName.values()[i].toString(); URL resourceLocation = ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/Legup/" + toolBarName + ".png"); - JButton button = new JButton(toolBarName, new ImageIcon(resourceLocation)); + + // Scale the image icons down to make the buttons smaller + ImageIcon imageIcon = new ImageIcon(resourceLocation); + Image image = imageIcon.getImage(); + imageIcon = new ImageIcon(image.getScaledInstance(this.TOOLBAR_ICON_SCALE, this.TOOLBAR_ICON_SCALE, Image.SCALE_SMOOTH)); + + JButton button = new JButton(toolBarName, imageIcon); button.setFocusPainted(false); getToolBarButtons()[i] = button; } diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Check All.png b/src/main/resources/edu/rpi/legup/images/Legup/Check All.png index a929f796f303ea71f3d2bbb684a866717eae1c2f..5db2ef3cc2ef868c84fb3f22b4d1b822474e8a37 100644 GIT binary patch literal 292 zcmV+<0o(qGP)MV|ajCyui2!Br!>;?F2!bZxx2*y+D#7 zfJ7pZd?6_ofodN+bmQO)5Hb&c0pW;V96UJ+g(nbBJcYsA0)r=3&j90am@rBXD;cl6HQ60U*;8ON@1Oil?qGy)_Mw z)+inoiWLX%Dn>PmmKU>LvF6}EQ*5};s$OyDzFJ$61{Lh4U=&5Ag4J_ug?%}Vf{8Z@ q_qU@I5%5ak;+0|_2QQIGek(8Mcsvy$$a3xg0000xW;ifk-+l!Y6;$40J37~)Eo(Kaya{rw@0bN_c<9!bWo_yfZW~Q=} zr9DbD0EKz6&bFOez$Z{}rXb-Vn_m%>kc(A27>M__Fv1S@c0_gCn*}90Ai_8^mash= zgH;0*O}=$+^mdi9JUnhfV@)_Wk#t?x`6NF0ZFLU%N4h&zrtXRE*rAxkc?hASU=e(M zDd`GZzEHmRUjcMVM((>~m*4SHu-yU}smIymxFsOs!$XPrzd5ZW5Q~APntGn2L@*ot z?c;~eyQQ^5@$S8$Kyc^H4F<^)Z|i2R=B!bd???3x7mP&k)rF)f2woZoDqSjO%Lr$QNgzDci7+&SD{xS#gN_UZuls0uYK* z5AKdKE?1Gwr_t8js6;}y)qOEO@wv;n-r3fIymbYh;Lw!-zWM1=UT{8ieBiGbw~R=m z_%b;&Yk7h|NQTwI96|vP4|jFwyIY&3PZuaSDsNbDhNJRUZ#(!HgAMt6567~m) z<5`fBLP#BBzohK!qWi@1B+2J;Ikx_uycU4skAbU=jg6YF>zbx%T5>c!zpY6-ZEJj= z;|je#9AcEHm|R@5m$TM~AH68iv6*=TrzmOVD*N2qCi6lv2SM6RA{+11Jge(mb~MCzB1m h@k)zzk@DVDzXKd3yCsl=Ehhi~002ovPDHLkV1g7j`>y~1 diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Check.png b/src/main/resources/edu/rpi/legup/images/Legup/Check.png index a929f796f303ea71f3d2bbb684a866717eae1c2f..120630ae803b764ad62d31cd064d2e74a0704da2 100644 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt7Ec$)kP61P=NF1LIPkCpn#{6V zXI-MTnB&!g4uM9Cb}7LbmHB_~Kb<`j2zqbbldQkGNi6r{xW;ifk-+l!Y6;$40J37~)Eo(Kaya{rw@0bN_c<9!bWo_yfZW~Q=} zr9DbD0EKz6&bFOez$Z{}rXb-Vn_m%>kc(A27>M__Fv1S@c0_gCn*}90Ai_8^mash= zgH;0*O}=$+^mdi9JUnhfV@)_Wk#t?x`6NF0ZFLU%N4h&zrtXRE*rAxkc?hASU=e(M zDd`GZzEHmRUjcMVM((>~m*4SHu-yU}smIymxFsOs!$XPrzd5ZW5Q~APntGn2L@*ot z?c;~eyQQ^5@$S8$Kyc^H4F<^)Z|i2R=B!bd???3x7mP&k)rF)f2woZoDqSjO%Lr$QNgzDci7+&SD{xS#gN_UZuls0uYK* z5AKdKE?1Gwr_t8js6;}y)qOEO@wv;n-r3fIymbYh;Lw!-zWM1=UT{8ieBiGbw~R=m z_%b;&Yk7h|NQTwI96|vP4|jFwyIY&3PZuaSDsNbDhNJRUZ#(!HgAMt6567~m) z<5`fBLP#BBzohK!qWi@1B+2J;Ikx_uycU4skAbU=jg6YF>zbx%T5>c!zpY6-ZEJj= z;|je#9AcEHm|R@5m$TM~AH68iv6*=TrzmOVD*N2qCi6lv2SM6RA{+11Jge(mb~MCzB1m h@k)zzk@DVDzXKd3yCsl=Ehhi~002ovPDHLkV1g7j`>y~1 diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Directions.png b/src/main/resources/edu/rpi/legup/images/Legup/Directions.png index b9490ae3fbcc95ead265cfd6e24891410817cdfa..f565b0fddf5e12fe751558d90fb2f0659edf6804 100644 GIT binary patch literal 479 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 IM6N<$f&qOr=>Px# diff --git a/src/main/resources/edu/rpi/legup/images/Legup/homepanel/Check All.png b/src/main/resources/edu/rpi/legup/images/Legup/homepanel/Check All.png new file mode 100644 index 0000000000000000000000000000000000000000..5db2ef3cc2ef868c84fb3f22b4d1b822474e8a37 GIT binary patch literal 292 zcmV+<0o(qGP)MV|ajCyui2!Br!>;?F2!bZxx2*y+D#7 zfJ7pZd?6_ofodN+bmQO)5Hb&c0pW;V96UJ+g(nbBJcYsA0)r=3&j90am@rBXD;cl6HQ60U*;8ON@1Oil?qGy)_Mw z)+inoiWLX%Dn>PmmKU>LvF6}EQ*5};s$OyDzFJ$61{Lh4U=&5Ag4J_ug?%}Vf{8Z@ q_qU@I5%5ak;+0|_2QQIGek(8Mcsvy$$a3xg0000 Date: Thu, 21 Jul 2022 19:55:47 -0400 Subject: [PATCH 4/5] Added a splash of color --- .../edu/rpi/legup/images/Legup/Check All.png | Bin 292 -> 441 bytes .../edu/rpi/legup/images/Legup/Check.png | Bin 189 -> 358 bytes .../edu/rpi/legup/images/Legup/Directions.png | Bin 479 -> 657 bytes .../edu/rpi/legup/images/Legup/Hint.png | Bin 648 -> 865 bytes .../edu/rpi/legup/images/Legup/Submit.png | Bin 268 -> 449 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Check All.png b/src/main/resources/edu/rpi/legup/images/Legup/Check All.png index 5db2ef3cc2ef868c84fb3f22b4d1b822474e8a37..bcae7ebe329fbbd28c59cd6a2cc3c6b917e13e03 100644 GIT binary patch delta 426 zcmV;b0agB_0=WZ_8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L03kO303kO4GgzN`0003_Nkllsr1^>Z} z_?@n-Y?WYOV`S$W5Eaa*pU{@r@5yoNm*Oh6i*!#EMX_(}bAP2Y1tEkGLdbt*gA1(j z{(J3?sk&*cYiZu68-QTYeV+=DB;$jC5$Gi6-)jwQ+8V)L3zO#S-|yQW62X zME|TPucW0;DbYY)NlT?anduS@<&{`!_)jY?aR%~=mm?aMSG2_0$P+>cA!KZT9gd$b Uc*h@Ut^fc407*qoM6N<$f^Jv882|tP delta 276 zcmV+v0qg#`1Ed0w8Gi%-008|9F$@3z0P9IaK~z|U?Uqdn!Y~jQDTfNv;%$ni>Akz~|jCFO2r>-x(H4Tr}C>|Ax6$kGsMm36-7qecm z=HNe5Y`D*=UUBEXT3e9@73`*96h){ms^gZ*1=CjMERpLUqxjSA(AQmChY#tYY{3YMWmCU>)OQRmd3D3Ca9BG zbbek&U0+X5Vh+zrmC6)p-B_ d008VJgcpLq&B9+ts{H@}002ovPDHLkV1hT1mMj1O delta 161 zcmaFHw3l&$N_~r`i(^Oy~@`|l*;V(x z|A&fyEd9?R6g!am!P2kp&rq@F!N;0|kAF5D|9sR~%GlWWcc{63{+8|6e`U;I00K`} KKbLh*2~7Yfj7?1d diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Directions.png b/src/main/resources/edu/rpi/legup/images/Legup/Directions.png index f565b0fddf5e12fe751558d90fb2f0659edf6804..9c5314021443b6d618d0c465386fd10351e21d91 100644 GIT binary patch delta 643 zcmV-}0(|}71Ca%g8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L03kL203kL3;U9gT0006eNkl5pC@x#xmx_zsvuleuLhPJJRkb_*R+7vDXCy_NieGeN= zfxf{)$VE;SF@GADf|G!RM>2{bQ(YidqX=@UT#4GWAyJ=EZ-bbPBFNoKdx8^?1Xr(N z0~!#!Q3M`3Xo|HYrw$ zP@;A)J)h5)9Wi;9z?>BI=IYleca0&;s-0dG-p+%+8-fxCp`!BCLfy9#)ViZi?E&~5tY;uV0m zsBQ$);olX2x2T-Wt9t=DH!*kx;4P|N>%Rrl{gzRSR{-9kD!u@Ko+Ato0>LK>Ppz002ovPDHLkV1kn38ixP? delta 464 zcmV;>0WbcM1>XaZ8Gi%-008|9F$@3z0j5brK~z}7?UymG!Y~YmKM)Hmj2whhbSV;u zp*s>6=m99~mC7l)!HhTqhzo#(KyUzl64s*MCBAsaN{%fj5{x0o+*= zF($yrCtys(n){Q_oQ5rYlSO9XnFt^6h5AICGoA~YcF`|0`HeN;el&=#dYmw-? zR=UKRI86i|v409r)7?|yaMGR}Gl9=Z*r%`H>+FSjqRq6Kz+)opd+K?DuIk#}TjkAa zPjz=UPY?>z>SK5hkCi|P^8~3dMWqNLfs*D4w!$aCjOp6H&$JD0LiU|yjW=V5Z6cHG&ipnp$%CBn&4^HJz zrh`Yn^0CFi;N@U+tbF)&FuptZfH?U=Irs!R`Nn>wdiep=1Kt<$J>ud30000pve8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L03kL203kL3;U9gT0008^NklLH28S~F|M|dK95}eso7{gd{T)A!uPla>A zGM586$VJX8(Ou!Q5E&9u0h}v%gFIi%B^nVs9?i5y`lG2EJOO_j_ISi;- zHGr3_75lNEgPDnEZI@2X{9>_WJ#Yp~IHq4$((mGY3N?eXfTtu~7d{F)uyyt!XuvY> zh?~&kaXydWEZ_-monoh`gO~wUO)L3dX0x+n^;61<@$to2D`o|?gR_9QPO;t90nEUM z*6l$oD}Tl(mKC#t+QC`CTc_Bw>wwP7C!1JSOi0iG-a7S0&;jdhV1Iuuwd}YRK?8W} zl(%?|(m?eiR^OHMcpM)QG=R5GrQZKjG0kspf0MgPb_00p)aVVU=SsV~U*2(CvBr4h zH!$iY6l-g15w8>GxD`PINte*jA8}<)Jy$A<<$o_PE|H*tq#yCn+o;*V;o;Y}dfXb* zLeN0cZ8U2kGbqiUo}Qnm_fqb-#w5~jANWZN_?q+U{1hb#KnL|0- z={3=RJB@N4XiQ>RG3^AikC*IMkg1Q9Cb6uTW`;jfqFxX6j#yTV&3F&>sLyMal2}$u zolbFIt2j;i#TJ_Ut3@>Fm%C2PMszuWYlKzv|9!pgYqEcE_?q-zOukqhC;2B|tjYe( fy3t0{R#E%`=PWPG7Mu+W00000NkvXXu0mjfA8nem delta 634 zcmV-=0)_qI28aca8Gi%-008|9F$@3z0#8XqK~z}7?N`4`D?t$c6dPMD{X_Cs_=8AZ zv5gNT%ng?hSV6smv+M;#{LnD_o@KwJcOwWmJ#xjU@VUT(Wsx&8sc+1;Gju zqOE+_8NDR7nB=5t7uBFM#_I~LGkT`bMXBywJV1?2`+oyj{>b=}LYEkQ9Pr*}ycQ48 zWm6-lxQddL8gDS(jR!bkQ#B~SFZMnhz^ja(!~>WTD+M)&2lieYu$1J>Vq$6_pGyA| z&(c5R&Ck@r$N?fLvp-lECP3H{{TBKi%q7@8OBAxnD^k_liS*u04oTB3_BnFUd(+fa zXtrLk&vUBN!&7LkR$;5jo`S>fZ56I&H;j6lovU4kYf8IzA2{!7Qq*4|efM=T`N#|l z5O8F=5B>B2frq~D+Tsfkd~M0#;+4VG@zXEA8C>5p_yNh}7b=6Fz)XH)zvc7gKV)zX U>y+#g2><{907*qoM6N<$f}W5uN&o-= diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Submit.png b/src/main/resources/edu/rpi/legup/images/Legup/Submit.png index 9cbf7b6834bc6f4c32d66f85a3217a183e47c682..ee7ddab64e6c311f0a7cecb6c4acd3f021bf0d22 100644 GIT binary patch delta 434 zcmV;j0Zsml0>J~28Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L03kO303kO4GgzN`00042Nklvh_#xg1HA4hOfezA#Q4<0qnJR$&BW6e+M$L(E z3t%q}An?wSK7WiFw}6zFIUb441q^!# zQo5uzs|4$04x^^)4V0`OJZcW3CIrAtfrS|Q;1J+BjG7Pt|3Y9*ZH)!&l|GD`-^HE> zkK!%`@W(kXzV->QCB^rZ=}$ebF4mj=5~gbvTpr;PsVg>MCgzJR#B;qqn&zv;NF)-8 c+)GmW0cz;Re#?}QF8}}l07*qoM6N<$f~3H)3;+NC delta 251 zcmVh-GjR>B!4XJ| zLr>v*(IgEnsM&@F5Xeisj3pNTsXb4Y#_|9)H8rnkpfG|Qwajfl!`|7Ph1gEC&n9*O zKo)Vlx0qXMfkO~aAdFCGVu3hoF;%cVn_kP>U2STDzL()B+!CD=+l7n zB+xw%_a%V#ZAv6J&>4d$IRRmvbr}a-oPcmXr!@y4yf0R8+`v4XG^XDVTr2SV0G0l5 ziUUK$&XDx!D^@_+c5BVnUfXv&|N5T2I@Z+uZ*JYV_7gsp97zBG002ovPDHLkV1l_& BY`y>h From b5cd7bd4d1b8ddb17e6965e7f5ede946c9d70d81 Mon Sep 17 00:00:00 2001 From: charlestian23 Date: Thu, 21 Jul 2022 20:38:23 -0400 Subject: [PATCH 5/5] Changed Tree Toolbar button icons and adjusted button spacing --- .../ui/proofeditorui/treeview/TreePanel.java | 2 +- .../treeview/TreeToolBarButton.java | 5 ++++- .../treeview/TreeToolbarPanel.java | 3 ++- .../edu/rpi/legup/images/Legup/AddChild.png | Bin 1662 -> 88 bytes .../edu/rpi/legup/images/Legup/Collapse.png | Bin 1597 -> 150 bytes .../edu/rpi/legup/images/Legup/DelChild.png | Bin 1540 -> 82 bytes .../edu/rpi/legup/images/Legup/Merge.png | Bin 1992 -> 182 bytes 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreePanel.java b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreePanel.java index 306cffec8..3fa482a5e 100644 --- a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreePanel.java +++ b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreePanel.java @@ -28,7 +28,7 @@ public class TreePanel extends JPanel { private JPanel main; private TreeView treeView; private TreeToolbarPanel toolbar; - private LegupUI legupUI; + // private LegupUI legupUI; private JLabel status; diff --git a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolBarButton.java b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolBarButton.java index 85c1c73c8..b39c53b41 100644 --- a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolBarButton.java +++ b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolBarButton.java @@ -1,15 +1,18 @@ package edu.rpi.legup.ui.proofeditorui.treeview; import javax.swing.*; +import java.awt.Dimension; public class TreeToolBarButton extends JButton { private TreeToolBarName name; + private final Dimension MINIMUM_DIMENSION = new Dimension(60, 60); public TreeToolBarButton(ImageIcon imageIcon, TreeToolBarName name) { super(imageIcon); this.name = name; - this.setSize(60, 60); + this.setSize(MINIMUM_DIMENSION.width, MINIMUM_DIMENSION.height); + this.setMinimumSize(this.MINIMUM_DIMENSION); } public TreeToolBarName getToolBarName() { diff --git a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolbarPanel.java b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolbarPanel.java index 97ea419e6..d0b25257a 100644 --- a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolbarPanel.java +++ b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolbarPanel.java @@ -12,7 +12,8 @@ public class TreeToolbarPanel extends JPanel { */ public TreeToolbarPanel(TreePanel treePanel) { this.treePanel = treePanel; - this.setLayout(new GridLayout(4, 1)); + this.setLayout(new GridLayout(4, 1, 0, 2)); + addChild = new TreeToolBarButton(new ImageIcon(ClassLoader.getSystemResource("edu/rpi/legup/images/Legup/AddChild.png")), TreeToolBarName.ADD_CHILD); delChild = new TreeToolBarButton(new ImageIcon(ClassLoader.getSystemResource("edu/rpi/legup/images/Legup/DelChild.png")), TreeToolBarName.DEL_CHILD); diff --git a/src/main/resources/edu/rpi/legup/images/Legup/AddChild.png b/src/main/resources/edu/rpi/legup/images/Legup/AddChild.png index 2a411cddd9cb923fdd7bc3bb899c1eb175c295fc..46ef969d5a1fa70440234e46ad2624c117c15295 100644 GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1c~2L|5R22v2@XjUPXU!Oc)I$ztaD0e0sv2X7e)X8 literal 1662 zcmV-^27&pBP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV% z1uhK?E3hWpWft>#P^Mlr+2MgdwcX>12}%X@iWVkch8=^T#ZJ*_636> z04V?u0Tck_>?bt1pIFSa1L_vWb5zM z)$^A&HSO^cat**u0E%E(1|T_hS^@wDfC7kt^SKxp_$r^tTtB;f`T4hC>ZYnwxj~2{{Siwtct-fZK;#wjt**?73jC?}LyBm^Evol1lZxJUFP%I(YDYcSQyc zA8!669GM!Fp$hn#~bio7)% zeLn#73SKftY?hjxdPm#Ivh(^~16h+?3`9%0V0MOaFcvU1)BL#yhfTWGfvgaa6 zT!?iUdFY5Ad#0GhJC@t~lL!V?R9DwXot=wU0fXHh0H~@`K8i#d{J=dMwIsx!*|{n? z46~8}pCV(+hD}i9sj~9Tuipy{SOD%J5^3;fvyVOi&~2x)=Z$cdz;Ygzz6*1-T=z`$h4dQi${mH=>$DzDcAV9X&nPU@L!2*3fx449@_4uBciNp2vsm?up@q{Vx}{Tf;t$W zHUm@lT`Gy72LQZYDVfVX)>W0*^;_Bdjx}ps0a)CP0i)vc@vbh2IdCqW9+{)-VcES3 zCTG($kj`Cwt}g0PX3+J1SZgS)Jpho+8iz(k9;}Z>X9p*%050VRP}6{EvKQ(DscDpF z)B5!nj%PAiE1S&$@K%svvy@mSGhcAfasY&YQ;P3y-n^XyW;z-SQR64jQ#! z02eQ^J+hqasH>Z$>3X%G36>y805uEH)H+vcGh;*LN*I_^Ap`~YhNQEz^A6x!r3?Te0Db^IyGopcgVKre6h|@HGMP+Qef_C+ zN=q9Q07@bOBDu;c1Fx$)yG@dk-}d(2$X>oYRLEv600Dcb_9)_>@YY#w2AyD_uI}tM z#-@G~0DvbJ15YGMudA}|GZGp2d2H;Z!|C+gFV38K+Fn(qA`+SA4TnRrrm0X>1)NWu zTc8EVL@PVIKuh^kaCEMv5KKwJL;{lID?|by%QBQZcbZlJp*5UKOAN!BVVY100lM$z zq-QDLmK7JYqM*cL<%#rMU&l76Vsk(oje=MfVh_)q#@w#I01Q?#(-HPy`Tzg`07*qo IM6N<$f+w@<*#H0l diff --git a/src/main/resources/edu/rpi/legup/images/Legup/Collapse.png b/src/main/resources/edu/rpi/legup/images/Legup/Collapse.png index 18207174fc9a05ab48cca76a9ac6b608f96ae200..0fd314b8f4364df2cc46261bdec5acb66e498777 100644 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iSWg$n5R22v2@-V;GZQ(TE#`>x zJu!TIUEtJ*`47!Qye%etmDg}$xZ=FkVaj#k$2uKii>4mlGGT$tqNVc^k2F>V9p(^O zQ@TW>-6cl$bP0l+XkK?Tj`o literal 1597 zcmV-D2EzG?P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV% z1_cxxbE}j900q5CL_t(o!@ZYXY*XhM$A9lR$FXzr;etbDJFwObA*M)BkV>0&N(X|# z6>2LQZKYqC)?RNHt*Tx?5xuDBq)EHjG_4ZdM=#0{pwUT#sNICZSdglw-Bdde*)2A< zlR7lEWBbiHwofl|Oq|4VOsDmg{_^qb$LIY&&+|JUub{!Wa^;D8XJ@m|x3siAW18j7 zrfIr`5NMi~aX8dT!zlixqr?2;z`%dM<~t5iZ_=_JbB&BtekrB()9&sA!smP1<#zX? z>pGQ61t}$&%mm5gS$XT$h~;#OcLxWR*M#_&{GSb+J-cH|d%J$g;~DSt<2xHTb!zMVUaxz+ukYpdK;Vc9qreQH z*{X(HK*?4Y@Ho-v`{jv=-)B>)%&y_#(3i~`&=$-7s&?tpm5+LRkF*B@PpI$*`xl2D zrq}|g*eU_Dz$AgdeidY=qWo#ZvIq)6`K}CHxbV;8-QBzVfxrP3KD1A+*dZ#QU>FAR z_yp;6oNRWMVlj^p0+*|m&dv*Tb?sF>o~;|tpSO;}*s-QtaPD0HJ&I!8+_&#!hpvAP zWNI=NfJG?uA0m+me*Zqa-lwStWh!-+MB*O^Q8qSg5I@+x`|4Cv6>vDLVW00oRo5ku zs_C~vE|+I~{2J};53^^_?^uL#0?4B%pzCeu`g(l66ZG{J2#1fgq|>8coH?`O(Y2ry z03#!hUEQ{A=uw}~0mSZPpUV{)8ylmi=OqGx=eQdvBauH_*RQ`jyB3rhfN8SD?e+p+ z0OlRo#>YRUr{~860zcwzp?u(h{X&TOHKEi1N+qkqON)5@+O_`Q)Pqt3&@?qC z<@9=87l1)LejC3($oB!IvTzkB*E5-zy^u*doyF_j4&1OaHUN`cZkDmJQ8sRTmYq9~ zqw80J)4(S-yx-W0*>k7S^?$Q#*IR7f{Ihj!ZLMRcPHnw^MFpg+e2`4Ww)=crbTG(f z4ZbfZl?4b(@5N%%r9xpI(2%msB9sPT5DHB$gED8cF=rpw)0`cX1O7@Na6s+q+R=Uf z{3Az~wBV_yuFeXf{yH3v7Qw#^N)y8<5{XRF*LS1_O4F9KV~h5DzUI5EiOT~Q2?l@C zDunv;bLaZ+p{8aWI<)(EI-N~Kqthjqs|6{iZ6gNp`1CR;%{!G@Tws2cblqUn zrl6*2Zs7B6*PTws&=Lax!^2}==JUoQ zb91HJ$z%*@Whs}99{ePPhLOmG@MPxlFSC+k6g<2U6+L6EWAX8R*N*y}1`}oXE z?p8f0>u0!@s{a#6IgO^N*@gxhLAkQevQ7)+Dtu^UGB?pQCEUEI49sI z6pH38OZ;kR=yIlM1IwXYFwq9M?6x@V&stUITz0IVXf$P})49ZxPrh(s$+MuT*XJ52 zqtR3uJobs5H4E0NI@bnxh(=T8aQId(nVcIG;^lI~yL z*Bv#F-%3qh3n~;$!r^!^oz5jQnfU`lLzgGl+?=j8EbCR*#fzW5Z5WkT{C;=E@AtI1 z-8#DNqEfMta-K}4Kq4`dPb4y`!=e86;K7I95aJ!#)b6<1aryGz4Y{0nzNN)6WSW&8 v(=54#z}~)#Nh!-8xZRca2L?V~b^HD;M9P7JSE~;V00000NkvXXu0mjf{bCMy diff --git a/src/main/resources/edu/rpi/legup/images/Legup/DelChild.png b/src/main/resources/edu/rpi/legup/images/Legup/DelChild.png index b130336a07055f59be1f72768cbfd2319ba8e06d..8a9979507d70025b74fc5583d9a14c17d19c6a16 100644 GIT binary patch literal 82 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1NlzEY5R22v2@Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV% z1uZmq2Ai({00o3eL_t(o!^KxyY!p=({?5$K&hE~1w=0+{KHVc1e=wU4S%c8dXg*7a)Xy z5cd6vpM}B`8!Qk5-McK|vk_u52K`Di% zX-K7Fh{vxP(dgw|A~8fcj-JhC<0tm*8=d{n0J^&BKQ>Lit+H~57z%yqk!3%C7=TFt zIRGi^PYHkspd5gTWO4?>!)@8IvF;qlnXN4?_s;$+0F;7Uy&Cz}>n%T2S9j8*sE1%+wuSmYg_{$f>>+>0|TwuOlGou=gz((gn&L10Hq+^-Az9R0xxZgL{54L z`3=Aj0D%$A1K?~cO$LAgKnD;8rR&kx_j%^YlZQ8U?C5>V4uZD>Xl&earmQTqr=g+E zOGr0>QEPJ(0JSzZEkX9KS!2$ckAsj2R8$-hVzE2V-@7MPoI5w(S(Jeb7aHDIl(Mgz zn@@WQxo+9o<)C?ievZ+;Uv|0bQ^klKFLf^PaQdU@Im_$296(Z@>Er!tD)hu zQlD=Gz@L@?YIT#*-Y!6ASkReohP8GUgk<3NZxbdaZoU={SDo(Z`76(=fckp9wW?~P ztg3zhe=sx~j7>F*-b|5Rpk8Oz6@Wd2sw$|e+9220>#blpq!dID_+z2aULSCa(bBNl z*061^J3KqBDKOWIP-wqT5cp%1&Y7PBfR2vMErCEeC(9y$X&Z9GK^yHU4p?lB0bm-k zEFusn=Q=tzx6A`5DG}Za1~+(t#}1p=?Q7TGi3O+s3-2By7~J5MW#JtxxU=h3MXBcJ z02qwZ6)+Z@5!Ux&36$FMg30Vt*mDeu@&eEEuI70FnwBqb2b#= zAe04^fF!Mht{ZFT0Z@t(x7!6EZA&N-vh4UMLNwYCC-&G8Eitf<==0D$}Vjgve-eYCo|LQ>TLlM~EEVWp>Y5UOid z#DJd8ITs`y9ZiQ-RsN>Ad6SorxMhlkNN8_*w5oT4!?$|LlB9m+%Jwtm<$7gg|o^1;T`@Uxmo5cX^CSbY%z?Duv=a0wNf11s@50#XN2nI{t zisI)bNrWi6tgD%UR4RvfJYhtmGurHI4jzxzt|$+`^7*C`4wdVI3G4(84uZ4YLO1|C z&qH|hDDo!Y-$N<4MbpeR`8-5I0G>zA?dJX_#Jmk8ept7z?gK^ z_6+vhA~xaE{e-9cJ1+<=#x8wl&%mUq-AWrfg8EJ>ub9K3TfNc4Y0I0V>m1oN6uXYz f+v_m%APbP0l+XkKpZY#! literal 1992 zcmV;(2RHbMP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV% z1`!h5zS;Bu00&4(L_t(o!_}8-Y!ufO$A5PoyY_nRwJ|o{wZRw{KOj(o5R^1PLIOce zOGBHw4-!(MCaT&Gjat!fts3=9rB zhEE8Aq9}1ym3wu4;!tt1@!ICiS4a6TM9h9++Yc19wpzc?H2c}=>c@oN|D^(-Z#f>1 z2g|b1G>v$?o1vk@S|rknESu+5)$KNn+_HNiIfKCA!=G;OdOat~%QsgwHT~G_@pym% z;0BO(w2A;Pot;PN>-!6S|3mowUuG_ngM+QM+bs@k-!A=7h!3n1iPw8Sjg3EIZjuXtS~8goU0pxPj*Y!Plt^T@Kl$Y4 zp4$l6_CDpriMHkOPp99NAbZgm`29`X3ajY8#MrBCvtn6goT4 zBT1DsH}7GRq?Q+@kp~^f-T^(7m3>Z%$FCK3bSUbFb3;$S)i@vau9Ea=WD#zkjs{ zdYowV+ad~w`v?RYnUCaTly|z%*Bi#;(OJB>Nl}#CGXRod(BSh`0mFANnw-v9EJ{_? zD&`|O3C)2%k4_JM|7wrht+oItrfC-!6v#l_NgQbwAd$#Wq?9mx>LkgY5%e2bECH^P z0=!FoEc{G0uCk(86>iN+NZYv%Ve9cEZ z*h;Lu71_6J`UjTNF=AJ#+_ZzSwlT6dQhCXkokc_;9>0#FNL>JuX_~KuLL+7-lbxOg zTPJv6fZ;PoDQ;+|{PPPKGsY-fR8GTptBChpz??7;YEd4EEVe#Q>B@DCzBe>SMd?5x zkw_@5Y4)1{(ym?S#)Xi7)zuZ8fB@iT{BjB-p;NI*V!_%HYHHj>BBNw7S%l=G^5J4` z{__&T<-@kDDVXUIN|rS;)^T%=QdG!fvV_Bvrv1H_lC-(gG*3#W7TK4Yk=ufBh4ZXe5>$WT? z-`NBdJH|yoA#2tw<=V9f1CbcHjEi*qbo6@=Dy~mf7Ny2rtX2-)-E^kgU<3sZsNHXrKW(H5S zPoxJzzj^ST{_o#W?c);I^v?C0x}j|e|Mg_j&}4+{nVEnykVPpDFm~}@da5sUKH}-$ z_p#gZyUCfY)ms&h_vq5cH+k(u2un-drlXVv$fmHbpX`Y0D9zjc))$}4pZrM)yb??X zpYpronegaC3mTTYNR5MTAWREkTFCAaY`k1Q(Vj9jeaoX~LZSKm$@g-ad37N9_dSbL zzc!Y-udJ?CwG%fGhKVGp$VHX(y?Z`oq_l5tJr_NDH(%1d9;t>GMP5jUhtI`63T9RB zA|%sB_ADgab~T+#q+iw^8L%6`k+$BH&0000