From fe487f579531511534369d9d3dedb5fa0fe6ea96 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 22 Jul 2017 14:15:16 -0400 Subject: [PATCH] runelite-client: add substance graphite look and feel --- runelite-client/pom.xml | 11 +++++++++ .../java/net/runelite/client/RuneLite.java | 21 ++++++++++++++++-- .../client/plugins/config/ConfigPanel.java | 4 ++-- .../client/plugins/hiscore/HiscorePanel.java | 3 +-- .../client/plugins/account/login_icon.png | Bin 463 -> 566 bytes .../client/plugins/account/logout_icon.png | Bin 371 -> 365 bytes .../client/plugins/config/config_icon.png | Bin 634 -> 623 bytes 7 files changed, 33 insertions(+), 6 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 43977c4f69..2eba3e5526 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -68,6 +68,17 @@ gson 2.4 + + org.pushingpixels + substance + 7.0.01 + + + org.pushingpixels + trident + 1.4 + runtime + net.runelite diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 3de44e4d5c..10002bb12b 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -24,7 +24,6 @@ */ package net.runelite.client; -import net.runelite.client.game.ItemManager; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.SubscriberExceptionContext; import com.google.gson.Gson; @@ -41,14 +40,19 @@ import java.io.InputStreamReader; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import javax.imageio.ImageIO; +import javax.swing.JFrame; +import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import joptsimple.OptionParser; import joptsimple.OptionSet; import net.runelite.api.Client; -import net.runelite.client.config.ConfigManager; import net.runelite.client.account.AccountSession; +import net.runelite.client.config.ConfigManager; import net.runelite.client.events.SessionClose; import net.runelite.client.events.SessionOpen; +import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.PluginManager; import net.runelite.client.task.Scheduler; @@ -56,6 +60,7 @@ import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.overlay.OverlayRenderer; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.http.api.account.AccountClient; +import org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,6 +126,18 @@ public class RuneLite { SwingUtilities.invokeAndWait(() -> { + JFrame.setDefaultLookAndFeelDecorated(true); + JPopupMenu.setDefaultLightWeightPopupEnabled(false); + + try + { + UIManager.setLookAndFeel(new SubstanceGraphiteLookAndFeel()); + } + catch (UnsupportedLookAndFeelException ex) + { + logger.warn("unable to set look and feel", ex); + } + gui = new ClientUI(); setupTrayIcon(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 8bd754b35f..a90cdbb5c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -52,8 +52,8 @@ public class ConfigPanel extends PluginPanel private static final Logger logger = LoggerFactory.getLogger(ConfigPanel.class); private static final EmptyBorder BORDER_PADDING = new EmptyBorder(6, 6, 6, 6); - private static final int TEXT_FIELD_WIDTH = 12; - private static final int SPINNER_FIELD_WIDTH = 10; + private static final int TEXT_FIELD_WIDTH = 7; + private static final int SPINNER_FIELD_WIDTH = 6; private final RuneLite runelite = RuneLite.getRunelite(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index 4d05abf293..abdfef2813 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -92,8 +92,7 @@ public class HiscorePanel extends PluginPanel setSize(PANEL_WIDTH, PANEL_HEIGHT); setVisible(true); - input = new JTextField(); - input.setColumns(16); + input = new JTextField(11); add(input); lookupButton = new JButton("Lookup"); diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/account/login_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/account/login_icon.png index e14125e7e10d68950b3a50e2af0d9c4a79d83a2c..eed416cfd179ecefc200881a3a52a98940fa7975 100644 GIT binary patch delta 532 zcmV+v0_*+H1GWT^85#xv001BJ|6u?C00v@9M??Vs0RI60puMM)kvi_@&!%0LzR5;6xlg&$1VHC!HXYOsr$!0(ospMFZIW5#$QwEjhx{E#2Zjn0YOABQIl;`}?3MoxrPOo4XN# z=Occ20Kl8gXS(t0!{KaIFt$W3EZxP-iW_$UzyGG5e==iDI(yoBPga=i3hlalw9aIq!@>VxHdz&n7Jkhb)cw$LpFuGIF zGC>G5;Os#9H5;HO*M~^tC(Xb`Rq+Cc6UT;`IDJQMj66zXZxKwFAOFSvZfile>)$zl ze2mKjQ|SVwZ4ahzUP%Abj}H`}8M=%PP9Od_7C_RN&=L!PYs2@24iPD^yHM$D5y=(s zMcWlPxPkgiyp*A%2Q>Ul?7EW(LI|_HluT8U-}!T8S-(_P$s{I{+PuJ((hMhy=j1m7 W8KXaK0l91d00001kVGI8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0004GNklc^`@XTO!VE%h`mkI= zMr9LHs4RlOD7xrMh)u;gKN2l(v}3xa#hIV1cjs(+h7vtIjDPnWp5J-Tws%Iilt#~d z#uWlfE}l4)*|2QXl~xX7CV+cwpEy_jE;VtjsaeL=2C<@{LQ~+x#WA3EkUz0Z>#6Dv zFefm;mxc}!OSGOU;|jt86eghHk3C@)iknvsy3^@DeKE8!W(iB{2359J_9nlb?PD~%K@odi;jc=gU)Te5WkDY&*T z&O>oq^k*A!y2%Ov9}E2J$FYFgsr$vh05Td3U>qRKp*f$5s@0(zHO!o0j8yHjs3dIf q07{~#Gs#INdBVo1yWU%}uIs-9OPt#Fe9{j90000ZDQ0Ny2Y7-4J{7~}WSWwOL*W{r+|{Em@JM(F>yCnyGF ztor_TRp|fkgber`lY+u$f-!!6Mi@p4U?N7*ueBTh|CqDjKUoI+TD$T8@6%^d0ubhZ zlrSKqfBEm7dkkMI>QG$4-O7j9s;fi2jdk=4`~IU)Uj$H*l^lnamzVGH)h zABgO{41dT;iEtOp2;&rf$G}BQX2LXp)xm~=B}qo=F)=nWt0*z>E|~*Qi2yk0SM5_B RK*s<8002ovPDHLkV1lqlldJ#$ delta 344 zcmV-e0jK`$0`mfpB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mi2uVaiR5(v#{0{{Go;+pvT2aqH4B+l)WMGn!hVmE~zy^GdNdZd` z13(s`7y>fjQ*`qGpMSoAm;?bx?cc{wpuGS8nIOh6F#P@Z2Y<>U4Zsb+2Y#*H$nay% z0w@m^5HtX!`SQfsi)t|>^g-gH zfuKJiT1G8ewRaJgQG<$`NlOZoh`gE_lGhBRnlWd*b6UA6otYQT>Kxv4cwP=7LaFNP z?2^`&f2c%u`Gp<6LqKq|r-=x~bhQ1L^j_&;ab=Bw`G?E5?g4a&$P0jy+k+Nz|89>o z?Ttvdu3mt1U`0W-i3lboq?C?r+c;kq0Ghzgcb`8wKQ}Xr=J)R@X^_bl$Yio4E?p$t z5Ooj_+w|DTtTO&??Q2m6y?sfkuPLy)vIJtWf4r_xra`zO&q#WL=R;%LLrf%kq_M67 z{ntF-ek(qFnnjs9BA^=v&t8rKRBdU{+jm=PD?KXZJC5rynx0_d{l|aDLL##AAA`iz zYtk6D(SOe2WPS7xq%c$f5z)4~)C5Q-??`HB7|l?09jT#83o@Pc@oFTEp(>bhK5N@? ze=IaRxEkf1RIBt&qffODVGtRVDEG4a_IU>go$9V8$5P-IW2k?M`?qhuH zwN@%-J>XZQM&EG##!W;-OTV3DeqoW;Sd4O{yY3Pf&b0IJ(PK`X?v(DcC&=a2ahKh) z3^eR;eXJocx34)uextzC!C_*t{Y*_wDQaaohzR(0)&Zg{TjKG!l=I@7^%rfDAF4Ys R9a6VXz0R#P5TX})kYD5J{!8TIC4WQw8(irV6OTPe;Ook&`Ply~ zQ*6RIh{diWG5!<|Cy(C!A~t)yn3*r*NivNe72tz1!;&|`X-qWYGb%Rm%V^yyz}MJl zRIaefIs{v>iKC+}K!^897`-pEivxSQ3?Z<_Z9+Elg5BA{HPrJ+q$Y9s%2hU7`sHh= zvw3t%l3JBw52tAh=s($wJ9qEl_=zz3&KyIfQiisuSt(Wctj>|NvyIN4I!fW5Bj%Tq vB<(WawkFKBDVP7kguGBk!C;UDYJ=zxXNk7neabbM00000NkvXXu0mjf_6run