From 2f55df5a4c33da1427939e747f5197e354b525e0 Mon Sep 17 00:00:00 2001 From: Sogomn Date: Sun, 31 Jan 2016 21:42:03 +0100 Subject: [PATCH] Small changes Played around with the UI --- Ratty/res/gui_icon.png | Bin 164 -> 168 bytes Ratty/res/menu_icons.png | Bin 618 -> 766 bytes Ratty/res/menu_icons_tree.png | Bin 469 -> 600 bytes Ratty/src/de/sogomn/rat/Ratty.java | 12 +++++------- .../de/sogomn/rat/server/gui/FileTreePanel.java | 3 ++- .../src/de/sogomn/rat/server/gui/RattyGui.java | 5 +++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ratty/res/gui_icon.png b/Ratty/res/gui_icon.png index 4bd0a198045713ed4006d683115ff43b78162009..dc18e52b943b8fe3c82fad2e56bb507d687640c3 100644 GIT binary patch delta 140 zcmV;70CWGO0jL3xB!6#7L_t(|+GAkA0aO(g|AR0CIRK>bf747b9ymiNG63fP7#m(N zCMi6SHKJpJh9GNRmt&5Ci82Ic0J>&mLkJpxOEV19$AHFt|G^lh37Jn+K!Oy5=%dq{ uz!+JKsAz;~M91_o0GAkFiiTWfgOJ6DvK^!tgkc6C^YI#j&-p}ogDM8B%Q45P86-y^1F#ta6DKMrV2aT(NvRPV qW*`;(Z<_fZgc-;M6dOQ{Apr9u5S}Q;gOdON002ovPDHLkU;%>g{4}%x diff --git a/Ratty/res/menu_icons.png b/Ratty/res/menu_icons.png index 6cacc0d13ea9a29f163709686da40557a7c55c73..94d26f43c607ca440811c077e9150b2e48bd0606 100644 GIT binary patch literal 766 zcmV^zKnrW}6xM=`jW}0~h!SQphi4Sk*Mi2?us;;sd`N{rSt)QpF#`M+VC##*Pd002_CIP7P_W@dqgR!QW(Y_b} z6atWKIab&xCf)S+O}zB=q~Tl*1)vZBbFn;J07@%Cp{-MF0T64`3);lGTI36<|;wi8?yi?6kupQs zLpmL7Z~t=%vcT!A*53nQ>;SP(h-?XyCQj?`05Em{v!uM=?evPx^?ei4L0Fo=Y7-9t z06`GdCmsL>;UI|W6AwV40NPt|T9*(QT;c(s1OWg5C5S;707?)iVgOKrSd0UJ4H-6M w02pBjVpARfrlG&z2aQ<(I3?0klQeDK^Se8rlgVTswrSIJIpF@U>ix~m&w8DO5IOi=OoaKqxq3^&mVnFo z+yd^yW8eAQk;9|N6>$ErwD1bZb-?2LJr9WjoQR+Uu~GLr@JGm=i;(VCGmBgSWC)cy zV2<0i?TIeW78YIsucz_?I3rHx03zwgQzA-2NX-FH=c%&&dIY=iAu^V2*6$ zNsSIb0oNCYy#SmeVgleyND_?HaE^dj2#It8Pz0w1zyj_+k6FM1IPC?yCrTj?1>C%x zBtcC;3i%TIse6?+kpFj+Xuk(t4{*wHO3Wt>MsXb`nnJ4e@R6r}M`3FoFr?hH4~fEa z-hMp60m=y{z?Ioz0gf;}_V(j~0vtF(yaF(3pCjB5qQWWF0XPA&1W+T-6(He2b_hv2 z5bI)9lQ@(ERXY%?LZb*F$$5ZU6sZW<#Z0W`fJ8gHHv&QxNG*gU`tcG6ikrD1I@(b@ zUf=0r1lk+2K9q=(?+mg9gdV3*acuVcCvcHG;arz3z=1>pxzHaH%1deICSuF zl}XG&sH3c+jB;M~RXdS!>VMU(MCnXCSTk3}f+BPK1%~O{u4i#`l>h($07*qoM6N<$ Ef^rHFUjP6A diff --git a/Ratty/res/menu_icons_tree.png b/Ratty/res/menu_icons_tree.png index 936c5f9e1b6b4e01284df6ddc1ba76fddc43981a..74fa881d0e62350df90f161334a76011a89c3049 100644 GIT binary patch literal 600 zcmV-e0;m0nP)sr8I-M--K-}@K zp0@|3HZA~00DkbF>yxoUKYjOpX$WcX+7O}O)gS<93?O#k)ctz_kOp5I0)R#U{Hf=^ z0OST=3<3aS0RKdC7wg^tN(Ep1mjHnAFQInuwE?t(H@i;&pwi{3)|BH{E`YRY=H6f3 ze*9UfL5Ge5z|sJ$7u(WPQwT11swv*K24LX;4{v89Ceb=AN5 z02l#SO+m4ynbo*f=K+9rw{va{Yyfl(@Uz>^s=3XtT-ffv7yvW|;4U{^-E20K75W>y zbllg+i^+-wynjERtmYvAXdJ+mKjp;slRgZO0r+)yeSA;=0HCu7hXR%Yg+91@-49Y) zvB0~70H85|&>|Zue}5@JZjb-~Q1?bGb?N~CfMrZUsf#dE5CF>n(7q7^0D!&#Vr^&u z09f{on7_Ej+S334u&f)g(vK(s000000O)TKmM+FpfbW;1v9yDC;{X6aTT_q=rd9y} mz%+nXS&iGxUlakTyZr)GF|W6N>$jNz0000^zKo_nhM-j5gIb6AOo>PmG_z5ba@ zz<~#up?mVas_N>Vt~0J#-|w_K@G6}z-vLir-##A*c@d3${k{x@8lmxb%k^IFxorMx zb`eC6?!6F}c@#pLhaeb04~{)=0brSTLvXZ@1&}fiL8Qv66@bTl@tVk8z(W9tc_Z*m}xo24NzJ(-fT#?RMg#j0}Al+e&se#V{^(0+Dl>`sT3k*zAAv# zkxC(k%vT4Q zWN^FLBsJ9jQn1Z~!2neEq=)%Dko-ol=Dsa%0%^m$kLy6yAv6GqBd?!X#{dn$db&T~ zYcv3D*aDJ&PQTftC2hPJ1Ov#Dk>ckTK+5Fk0I@8@7W3o)tmw-uOdbGT#FGWkd%(#6 z$lkB-Pihf+cjSM7mL+7Bkp=LxI)lyAoXKQ>%;cy#0HTt)HBY3!`jM;WndUdW00000 LNkvXXu0mjfZ>ZDg diff --git a/Ratty/src/de/sogomn/rat/Ratty.java b/Ratty/src/de/sogomn/rat/Ratty.java index ec96313..1591296 100644 --- a/Ratty/src/de/sogomn/rat/Ratty.java +++ b/Ratty/src/de/sogomn/rat/Ratty.java @@ -27,13 +27,11 @@ public final class Ratty { final NimbusLookAndFeel nimbus = new NimbusLookAndFeel(); final UIDefaults defaults = nimbus.getDefaults(); - defaults.put("control", Color.GRAY); - defaults.put("nimbusBase", Color.BLACK); - defaults.put("text", Color.WHITE); - defaults.put("Table:\"Table.cellRenderer\".background", new Color(50, 50, 50)); - defaults.put("Table.alternateRowColor", new Color(75, 75, 75)); - defaults.put("TextField.foreground", Color.BLACK); - defaults.put("Tree.background", Color.GRAY); + defaults.put("control", new Color(245, 245, 245)); + defaults.put("nimbusBase", new Color(225, 225, 225)); + defaults.put("Table:\"Table.cellRenderer\".background", new Color(225, 225, 225)); + defaults.put("Table.alternateRowColor", new Color(175, 175, 175)); + defaults.put("Tree.background", new Color(245, 245, 245)); try { UIManager.setLookAndFeel(nimbus); diff --git a/Ratty/src/de/sogomn/rat/server/gui/FileTreePanel.java b/Ratty/src/de/sogomn/rat/server/gui/FileTreePanel.java index 5fb75db..610709b 100644 --- a/Ratty/src/de/sogomn/rat/server/gui/FileTreePanel.java +++ b/Ratty/src/de/sogomn/rat/server/gui/FileTreePanel.java @@ -38,7 +38,7 @@ public final class FileTreePanel { private static final int DEFAULT_WIDTH = 500; private static final int DEFAULT_HEIGHT = 500; - private static final BufferedImage[] MENU_ICONS = new SpriteSheet("/menu_icons_tree.png", 16, 16).getSprites(); + private static final BufferedImage[] MENU_ICONS = new SpriteSheet("/menu_icons_tree.png", 32, 32).getSprites(); public static final String REQUEST = "Show content"; public static final String DOWNLOAD = "Download file"; @@ -95,6 +95,7 @@ public final class FileTreePanel { dialog.setContentPane(scrollPane); dialog.pack(); dialog.setLocationByPlatform(true); + dialog.setIconImages(RattyGui.GUI_ICONS); } private void addMenuItem(final String name, final Icon icon) { diff --git a/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java b/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java index 9241792..5c67ee5 100644 --- a/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java +++ b/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java @@ -44,8 +44,9 @@ public final class RattyGui { private static final BufferedImage GUI_ICON_SMALL = ImageUtils.loadImage("/gui_icon.png"); private static final BufferedImage GUI_ICON_MEDIUM = ImageUtils.scaleImage(ImageUtils.loadImage("/gui_icon.png"), 64, 64); private static final BufferedImage GUI_ICON_LARGE = ImageUtils.scaleImage(ImageUtils.loadImage("/gui_icon.png"), 128, 128); - private static final ArrayList GUI_ICONS = new ArrayList(3); - private static final BufferedImage[] MENU_ICONS = new SpriteSheet("/menu_icons.png", 16, 16).getSprites(); + private static final BufferedImage[] MENU_ICONS = new SpriteSheet("/menu_icons.png", 32, 32).getSprites(); + + public static final ArrayList GUI_ICONS = new ArrayList(3); public static final String POPUP = "Open popup"; public static final String SCREENSHOT = "Take screenshot";