diff --git a/src/com/jtattoo/plaf/AbstractTheme.java b/src/com/jtattoo/plaf/AbstractTheme.java index f743f40..bb2b990 100644 --- a/src/com/jtattoo/plaf/AbstractTheme.java +++ b/src/com/jtattoo/plaf/AbstractTheme.java @@ -795,7 +795,7 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getControlTextFont() { if (controlFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - controlFont = new FontUIResource(DIALOG, Font.BOLD, 14); + controlFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold } else { controlFont = new FontUIResource(DIALOG, Font.PLAIN, 12); } @@ -806,7 +806,7 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getSystemTextFont() { if (systemFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - systemFont = new FontUIResource(DIALOG, Font.BOLD, 14); + systemFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold } else { systemFont = new FontUIResource(DIALOG, Font.PLAIN, 12); } @@ -817,7 +817,7 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getUserTextFont() { if (userFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - userFont = new FontUIResource(DIALOG, Font.BOLD, 14); + userFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold } else { userFont = new FontUIResource(DIALOG, Font.PLAIN, 12); } @@ -828,7 +828,7 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getMenuTextFont() { if (menuFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - menuFont = new FontUIResource(DIALOG, Font.BOLD, 14); + menuFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold } else { menuFont = new FontUIResource(DIALOG, Font.PLAIN, 12); } @@ -839,9 +839,9 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getWindowTitleFont() { if (windowTitleFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - windowTitleFont = new FontUIResource(DIALOG, Font.BOLD, 14); + windowTitleFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold } else { - windowTitleFont = new FontUIResource(DIALOG, Font.BOLD, 12); + windowTitleFont = new FontUIResource(DIALOG, Font.PLAIN, 12); // bold } } return windowTitleFont; @@ -850,7 +850,7 @@ public abstract class AbstractTheme extends MetalTheme { public FontUIResource getSubTextFont() { if (smallFont == null) { if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) { - smallFont = new FontUIResource(DIALOG, Font.BOLD, 12); + smallFont = new FontUIResource(DIALOG, Font.PLAIN, 12); // bold } else { smallFont = new FontUIResource(DIALOG, Font.PLAIN, 10); } diff --git a/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java b/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java index ed71878..55bbaef 100644 --- a/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java +++ b/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java @@ -125,11 +125,11 @@ public class HiFiDefaultTheme extends AbstractTheme { tooltipForegroundColor = white; tooltipBackgroundColor = new ColorUIResource(24, 24, 24); - controlFont = new FontUIResource("Dialog", Font.BOLD, 12); - systemFont = new FontUIResource("Dialog", Font.BOLD, 12); - userFont = new FontUIResource("Dialog", Font.BOLD, 12); - menuFont = new FontUIResource("Dialog", Font.BOLD, 12); - windowTitleFont = new FontUIResource("Dialog", Font.BOLD, 12); + controlFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold + systemFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold + userFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold + menuFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold + windowTitleFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold smallFont = new FontUIResource("Dialog", Font.PLAIN, 10); } diff --git a/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java b/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java index 230c141..4de3624 100644 --- a/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java +++ b/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java @@ -42,18 +42,18 @@ public class HiFiLookAndFeel extends AbstractLookAndFeel { private static final Properties giantFontProps = new Properties(); static { - smallFontProps.setProperty("controlTextFont", "Dialog bold 10"); - smallFontProps.setProperty("systemTextFont", "Dialog bold 10"); + smallFontProps.setProperty("controlTextFont", "Dialog 10"); // bold + smallFontProps.setProperty("systemTextFont", "Dialog 10"); // bold smallFontProps.setProperty("userTextFont", "Dialog 10"); - smallFontProps.setProperty("menuTextFont", "Dialog bold 10"); - smallFontProps.setProperty("windowTitleFont", "Dialog bold 10"); + smallFontProps.setProperty("menuTextFont", "Dialog 10"); // bold + smallFontProps.setProperty("windowTitleFont", "Dialog 10"); // bold smallFontProps.setProperty("subTextFont", "Dialog 8"); - largeFontProps.setProperty("controlTextFont", "Dialog bold 14"); - largeFontProps.setProperty("systemTextFont", "Dialog bold 14"); - largeFontProps.setProperty("userTextFont", "Dialog bold 14"); - largeFontProps.setProperty("menuTextFont", "Dialog bold 14"); - largeFontProps.setProperty("windowTitleFont", "Dialog bold 14"); + largeFontProps.setProperty("controlTextFont", "Dialog 14"); // bold + largeFontProps.setProperty("systemTextFont", "Dialog 14"); // bold + largeFontProps.setProperty("userTextFont", "Dialog 14"); // bold + largeFontProps.setProperty("menuTextFont", "Dialog 14"); // bold + largeFontProps.setProperty("windowTitleFont", "Dialog 14"); // bold largeFontProps.setProperty("subTextFont", "Dialog 12"); giantFontProps.setProperty("controlTextFont", "Dialog 18"); diff --git a/src/uk/co/majenko/audiobookrecorder/FlashPanel.java b/src/uk/co/majenko/audiobookrecorder/FlashPanel.java index d606d64..57fc59a 100644 --- a/src/uk/co/majenko/audiobookrecorder/FlashPanel.java +++ b/src/uk/co/majenko/audiobookrecorder/FlashPanel.java @@ -27,6 +27,8 @@ public class FlashPanel extends JPanel { public void setFlash(boolean f) { flash = f; + col = true; + for (Component o : getComponents()) { ((JComponent)o).setVisible(!f); } @@ -42,7 +44,7 @@ public class FlashPanel extends JPanel { if (col) { g.setColor(Color.RED); } else { - g.setColor(Color.BLACK); + g.setColor(Color.GREEN); } Dimension d = getSize(); g.fillRect(0, 0, d.width, d.height);