GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Adds AliasModel and AliasEvent and support for conversion from legacy

Browse Source 
playlist format.

Renames PlaylistEditor to ChannelController
This commit is contained in:
denny
2016-01-24 13:45:29 -05:00
parent da924e8b3a
commit 15edcdebe6
14 changed files with 526 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/alias/id/talkgroup/TalkgroupID.java
View File

@@ -43,11 +43,6 @@ public class TalkgroupID extends AliasID
mTalkgroup = talkgroup;
}
public boolean hasAudioType()
{
return false;
}
public String toString()
{
StringBuilder sb = new StringBuilder();

4
src/alias/id/talkgroup/TalkgroupIDEditor.java
View File

@@ -36,6 +36,10 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
private TalkgroupIDNode mTalkgroupIDNode;
private JTextField mTextTalkgroupID;
<<<<<<< Upstream, based on origin/master
=======
private JLabel mLabelAudio;
>>>>>>> 92e63f7 Adds AliasModel and AliasEvent and support for conversion from legacy playlist format.
private String mHelpText = "Enter a formatted talkgroup identifier.\n\n"
+ "P25 Talkgroup Format: hexadecimal value, 4 characters for "