diff --git a/Ghidra/Features/GraphServices/certification.manifest b/Ghidra/Features/GraphServices/certification.manifest index 96cfda73b6..72a20ab72f 100644 --- a/Ghidra/Features/GraphServices/certification.manifest +++ b/Ghidra/Features/GraphServices/certification.manifest @@ -17,6 +17,7 @@ src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png||GHIDRA|| src/main/help/help/topics/GraphServices/images/ExportDialog.png||GHIDRA||||END| src/main/resources/images/Lasso.png||GHIDRA||||END| src/main/resources/images/magnifier.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/project-open.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/redspheregraph.png||GHIDRA||||END| src/main/resources/images/sat2.png||GHIDRA||||END| src/main/resources/images/tree.png||GHIDRA||||END| diff --git a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png index e28aed0f39..9f7643a338 100644 Binary files a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png and b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png differ diff --git a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultDisplayGraphIcons.java b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultDisplayGraphIcons.java index 95362dc6f1..57be87f7ad 100644 --- a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultDisplayGraphIcons.java +++ b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultDisplayGraphIcons.java @@ -15,8 +15,6 @@ */ package ghidra.graph.visualization; -import java.awt.*; - import javax.swing.Icon; import resources.Icons; @@ -29,35 +27,11 @@ final class DefaultDisplayGraphIcons { private DefaultDisplayGraphIcons() { } - public static final Icon SATELLITE_VIEW_ICON = new SatelliteIcon(); + public static final Icon SATELLITE_VIEW_ICON = Icons.get("images/project-open.png"); public static final Icon VIEW_MAGNIFIER_ICON = Icons.get("images/magnifier.png"); public static final Icon PROGRAM_GRAPH_ICON = Icons.get("images/redspheregraph.png"); public static final Icon LAYOUT_ALGORITHM_ICON = Icons.get("images/katomic.png"); public static final Icon LASSO_ICON = Icons.get("images/Lasso.png"); public static final Icon FILTER_ICON = Icons.CONFIGURE_FILTER_ICON; - private static class SatelliteIcon implements Icon { - - @Override - public void paintIcon(Component c, Graphics g, int x, int y) { - g.setColor(Color.WHITE); - g.fillRect(x, y, 16, 16); - g.setColor(Color.LIGHT_GRAY); - g.fillRect(x + 8, y + 8, 7, 7); - g.setColor(Color.DARK_GRAY); - g.drawRect(x, y, 16, 16); - } - - @Override - public int getIconWidth() { - return 16; - } - - @Override - public int getIconHeight() { - return 16; - } - - } - } diff --git a/Ghidra/Features/GraphServices/src/main/resources/images/project-open.png b/Ghidra/Features/GraphServices/src/main/resources/images/project-open.png new file mode 100644 index 0000000000..be14845f70 Binary files /dev/null and b/Ghidra/Features/GraphServices/src/main/resources/images/project-open.png differ