diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 23b8ccfa..438b84b1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -1,62 +1,20 @@ - - metric - true - - - zoom - 1.0 - - - lastPath - C:\Documents and Settings\Branislav Stojkovic\My Documents\Downloads - theme - Light + Blueprint - 255 - 255 - 255 + 3 + 122 + 198 255 - 240 - 240 - 240 - 240 - - - 0 - 0 - 0 + 29 + 140 + 193 255 - + - - stickyPoints - true - - - antiAliasing - true - - - hiQualityRender - true - - - showTemplatesAtStartup - false - - - exportGrid - true - - - default.org.diylc.components.semiconductors.TransistorTO92:Orientation - DEFAULT - \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Theme.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Theme.java index d75eb25e..4a232448 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Theme.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Theme.java @@ -6,25 +6,18 @@ import java.io.Serializable; public class Theme implements Serializable { private static final long serialVersionUID = 1L; - + private String name; private Color bgColor; private Color gridColor; - private Color componentBodyColor; - private Color componentBorderColor; - private Color labelColor; - public Theme(String name, Color bgColor, Color gridColor, Color componentBodyColor, - Color componentBorderColor, Color labelColor) { + public Theme(String name, Color bgColor, Color gridColor) { super(); this.name = name; this.bgColor = bgColor; this.gridColor = gridColor; - this.componentBodyColor = componentBodyColor; - this.componentBorderColor = componentBorderColor; - this.labelColor = labelColor; } - + public String getName() { return name; } @@ -37,29 +30,11 @@ public class Theme implements Serializable { return gridColor; } - public Color getComponentBodyColor() { - return componentBodyColor; - } - - public Color getComponentBorderColor() { - return componentBorderColor; - } - - public Color getLabelColor() { - return labelColor; - } - @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((bgColor == null) ? 0 : bgColor.hashCode()); - result = prime * result - + ((componentBodyColor == null) ? 0 : componentBodyColor.hashCode()); - result = prime * result - + ((componentBorderColor == null) ? 0 : componentBorderColor.hashCode()); - result = prime * result - + ((labelColor == null) ? 0 : labelColor.hashCode()); result = prime * result + ((gridColor == null) ? 0 : gridColor.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); return result; @@ -79,21 +54,6 @@ public class Theme implements Serializable { return false; } else if (!bgColor.equals(other.bgColor)) return false; - if (componentBodyColor == null) { - if (other.componentBodyColor != null) - return false; - } else if (!componentBodyColor.equals(other.componentBodyColor)) - return false; - if (componentBorderColor == null) { - if (other.componentBorderColor != null) - return false; - } else if (!componentBorderColor.equals(other.componentBorderColor)) - return false; - if (labelColor == null) { - if (other.labelColor != null) - return false; - } else if (!labelColor.equals(other.labelColor)) - return false; if (gridColor == null) { if (other.gridColor != null) return false; @@ -106,7 +66,7 @@ public class Theme implements Serializable { return false; return true; } - + @Override public String toString() { return name; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/DrawingManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/DrawingManager.java index 88332bc2..8cfc3c6d 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/DrawingManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/DrawingManager.java @@ -53,8 +53,7 @@ public class DrawingManager { public static Color CONTROL_POINT_COLOR = Color.black; public static Color SELECTED_CONTROL_POINT_COLOR = Color.green; - private Theme theme = new Theme("Light", Constants.CANVAS_COLOR, GRID_COLOR, null, - null, null); + private Theme theme = new Theme("Light", Constants.CANVAS_COLOR, GRID_COLOR); // Keeps Area object of each drawn component. private Map, Area> componentAreaMap; diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Blueprint.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Blueprint.xml index 0d7251b3..8e74cee5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Blueprint.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Blueprint.xml @@ -12,22 +12,4 @@ 193 255 - - 255 - 255 - 255 - 255 - - - 255 - 255 - 255 - 0 - - - 255 - 255 - 255 - 255 - \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Dark.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Dark.xml index 354380f3..ca9d5444 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Dark.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Dark.xml @@ -12,22 +12,4 @@ 40 255 - - 255 - 255 - 255 - 255 - - - 255 - 255 - 255 - 0 - - - 255 - 255 - 255 - 255 - \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Light.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Light.xml index 9620bd5c..cfdc69d9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Light.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Light.xml @@ -12,10 +12,4 @@ 240 240 - - 0 - 0 - 0 - 255 - \ No newline at end of file