diff --git a/Ratty/res/gui_icon.png b/Ratty/res/gui_icon.png index 4bd0a19..dc18e52 100644 Binary files a/Ratty/res/gui_icon.png and b/Ratty/res/gui_icon.png differ diff --git a/Ratty/res/menu_icons.png b/Ratty/res/menu_icons.png index 6cacc0d..94d26f4 100644 Binary files a/Ratty/res/menu_icons.png and b/Ratty/res/menu_icons.png differ diff --git a/Ratty/res/menu_icons_tree.png b/Ratty/res/menu_icons_tree.png index 936c5f9..74fa881 100644 Binary files a/Ratty/res/menu_icons_tree.png and b/Ratty/res/menu_icons_tree.png differ 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";