diff --git a/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java b/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java index cf952648..bc29a295 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java @@ -36,7 +36,7 @@ public class TerminalStrip extends AbstractTransparentComponent { public static Color BOARD_COLOR = Color.decode("#CD8500"); public static Color BORDER_COLOR = BOARD_COLOR.darker(); - public static Color TERMINAL_COLOR = Color.decode("#C3E4ED"); + public static Color TERMINAL_COLOR = Color.lightGray; public static Color TERMINAL_BORDER_COLOR = TERMINAL_COLOR.darker(); public static int EDGE_RADIUS = 2; public static Size HOLE_SIZE = new Size(0.06d, SizeUnit.in); diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java index 08e42d9a..093ec6bb 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java @@ -38,7 +38,7 @@ public class TransistorTO1 extends AbstractTransparentComponent { private static final long serialVersionUID = 1L; - public static Color BODY_COLOR = Color.decode("#D0E0EF"); + public static Color BODY_COLOR = Color.lightGray; public static Color BORDER_COLOR = BODY_COLOR.darker(); public static Color PIN_COLOR = Color.decode("#00B2EE"); public static Color PIN_BORDER_COLOR = PIN_COLOR.darker(); diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java index 8e3674b5..8db8f603 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java @@ -42,7 +42,7 @@ public class TransistorTO220 extends AbstractTransparentComponent { public static Color BORDER_COLOR = Color.gray.darker(); public static Color PIN_COLOR = Color.decode("#00B2EE"); public static Color PIN_BORDER_COLOR = PIN_COLOR.darker(); - public static Color TAB_COLOR = Color.decode("#C3E4ED"); + public static Color TAB_COLOR = Color.lightGray; public static Color TAB_BORDER_COLOR = TAB_COLOR.darker(); public static Color LABEL_COLOR = Color.white; public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in); diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java index 5f6d10c0..fa2f0cfe 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java @@ -40,7 +40,7 @@ public class TransistorTO3 extends AbstractTransparentComponent { private static final long serialVersionUID = 1L; - public static Color BODY_COLOR = Color.decode("#D0E0EF"); + public static Color BODY_COLOR = Color.lightGray; public static Color BORDER_COLOR = BODY_COLOR.darker(); public static Color PIN_COLOR = Color.decode("#00B2EE"); public static Color PIN_BORDER_COLOR = PIN_COLOR.darker(); diff --git a/diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java b/diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java index c8e66640..b6c287f5 100644 --- a/diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java +++ b/diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java @@ -1,6 +1,5 @@ package org.diylc.components.smd; - import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Composite; @@ -24,8 +23,6 @@ import org.diylc.core.Project; import org.diylc.core.Theme; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.EditableProperty; -import org.diylc.core.annotations.PositiveMeasureValidator; -import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; @@ -34,7 +31,7 @@ public abstract class PassiveSMDComponent extends AbstractTransparentComponen private static final long serialVersionUID = 1L; - public static Color PIN_COLOR = Color.decode("#00B2EE"); + public static Color PIN_COLOR = Color.lightGray; public static Color PIN_BORDER_COLOR = PIN_COLOR.darker(); public static Color LABEL_COLOR = Color.white; public static int EDGE_RADIUS = 4; diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 70a22191..52efaba8 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ