From aa1dca25ead78a8dfbb7b4fdfc458604cdca29de Mon Sep 17 00:00:00 2001 From: 4pr0n Date: Thu, 17 Apr 2014 21:43:34 -0700 Subject: [PATCH] Added button icons --- .../com/rarchives/ripme/ui/MainWindow.java | 20 +++++++++++++++++- src/main/resources/comment.png | Bin 0 -> 377 bytes src/main/resources/folder.png | Bin 0 -> 477 bytes src/main/resources/gear.png | Bin 0 -> 917 bytes src/main/resources/list.png | Bin 0 -> 573 bytes src/main/resources/time.png | Bin 0 -> 983 bytes src/main/resources/wrench.png | Bin 0 -> 587 bytes 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/comment.png create mode 100644 src/main/resources/folder.png create mode 100644 src/main/resources/gear.png create mode 100644 src/main/resources/list.png create mode 100644 src/main/resources/time.png create mode 100644 src/main/resources/wrench.png diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java index a7cacb7c..5610b850 100644 --- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java +++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java @@ -22,6 +22,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.awt.image.BufferedImage; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -29,6 +30,7 @@ import java.util.Arrays; import javax.imageio.ImageIO; import javax.swing.DefaultListModel; +import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -108,6 +110,8 @@ public class MainWindow implements Runnable, RipStatusHandler { private static CheckboxMenuItem trayMenuAutorip; private static Image mainIcon; + + private static AbstractRipper ripper; public MainWindow() { mainFrame = new JFrame("RipMe v" + UpdateUtils.getThisJarVersion()); @@ -224,6 +228,15 @@ public class MainWindow implements Runnable, RipStatusHandler { optionLog = new JButton("Log"); optionHistory = new JButton("History"); optionConfiguration = new JButton("Configuration"); + try { + Image icon; + icon = ImageIO.read(getClass().getClassLoader().getResource("comment.png")); + optionLog.setIcon(new ImageIcon(icon)); + icon = ImageIO.read(getClass().getClassLoader().getResource("time.png")); + optionHistory.setIcon(new ImageIcon(icon)); + icon = ImageIO.read(getClass().getClassLoader().getResource("gear.png")); + optionConfiguration.setIcon(new ImageIcon(icon)); + } catch (Exception e) { } gbc.gridx = 0; optionsPanel.add(optionLog, gbc); gbc.gridx = 1; optionsPanel.add(optionHistory, gbc); gbc.gridx = 2; optionsPanel.add(optionConfiguration, gbc); @@ -567,7 +580,6 @@ public class MainWindow implements Runnable, RipStatusHandler { openButton.setVisible(false); statusLabel.setVisible(true); mainFrame.pack(); - AbstractRipper ripper = null; boolean failed = false; try { ripper = AbstractRipper.getRipper(url); @@ -663,6 +675,12 @@ public class MainWindow implements Runnable, RipStatusHandler { File f = (File) msg.getObject(); String prettyFile = Utils.shortenPath(f); openButton.setText("Open " + prettyFile); + try { + Image folderIcon = ImageIO.read(getClass().getClassLoader().getResource("folder.png")); + openButton.setIcon(new ImageIcon(folderIcon)); + } catch (Exception e) { + logger.error("Error while setting folder icon", e); + } appendLog( "Rip complete, saved to " + prettyFile, Color.GREEN); openButton.setActionCommand(f.toString()); openButton.addActionListener(new ActionListener() { diff --git a/src/main/resources/comment.png b/src/main/resources/comment.png new file mode 100644 index 0000000000000000000000000000000000000000..1c7dac997375983df6f5d4a14ede288982b7af57 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6I!3HGL_ATQBQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9*Yo*oQ#g8YC2FzHZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP7W2a4bIba4!^IQ@2tAy>15fa`yquti&!2e8b(d(18Wv8&Ei z;f$ApHZ83SaCCRC2#mY(i`y(Xoz4_Cqn0Cy7XT>V6%O($3vbIY}!$xF7jJ+@HE>%V-UpOQ&knd z?=#D?$Y7aBbVX6b%d-4(T~$?FuUGajuxXkiO;hqhiGn+;@H7KZpq z3kbp5wv8l7*eH|@f`9=)*LBFUjNEjt>oU_c#bIsRhNfu%fIQE6Q52-0ilQKnV;Y0q zRRw^{WFU8GbZ8()Nlj2>E@cM*00Q|*L_t(Y$F)^WNGeej z{;rc!(2x?X+Bp;?%tD_os;x#)wCh2%tR$t4n}Tvzi`T+M1QPA6R&Q4r7DUmaAE=j* zk`d^xO@cF2P-=GG;^ELZGbYhHtGVZ%d(M2{`D4Xm5&u(6jT#nyWlF6jH4r=vHwTivHJyo)Jp2zCy zD!RM7mB8cU<5*u`r&uhe*qxl5K$c~@)oRUYk}S)z{p{>4n@lEge0+?jrzgc=VPOG7 zLqi%=M1<+-X-cJ1imt1x3w?ckaJgJ?yWNa2_AkK3#s;met?6>RzrW9Tp4YwG+S;OM zG^%^IySwYN*=z@b@?P)WFU8GbZ8()Nlj2>E@cM*00E&%L_t(Y$F-KN&f-86 zh95Q~Dn>M+q6xT)_7a**uYp!HdjSQ9LIC#w8b^xXASj9pD1tkv0EetVAWA~=ePR=` zEI(!0GVUakCuiRCzB5xholbme34r;0{A_FNfMM&gkeaQWh6=R6ke~_UxVwqP8`Qb zDFFzApj4Je_Pv1%A+84W$YyV8p65BOR_kKL>2zA16@?JkwoRkaxO8sYb~Uo-y3TAi zyVOAt5ClOrvJ^$ZYPG^NO!(Xf#48h3mScY5J1pFTtgh3WJjUOHPpEd9GdI%xjzR&mj{bP8Qk2FB-lV6K()LDx$0F|@+00000 LNkvXXu0mjfsDbW5 literal 0 HcmV?d00001 diff --git a/src/main/resources/time.png b/src/main/resources/time.png new file mode 100644 index 0000000000000000000000000000000000000000..f4feec8dc4a042637e5f43b8651c726ccea4e5cb GIT binary patch literal 983 zcmV;|11S87P)WFU8GbZ8()Nlj2>E@cM*00TQoL_t(Y$F)^ENGn?u zUFWJJI{wIr$w(w(F^HznN^ER=;wOTjR%ryofQ=|dd4<>{g|8b##X?PMqoPGf@hXdm z1Pf6iIw($LbecpVg7}F!w|IEWyu^ER<=$QGv-V~$&i<0;=V$y$Da^;|=H`ZKng+u# zkW40Fv)LeuA|y#7JkNiP;O*@VdwY9yb8{0%M@Kn*N=r*=Pfrhqhlf#LUr%!RkX$KB zBohD3&CUJ&S>XRmK|uk=#>U`wy9puW#{|)6l+Mh|;O_1&E07=v5Cj35rs3t~CClE? z(E-2TPl}3)aueL&-~Tl-GV*Uc9%q=r{pCnYirAt zYp>Uvcdysf)L?3AioI`dZ*g#NKp8pG>BGGlXd^OvU9>2xyv`uh5Vz%UGE;5ZHrhvQ2Gk|deZ#3uRi@sSyLo=0Kf=Nn{U zVFByw>i~eNswyao!ffT`F+wIJ_y}kX*`PX$Fkw}ES+uGVb z2nZn<92{iEa5#)$Fqn7nbUF>c-;ejLz;PV<`}@t4>~gtCW|0&{!SV6&PlKmYDJ(87 z;^gFnVSRmlsI08aUUvKY`*eDG`ePFk0=L@@S(d?ZTvl*R)8O;@aCUaaFo(l|Kp;R$ zN=kCC>$SBt8VCeTn8jj2Q&STpNkVmXH7+kNp{gpP(I`@>l&Qs6S65BPC+ET0+1a6r zqTu!QHSan!G&Ep-ejasob>ycP4FJy1&*}2=GBP)8F5!6|0|Nt)WtkKg7w2~}GbI*_ z(O@u$tE(#*hJlBN2Ux9Eh@yzr)>d?Pce8xweUpEudWFU8GbZ8()Nlj2>E@cM*00FN_L_t(Y$F-EPit0cV zhW}X?gJN@S(un~lkj-YvcX?j|$8k7gOuVnxYxMhlek*&;`4U7Tk;1>V!C-*ZY9%C=WpQ2C z`FK3$z6IfM_$?F)xoYS08K!B%vMg>G1}_$in9XKLr_%rc;&ssW`#p4B=kxje$E+;N z7!HR-k|b{@@B>dI66kijkR-`l4;W*2;a>+T8jV8JG;}(hf-K9#(;P6yU>L?tcrKSi ztJNZu(vQt%^Cy)`k?XEqo4D75pWy9w`zFxSBww$^w(W=DH+v8y{69g^aF^g2a3P?S zqFgQq4i|!2t;QFNMc{BDI3ABrfeV3YngvBs0*AW>ZM)t6t=H@C@pv4KMk5foufOSU Z*C!gv?igc_q-OvC002ovPDHLkV1mzT_e1~y literal 0 HcmV?d00001