diff --git a/images/acars.png b/images/acars.png new file mode 100644 index 00000000..428961aa Binary files /dev/null and b/images/acars.png differ diff --git a/images/ais.png b/images/ais.png new file mode 100644 index 00000000..723c9fdd Binary files /dev/null and b/images/ais.png differ diff --git a/images/am.png b/images/am.png new file mode 100644 index 00000000..716483db Binary files /dev/null and b/images/am.png differ diff --git a/images/aprs.png b/images/aprs.png new file mode 100644 index 00000000..73e29da6 Binary files /dev/null and b/images/aprs.png differ diff --git a/images/dmr.png b/images/dmr.png new file mode 100644 index 00000000..3da15265 Binary files /dev/null and b/images/dmr.png differ diff --git a/images/fm.png b/images/fm.png index 203d2538..0555d379 100644 Binary files a/images/fm.png and b/images/fm.png differ diff --git a/images/fm_green.png b/images/fm_green.png deleted file mode 100644 index 4501a930..00000000 Binary files a/images/fm_green.png and /dev/null differ diff --git a/images/fm_red.png b/images/fm_red.png deleted file mode 100644 index 129971dd..00000000 Binary files a/images/fm_red.png and /dev/null differ diff --git a/images/fm_yellow.png b/images/fm_yellow.png deleted file mode 100644 index 9cddbfe5..00000000 Binary files a/images/fm_yellow.png and /dev/null differ diff --git a/images/ltr.png b/images/ltr.png new file mode 100644 index 00000000..fca9507c Binary files /dev/null and b/images/ltr.png differ diff --git a/images/ltr_net.png b/images/ltr_net.png index 84b27cb7..2b36b175 100644 Binary files a/images/ltr_net.png and b/images/ltr_net.png differ diff --git a/images/ltr_net_green.png b/images/ltr_net_green.png deleted file mode 100644 index 32bd7950..00000000 Binary files a/images/ltr_net_green.png and /dev/null differ diff --git a/images/ltr_net_red.png b/images/ltr_net_red.png deleted file mode 100644 index 39cd09c4..00000000 Binary files a/images/ltr_net_red.png and /dev/null differ diff --git a/images/ltr_net_yellow.png b/images/ltr_net_yellow.png deleted file mode 100644 index 5b009243..00000000 Binary files a/images/ltr_net_yellow.png and /dev/null differ diff --git a/images/ltr_standard.png b/images/ltr_standard.png deleted file mode 100644 index 88ac7b41..00000000 Binary files a/images/ltr_standard.png and /dev/null differ diff --git a/images/ltr_standard_green.png b/images/ltr_standard_green.png deleted file mode 100644 index 28867b57..00000000 Binary files a/images/ltr_standard_green.png and /dev/null differ diff --git a/images/ltr_standard_red.png b/images/ltr_standard_red.png deleted file mode 100644 index c4db782e..00000000 Binary files a/images/ltr_standard_red.png and /dev/null differ diff --git a/images/ltr_standard_yellow.png b/images/ltr_standard_yellow.png deleted file mode 100644 index 4fcca3d6..00000000 Binary files a/images/ltr_standard_yellow.png and /dev/null differ diff --git a/images/motorola_type_2.png b/images/motorola_type_2.png new file mode 100644 index 00000000..2d69cf00 Binary files /dev/null and b/images/motorola_type_2.png differ diff --git a/images/mpt1327.png b/images/mpt1327.png index defa43a1..7f6c520d 100644 Binary files a/images/mpt1327.png and b/images/mpt1327.png differ diff --git a/images/mpt1327_green.png b/images/mpt1327_green.png deleted file mode 100644 index 5d6f1783..00000000 Binary files a/images/mpt1327_green.png and /dev/null differ diff --git a/images/mpt1327_red.png b/images/mpt1327_red.png deleted file mode 100644 index 4403906c..00000000 Binary files a/images/mpt1327_red.png and /dev/null differ diff --git a/images/mpt1327_yellow.png b/images/mpt1327_yellow.png deleted file mode 100644 index ba095ac0..00000000 Binary files a/images/mpt1327_yellow.png and /dev/null differ diff --git a/images/nxdn.png b/images/nxdn.png new file mode 100644 index 00000000..b21cc0d2 Binary files /dev/null and b/images/nxdn.png differ diff --git a/images/p25_1.png b/images/p25_1.png new file mode 100644 index 00000000..246e6868 Binary files /dev/null and b/images/p25_1.png differ diff --git a/images/p25_2.png b/images/p25_2.png new file mode 100644 index 00000000..d7094220 Binary files /dev/null and b/images/p25_2.png differ diff --git a/images/passport.png b/images/passport.png index cdf28214..8424e541 100644 Binary files a/images/passport.png and b/images/passport.png differ diff --git a/images/passport_green.png b/images/passport_green.png deleted file mode 100644 index 91721089..00000000 Binary files a/images/passport_green.png and /dev/null differ diff --git a/images/passport_red.png b/images/passport_red.png deleted file mode 100644 index bc741229..00000000 Binary files a/images/passport_red.png and /dev/null differ diff --git a/images/passport_yellow.png b/images/passport_yellow.png deleted file mode 100644 index 6071ae45..00000000 Binary files a/images/passport_yellow.png and /dev/null differ diff --git a/images/site_green.png b/images/site_green.png deleted file mode 100644 index 22b28d08..00000000 Binary files a/images/site_green.png and /dev/null differ diff --git a/images/site_red.png b/images/site_red.png deleted file mode 100644 index 46f4848b..00000000 Binary files a/images/site_red.png and /dev/null differ diff --git a/images/site_yellow.png b/images/site_yellow.png deleted file mode 100644 index cbf99322..00000000 Binary files a/images/site_yellow.png and /dev/null differ diff --git a/images/system_green.png b/images/system_green.png deleted file mode 100644 index 6980c38b..00000000 Binary files a/images/system_green.png and /dev/null differ diff --git a/images/system_red.png b/images/system_red.png deleted file mode 100644 index d7ef0535..00000000 Binary files a/images/system_red.png and /dev/null differ diff --git a/images/system_yellow.png b/images/system_yellow.png deleted file mode 100644 index 34025600..00000000 Binary files a/images/system_yellow.png and /dev/null differ diff --git a/src/controller/BaseNode.java b/src/controller/BaseNode.java index d41752ba..18dea516 100644 --- a/src/controller/BaseNode.java +++ b/src/controller/BaseNode.java @@ -17,6 +17,7 @@ ******************************************************************************/ package controller; +import java.awt.Color; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -57,6 +58,11 @@ public class BaseNode extends DefaultMutableTreeNode return null; } + public Color getForegroundColor() + { + return null; + } + public String toString() { if( getUserObject() != null ) diff --git a/src/controller/ControllerTreeCellRenderer.java b/src/controller/ControllerTreeCellRenderer.java index 46740357..de0347ea 100644 --- a/src/controller/ControllerTreeCellRenderer.java +++ b/src/controller/ControllerTreeCellRenderer.java @@ -17,6 +17,7 @@ ******************************************************************************/ package controller; +import java.awt.Color; import java.awt.Component; import java.awt.Image; import java.util.HashMap; @@ -25,6 +26,8 @@ import javax.swing.ImageIcon; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; +import controller.channel.ChannelNode; + public class ControllerTreeCellRenderer extends DefaultTreeCellRenderer { private static final long serialVersionUID = 1L; @@ -46,18 +49,17 @@ public class ControllerTreeCellRenderer extends DefaultTreeCellRenderer if( value instanceof BaseNode ) { - ImageIcon icon = getIcon( (BaseNode)value ); + BaseNode node = (BaseNode)value; - if( icon != null ) + ImageIcon icon = getIcon( node ); + + setIcon( icon ); + + Color foreground = node.getForegroundColor(); + + if( foreground != null ) { - if( icon.getIconHeight() > 16 ) - { - - } - else - { - setIcon( icon ); - } + setForeground( foreground ); } } diff --git a/src/controller/channel/ChannelNode.java b/src/controller/channel/ChannelNode.java index 9bf26c0b..281e2c52 100644 --- a/src/controller/channel/ChannelNode.java +++ b/src/controller/channel/ChannelNode.java @@ -17,6 +17,7 @@ ******************************************************************************/ package controller.channel; +import java.awt.Color; import java.text.DecimalFormat; import javax.swing.JPanel; @@ -98,21 +99,27 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene @Override public String getIconPath() { - StringBuilder sb = new StringBuilder(); - - Channel channel = getChannel(); - - sb.append( channel.getDecodeConfiguration().getDecoderType().getIconPrefix() ); - - if( channel.getEnabled() ) + return getChannel().getDecodeConfiguration().getDecoderType() + .getIconFilename(); + } + + @Override + public Color getForegroundColor() + { + if( getChannel().getEnabled() ) { - sb.append( channel.isProcessing() ? "_green" : "_red" ); + if( getChannel().isProcessing() ) + { + return Color.GREEN; + } + else + { + return Color.RED; + } } - sb.append( ".png" ); - - return sb.toString(); - } + return null; + } @Override public JPanel getEditor() diff --git a/src/controller/site/SiteNode.java b/src/controller/site/SiteNode.java index 6e30141e..f37014e8 100644 --- a/src/controller/site/SiteNode.java +++ b/src/controller/site/SiteNode.java @@ -18,6 +18,7 @@ package controller.site; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Enumeration; @@ -59,27 +60,27 @@ public class SiteNode extends ConfigurableNode public String getIconPath() { - String retVal = "images/site.png"; - + return "images/site.png"; + } + + @Override + public Color getForegroundColor() + { @SuppressWarnings( "unchecked" ) Enumeration nodes = children(); while( nodes.hasMoreElements() ) { ChannelNode child = (ChannelNode)nodes.nextElement(); - - if( child.getIconPath().contains( "green.png" ) ) + + if( child.getForegroundColor() != null ) { - return "images/site_green.png"; - } - else if( child.getIconPath().contains( "red.png" ) ) - { - retVal = "images/site_red.png"; + return Color.BLUE; } } - - return retVal; - } + + return null; + } @Override public JPanel getEditor() diff --git a/src/controller/system/SystemNode.java b/src/controller/system/SystemNode.java index 7452c0cd..bab503e7 100644 --- a/src/controller/system/SystemNode.java +++ b/src/controller/system/SystemNode.java @@ -18,6 +18,7 @@ package controller.system; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Enumeration; @@ -29,6 +30,7 @@ import javax.swing.JSeparator; import javax.swing.tree.DefaultMutableTreeNode; import controller.ConfigurableNode; +import controller.channel.ChannelNode; import controller.site.Site; import controller.site.SiteNode; @@ -58,28 +60,28 @@ public class SystemNode extends ConfigurableNode @Override public String getIconPath() { - String retVal = "images/system.png"; - + return "images/system.png"; + } + + @Override + public Color getForegroundColor() + { @SuppressWarnings( "unchecked" ) Enumeration nodes = children(); while( nodes.hasMoreElements() ) { SiteNode child = (SiteNode)nodes.nextElement(); - - if( child.getIconPath().contains( "green.png" ) ) + + if( child.getForegroundColor() != null ) { - return "images/system_green.png"; - } - else if( child.getIconPath().contains( "red.png" ) ) - { - retVal = "images/system_red.png"; + return Color.BLUE; } } - - return retVal; - } - + + return null; + } + @Override public JPanel getEditor() {