From 33d18b118667d03d6319b91295d79db449064a36 Mon Sep 17 00:00:00 2001
From: "dennis.sheirer" <dennis.sheirer@gmail.com>
Date: Sat, 6 Dec 2014 20:33:41 +0000
Subject: [PATCH] Icon change cleanup

---
 images/ltr_net.png                             | Bin 379 -> 413 bytes
 src/controller/ControllerTreeCellRenderer.java |   3 +--
 src/decode/DecoderType.java                    |  11 +++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/images/ltr_net.png b/images/ltr_net.png
index 2b36b175c79c80fb2c96f3630925bd68cdc5462e..262d36593882d624ff98c5113364be41041cc163 100644
GIT binary patch
delta 302
zcmV+}0nz^Z0-XbpRR$U)lX`H3ky|H!0R>4!K~zY`?bN+WL@^Kr;BWmY6pIBx1Utd)
zwh#m@6vS4r6Q4lAQdq>=LTm)V+RoZ1@C__{0L2FoRzb0HWo@#T5WGQ_d(pyya3;f<
z$(czA|Mo|$pZMvD<4@SDQ$Sg4uwTM+RR@m@k<-9?rjg@JQ>F2rPN0tmv@^wjyJ$uE
z2YAC}QfDXu<2c98H^K(~32vfTH~76OCIAz-L$f5OiI+scYQ*VbO38TBZpsAh;vysZ
zDDwC58tt#6Y5cx50&Zg#GdK;ed<Bb`#92+e!VUwrv6+bL)W|FTfw6#(Sjargs(FQg
z&w%r|&s<s6Jfi{Uuz_V<;R9<O*upxdaa#k=7i2_cMiDes>i_@%07*qoM6N<$f<yL=
AXaE2J

delta 267
zcmV+m0rdWz1N#DyRR#nd7(T~Sky|H!0OLtSK~zY`?bNYKgE15Z;IG=rRVad6(McSf
z>LQ4%MJFfUptJZ4F2$GdNn8b2LB&~c6AA^9xTHUA_><Do9~^q%a!5EyPVT)4{{*3C
zoW}J0823#YC>etTd}s9iWL+r4QU(IPFv#d%Y7ET1@FE8G@QLk=KFrC$%)T3XOO)#!
zkGM__nBcW$O=~K$Hw}fFr{iNhXZE>VBm--#G3m-H?4W}?jAEl5VGF~CbQNwRAL2YQ
zchjJ*`Ul#PKd@hTDy!C227V)V@m46=s&zIa@8S$SJm3c>xWH-rcApy1`2&Q;WBJ9V
Rb?pEE002ovPDHLkV1h&cd{F=Z

diff --git a/src/controller/ControllerTreeCellRenderer.java b/src/controller/ControllerTreeCellRenderer.java
index de0347ea..fff54227 100644
--- a/src/controller/ControllerTreeCellRenderer.java
+++ b/src/controller/ControllerTreeCellRenderer.java
@@ -19,6 +19,7 @@ package controller;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Font;
 import java.awt.Image;
 import java.util.HashMap;
 
@@ -26,8 +27,6 @@ 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;
diff --git a/src/decode/DecoderType.java b/src/decode/DecoderType.java
index ffdd8196..f6013176 100644
--- a/src/decode/DecoderType.java
+++ b/src/decode/DecoderType.java
@@ -25,16 +25,23 @@ import java.util.EnumSet;
  */
 public enum DecoderType
 {
+	ACARS( "ACARS", "ACARS", "images/acars.png", 12500 ),
+	AIS( "AIS", "AIS", "images/ais.png", 12500 ),
     AM( "AM", "AM", "images/am.png", 10000 ),
+    APRS( "APRS", "APRS", "images/aprs.png", 12500 ),
+    DMR( "DMR", "DMR", "images/dmr.png", 12500 ),
     FLEETSYNC2( "Fleetsync II", "Fsync2", "images/fm.png", 12500 ),
     LJ_1200( "LJ1200 173.075", "LJ1200", "images/lj1200.png", 12500 ),
-    LTR_STANDARD( "LTR-Standard", "LTR", "images/ltr_standard.png", 10000 ),
+    LTR_STANDARD( "LTR-Standard", "LTR", "images/ltr.png", 10000 ),
     LTR_NET( "LTR-Net", "LTR-Net", "images/ltr_net.png", 10000 ),
     MDC1200( "MDC1200", "MDC1200", "images/fm.png", 12500 ),
+    MOTOROLA_TYPE_2( "MOTO T2", "MOTO T2", "images/motorola_type_2.png", 15000 ),
     MPT1327( "MPT1327", "MPT1327", "images/mpt1327.png", 12500 ),
+    NXDN( "NXDN", "NXDN", "images/nxdn.png", 8000 ),
     NBFM( "NBFM", "NBFM", "images/fm.png", 12500 ),
     PASSPORT( "Passport", "Passport", "images/passport.png", 12500 ),
-    P25_PHASE1( "P25 Phase 1", "P25-1", "images/p25_1.png", 12500 );
+    P25_PHASE1( "P25 Phase I", "P25-1", "images/p25_1.png", 12500 ),
+    P25_PHASE2( "P25 Phase II", "P25-2", "images/p25_2.png", 15000 );
     
     private String mDisplayString;
     private String mShortDisplayString;