Added 'Font Size Override' property to most components that display text

to allow control over font size

diylc/diylc-core/src/org/diylc/components/AbstractLabeledComponent.java

@@ -0,0 +1,40 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.components;
+
+import org.diylc.core.annotations.EditableProperty;
+
+public abstract class AbstractLabeledComponent<T> extends AbstractTransparentComponent<T> {
+
+  private static final long serialVersionUID = 1L;
+
+  protected Integer fontSizeOverride;
+  
+  @EditableProperty(name = "Font Size Override")
+  public Integer getFontSizeOverride() {
+    return fontSizeOverride;
+  }
+  
+  public void setFontSizeOverride(Integer fontSizeOverride) {
+    this.fontSizeOverride = fontSizeOverride;
+  }
+}

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -3345,5 +3345,21 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>13</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2020-12-06 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>Added 'Font Size Override' property to most components that display text to allow control over font size</description>
+				</org.diylc.appframework.update.Change>								
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>

diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java

@@ -62,7 +62,7 @@ import org.diylc.utils.Constants;
  * 
  * @author Branislav Stojkovic
  */
-public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComponent<T> {
+public abstract class AbstractLeadedComponent<T> extends AbstractLabeledComponent<T> {
 
   private static final long serialVersionUID = 1L;
 
@@ -324,6 +324,11 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+      
     if (useShapeRectAsPosition()) {
       g2d.translate(shapeRect.getX(), shapeRect.getY());
     }

diylc/diylc-library/src/org/diylc/components/AbstractMultiPartComponent.java

@@ -10,7 +10,7 @@ import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 
 
-public abstract class AbstractMultiPartComponent<T> extends AbstractTransparentComponent<T> {
+public abstract class AbstractMultiPartComponent<T> extends AbstractLabeledComponent<T> {
 
   private static final long serialVersionUID = 1L;
 

diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java

@@ -248,6 +248,11 @@ public class CliffJack1_4 extends AbstractMultiPartComponent<String> {
     }
     g2d.setColor(finalLabelColor);
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     double centerX = (controlPoints[0].getX() + controlPoints[3].getX()) / 2;
     double centerY = (controlPoints[0].getY() + controlPoints[3].getY()) / 2;
     StringUtils.drawCenteredText(g2d, name, centerX, centerY, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);

diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java

@@ -268,6 +268,11 @@ public class ClosedJack1_4 extends AbstractMultiPartComponent<String> {
     }
     g2d.setColor(finalLabelColor);
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Rectangle bounds = body[0].getBounds();
     double centerX = bounds.getX() + bounds.width / 2;
     double centerY = bounds.getY() + bounds.height / 2;

diylc/diylc-library/src/org/diylc/components/electromechanical/FuseHolderPanel.java

@@ -225,6 +225,11 @@ public class FuseHolderPanel extends AbstractMultiPartComponent<String> {
     
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/electromechanical/IECSocket.java

@@ -401,4 +401,10 @@ public class IECSocket extends AbstractMultiPartComponent<String> {
     Rectangle2D bounds = getBody()[0].getBounds2D();
     return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
   }
+  
+  @Deprecated
+  @Override
+  public Integer getFontSizeOverride() {
+    return super.getFontSizeOverride();
+  }
 }

diylc/diylc-library/src/org/diylc/components/electromechanical/MiniRelay.java

@@ -37,7 +37,7 @@ import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
@@ -55,7 +55,7 @@ import org.diylc.utils.Constants;
 @ComponentDescriptor(name = "Mini Relay", author = "Branislav Stojkovic", category = "Electro-Mechanical",
     instanceNamePrefix = "RY", description = "Miniature PCB mount relay, like Omron G5V-1 or G5V-2",
     zOrder = IDIYComponent.COMPONENT, enableCache = true)
-public class MiniRelay extends AbstractTransparentComponent<String> {
+public class MiniRelay extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
 
@@ -342,6 +342,11 @@ public class MiniRelay extends AbstractTransparentComponent<String> {
     }
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java

@@ -275,4 +275,10 @@ public class PlasticDCJack extends AbstractMultiPartComponent<String> {
     Rectangle2D bounds = getBody()[0].getBounds2D();
     return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
   }
+  
+  @Deprecated
+  @Override
+  public Integer getFontSizeOverride() {
+    return super.getFontSizeOverride();
+  }
 }

diylc/diylc-library/src/org/diylc/components/electromechanical/RCAJack.java

@@ -332,4 +332,10 @@ public class RCAJack extends AbstractMultiPartComponent<String> {
     Rectangle2D bounds = getBody()[1].getBounds2D();
     return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
   }
+  
+  @Deprecated
+  @Override
+  public Integer getFontSizeOverride() {
+    return super.getFontSizeOverride();
+  }
 }

diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySelectorSwitch.java

@@ -152,6 +152,11 @@ public class RotarySelectorSwitch extends AbstractMultiPartComponent<String> {
     if (showLabels) {
       g2d.setColor(TERMINAL_COLOR.darker());
       g2d.setFont(project.getFont().deriveFont(project.getFont().getSize2D() * 0.8f));
+      
+      // Override font size
+      if (getFontSizeOverride() != null)
+        g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+      
       for (int i = 2; i < body.length; i++) {
         Rectangle2D bounds = body[i].getBounds2D();
         double x = (int) ((bounds.getCenterX() + controlPoints[i - 2].getX()) / 2);

diylc/diylc-library/src/org/diylc/components/guitar/AbstractGuitarPickup.java

@@ -34,7 +34,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.Orientation;
 import org.diylc.common.OrientationHV;
 import org.diylc.common.VerticalAlignment;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.Project;
 import org.diylc.core.Theme;
@@ -44,7 +44,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-public abstract class AbstractGuitarPickup extends AbstractTransparentComponent<String> {
+public abstract class AbstractGuitarPickup extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
   
@@ -112,6 +112,11 @@ public abstract class AbstractGuitarPickup extends AbstractTransparentComponent<
     }
     g2d.setColor(finalLabelColor);
     g2d.setFont(project.getFont().deriveFont(Font.BOLD));
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Rectangle bounds = getBody()[0].getBounds();
     
     AffineTransform originalTx = g2d.getTransform();

diylc/diylc-library/src/org/diylc/components/passive/AbstractPotentiometer.java

@@ -24,13 +24,13 @@ package org.diylc.components.passive;
 import java.awt.geom.Point2D;
 
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.VisibilityPolicy;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.PositiveMeasureValidator;
 import org.diylc.core.measures.Resistance;
 
-public abstract class AbstractPotentiometer extends AbstractTransparentComponent<Resistance> {
+public abstract class AbstractPotentiometer extends AbstractLabeledComponent<Resistance> {
 
   private static final long serialVersionUID = 1L;
 

diylc/diylc-library/src/org/diylc/components/passive/AudioTransformer.java

@@ -311,6 +311,10 @@ public class AudioTransformer extends AbstractMultiPartComponent<String> {
 
     g2d.setFont(project.getFont());
     
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     // Draw winding designations
     Point2D wPoint = new Point2D.Double((int) (controlPoints[0].getX() + project.getFontSize()), (int) (controlPoints[0].getY() + leadSpacing.convertToPixels()));
     AffineTransform tx = getTx();

diylc/diylc-library/src/org/diylc/components/passive/MultiSectionCapacitor.java

@@ -41,7 +41,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
 import org.diylc.common.VerticalAlignment;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
@@ -59,7 +59,7 @@ import org.diylc.utils.Constants;
 @ComponentDescriptor(name = "Multi-Section Capacitor", author = "Branislav Stojkovic", category = "Passive",
     instanceNamePrefix = "C", description = "Multi-section vertically mounted electrolytic capacitor, similar to JJ, CE and others",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true)
-public class MultiSectionCapacitor extends AbstractTransparentComponent<Capacitance[]> {
+public class MultiSectionCapacitor extends AbstractLabeledComponent<Capacitance[]> {
 
   private static final long serialVersionUID = 1L;
 
@@ -391,6 +391,11 @@ public class MultiSectionCapacitor extends AbstractTransparentComponent<Capacita
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java

@@ -302,6 +302,11 @@ public class PotentiometerPanel extends AbstractPotentiometer {
     }
     // Draw caption.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/passive/TrimmerPotentiometer.java

@@ -417,6 +417,11 @@ public class TrimmerPotentiometer extends AbstractPotentiometer {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorPackage.java

@@ -32,12 +32,12 @@ import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.Orientation;
 import org.diylc.common.VerticalAlignment;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.VisibilityPolicy;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.netlist.ISpiceMapper;
 
-public abstract class AbstractTransistorPackage extends AbstractTransparentComponent<String> implements ISpiceMapper {
+public abstract class AbstractTransistorPackage extends AbstractLabeledComponent<String> implements ISpiceMapper {
   
   private static final long serialVersionUID = 1L;
   

diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java

@@ -43,8 +43,8 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
 import org.diylc.common.VerticalAlignment;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.components.AbstractLeadedComponent.LabelOriantation;
-import org.diylc.components.AbstractTransparentComponent;
 import org.diylc.components.RoundedPolygon;
 import org.diylc.components.transform.DIL_ICTransformer;
 import org.diylc.core.ComponentState;
@@ -66,7 +66,7 @@ import org.diylc.utils.Constants;
     instanceNamePrefix = "BR", description = "Few variations of bridge rectifier chips",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class,
     enableCache = true)
-public class BridgeRectifier extends AbstractTransparentComponent<String> {
+public class BridgeRectifier extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
   
@@ -410,6 +410,11 @@ public class BridgeRectifier extends AbstractTransparentComponent<String> {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       Theme theme =

diylc/diylc-library/src/org/diylc/components/semiconductors/DIL_IC.java

@@ -39,7 +39,7 @@ import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.components.transform.DIL_ICTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -59,7 +59,7 @@ import org.diylc.utils.Constants;
     instanceNamePrefix = "IC", description = "Dual-in-line package IC",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class,
     enableCache = true)
-public class DIL_IC extends AbstractTransparentComponent<String> {
+public class DIL_IC extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
 
@@ -360,6 +360,11 @@ public class DIL_IC extends AbstractTransparentComponent<String> {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       Theme theme =

diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java

@@ -203,6 +203,11 @@ public class TransistorTO1 extends AbstractTransistorPackage {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO126.java

@@ -291,6 +291,11 @@ public class TransistorTO126 extends AbstractTransistorPackage {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO220.java

@@ -328,6 +328,11 @@ public class TransistorTO220 extends AbstractTransistorPackage {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO3.java

@@ -40,7 +40,7 @@ import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
@@ -57,7 +57,7 @@ import org.diylc.utils.Constants;
 @ComponentDescriptor(name = "Transistor (TO-3)", author = "Branislav Stojkovic", category = "Semiconductors",
     instanceNamePrefix = "Q", description = "Transistor with large metal body",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true)
-public class TransistorTO3 extends AbstractTransparentComponent<String> {
+public class TransistorTO3 extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
 
@@ -270,6 +270,11 @@ public class TransistorTO3 extends AbstractTransparentComponent<String> {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO92.java

@@ -226,6 +226,11 @@ public class TransistorTO92 extends AbstractTransistorPackage {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       Theme theme =

diylc/diylc-library/src/org/diylc/components/smd/PassiveSMDComponent.java

@@ -37,7 +37,7 @@ import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
@@ -48,7 +48,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponent<T> {
+public abstract class PassiveSMDComponent<T> extends AbstractLabeledComponent<T> {
 
   private static final long serialVersionUID = 1L;
 
@@ -291,6 +291,11 @@ public abstract class PassiveSMDComponent<T> extends AbstractTransparentComponen
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       Theme theme =

diylc/diylc-library/src/org/diylc/components/tube/SubminiTube.java

@@ -36,7 +36,7 @@ import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLabeledComponent;
 import org.diylc.components.transform.TO220Transformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -55,7 +55,7 @@ import org.diylc.utils.Constants;
     instanceNamePrefix = "V", description = "Sub-miniature (pencil) vacuum tube",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE,
     transformer = TO220Transformer.class)
-public class SubminiTube extends AbstractTransparentComponent<String> {
+public class SubminiTube extends AbstractLabeledComponent<String> {
 
   private static final long serialVersionUID = 1L;
 
@@ -421,6 +421,11 @@ public class SubminiTube extends AbstractTransparentComponent<String> {
 
     // Draw label.
     g2d.setFont(project.getFont());
+    
+    // Override font size
+    if (getFontSizeOverride() != null)
+      g2d.setFont(g2d.getFont().deriveFont(1f * getFontSizeOverride()));
+    
     Color finalLabelColor;
     if (outlineMode) {
       finalLabelColor =

diylc/diylc-swing/lang/Deutsch.txt

@@ -161,6 +161,7 @@ Font|Schriftart
 Font Bold|Fettschrift
 Font Italic|Kursivschrift
 Font Size|Schriftgröße
+Font Size Override|Überschreiben der Schriftgröße
 Four|Vier
 Full|Voll 
 Fuse|Sicherung 

diylc/diylc-swing/lang/English.txt

@@ -157,6 +157,7 @@ Font
 Font Bold
 Font Italic
 Font Size
+Font Size Override
 Four
 Full
 Fuse

diylc/diylc-swing/lang/Español.txt

@@ -158,6 +158,7 @@ Font|Fuente
 Font Bold|Negrita
 Font Italic|Itálica
 Font Size|Tamaño de fuente
+Font Size Override|Anulación del tamaño de fuente
 Four|Cuatro
 Full|Lleno
 Fuse|Fusible

diylc/diylc-swing/lang/Français.txt

@@ -158,6 +158,7 @@ Font|Police
 Font Bold|Gras
 Font Italic|Italic
 Font Size|Taille de police
+Font Size Override|Taille de police (re)
 Four|Quatre
 Full|Complet
 Fuse|Fusible

diylc/diylc-swing/lang/Italiano.txt

@@ -161,6 +161,7 @@ Font|Carattere
 Font Bold|Carattere grassetto
 Font Italic|Carattere corsivo
 Font Size|Dimensione carattere
+Font Size Override|Sostituzione dimensione carattere
 Four|Quattro
 Full|Pieno
 Fuse|Fusibile

diylc/diylc-swing/lang/Nederlands.txt

@@ -161,6 +161,7 @@ Font|Lettertype
 Font Bold|Vet lettertype 
 Font Italic|Cursief lettertype 
 Font Size|Tekengrootte
+Font Size Override|Tekengrootte overschrijven
 Four|Vier
 Full|Vol
 Fuse|Zekering

diylc/diylc-swing/lang/Srpski.txt

@@ -157,6 +157,7 @@ Font
 Font Bold
 Font Italic
 Font Size|Veličina Fonta
+Font Size Override|Veličina Fonta
 Four|Četiri
 Full|Puno
 Fuse|Osigurač

diylc/diylc-swing/src/org/diylc/swing/gui/editor/IntEditor.java

@@ -40,6 +40,7 @@ public class IntEditor extends DoubleTextField {
     setLayout(new BorderLayout());
     if (property.isReadOnly())
       setEnabled(false);
+    if (property.getValue() != null)
       setValue((double) (Integer) property.getValue());
     addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY, new PropertyChangeListener() {
 

diylc/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java

@@ -142,6 +142,7 @@ public class PropertyEditorDialog extends ButtonDialog {
       gbc.weightx = 1;
       gbc.insets = new Insets(2, 2, 2, 2);
 
+      try {
         Component editor = FieldEditorFactory.createFieldEditor(property);
         editor.addKeyListener(new KeyAdapter() {
   
@@ -181,6 +182,9 @@ public class PropertyEditorDialog extends ButtonDialog {
         }
   
         gbc.gridy++;
+      } catch (Exception e) {
+        LOG.error("Error creating editor for " + property.getName(), e);
+      }
     }
 
     return editorPanel;