diff --git a/apps/jrobin/java/src/org/jrobin/graph/RrdGraphConstants.java b/apps/jrobin/java/src/org/jrobin/graph/RrdGraphConstants.java index a46508436..939670c20 100644 --- a/apps/jrobin/java/src/org/jrobin/graph/RrdGraphConstants.java +++ b/apps/jrobin/java/src/org/jrobin/graph/RrdGraphConstants.java @@ -161,12 +161,12 @@ public interface RrdGraphConstants { /** * Default minor grid color */ - Color DEFAULT_GRID_COLOR = new Color(100, 100, 100, 75); + Color DEFAULT_GRID_COLOR = new Color(171, 171, 171, 95); // Color DEFAULT_GRID_COLOR = new Color(140, 140, 140); /** * Default major grid color */ - Color DEFAULT_MGRID_COLOR = new Color(255, 91, 91, 110); + Color DEFAULT_MGRID_COLOR = new Color(255, 91, 91, 95); // Color DEFAULT_MGRID_COLOR = new Color(130, 30, 30); /** * Default font color @@ -251,7 +251,7 @@ public interface RrdGraphConstants { * Default font name, determined based on the current operating system */ String DEFAULT_FONT_NAME = System.getProperty("os.name").toLowerCase().contains("windows") ? - "Lucida Console" : "Monospaced"; + "Lucida Sans Typewriter" : "Monospaced"; /** * Default graph small font diff --git a/apps/jrobin/java/src/org/jrobin/graph/RrdGraphDef.java b/apps/jrobin/java/src/org/jrobin/graph/RrdGraphDef.java index 2f1221cd0..6f4e966a3 100644 --- a/apps/jrobin/java/src/org/jrobin/graph/RrdGraphDef.java +++ b/apps/jrobin/java/src/org/jrobin/graph/RrdGraphDef.java @@ -132,11 +132,11 @@ public class RrdGraphDef implements RrdGraphConstants { fontDir = new File(fontdirProperty); } - fonts[FONTTAG_DEFAULT] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); - fonts[FONTTAG_TITLE] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); - fonts[FONTTAG_AXIS] = new Font("Droid Sans Mono", Font.PLAIN, 10); - fonts[FONTTAG_UNIT] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); - fonts[FONTTAG_LEGEND] = new Font("Droid Sans Mono", Font.PLAIN, 10); + fonts[FONTTAG_DEFAULT] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8); + fonts[FONTTAG_TITLE] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 9); + fonts[FONTTAG_AXIS] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 7); + fonts[FONTTAG_UNIT] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8); + fonts[FONTTAG_LEGEND] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8); fonts[FONTTAG_WATERMARK] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 1).deriveFont(5.5F); } @@ -173,7 +173,7 @@ public class RrdGraphDef implements RrdGraphConstants { if (exception != null) { System.err.println(exception.getLocalizedMessage()); } - font = new Font("Monospaced", Font.PLAIN, 10); + font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } if (font == null) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java index be16bf077..1a5bb960d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java @@ -35,9 +35,13 @@ class SummaryRenderer { private final Log _log; private final SummaryListener _listener; private final I2PAppContext _context; + private static final Color GRID_COLOR = new Color(100, 100, 100, 75); + private static final Color MGRID_COLOR = new Color(255, 91, 91, 110); private static final Color AREA_COLOR = new Color(100, 160, 200, 200); private static final Color LINE_COLOR = new Color(0, 30, 110, 255); private static final Color RESTART_BAR_COLOR = new Color(223, 13, 13, 255); + private static final String DEFAULT_FONT_NAME = System.getProperty("os.name").toLowerCase().contains("windows") ? + "Lucida Console" : "Monospaced"; public SummaryRenderer(I2PAppContext ctx, SummaryListener lsnr) { _log = ctx.logManager().getLog(SummaryRenderer.class); @@ -125,6 +129,16 @@ class SummaryRenderer { ImageOutputStream ios = null; try { RrdGraphDef def = new RrdGraphDef(); + + // Override defaults + def.setColor(RrdGraphDef.COLOR_GRID, GRID_COLOR); + def.setColor(RrdGraphDef.COLOR_MGRID, MGRID_COLOR); + def.setFont(RrdGraphDef.FONTTAG_DEFAULT, new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10)); + def.setFont(RrdGraphDef.FONTTAG_TITLE, new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10)); + def.setFont(RrdGraphDef.FONTTAG_AXIS, new Font("Droid Sans Mono", Font.PLAIN, 10)); + def.setFont(RrdGraphDef.FONTTAG_UNIT, new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10)); + def.setFont(RrdGraphDef.FONTTAG_LEGEND, new Font("Droid Sans Mono", Font.PLAIN, 10)); + // improve text legibility String lang = Messages.getLanguage(_context); Font small = def.getSmallFont(); diff --git a/history.txt b/history.txt index f164aaf95..8f1de20ad 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2017-07-25 str4d + * Console: Move JRobin default color and font changes into SummaryRenderer + 2017-07-15 zzz * Console: Fix compile error with Jetty 9.2.22 (ticket #2019)