mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-14 09:37:36 -05:00
Compare commits
2 Commits
v0.4.0-alp
...
v0.4.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6892b9203 | ||
|
|
59f0844fcc |
14
build.gradle
14
build.gradle
@@ -39,7 +39,7 @@ repositories {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
version = '0.4.0-alpha.6'
|
version = '0.4.0-alpha.7'
|
||||||
sourceCompatibility = '11'
|
sourceCompatibility = '11'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@@ -111,3 +111,15 @@ runtime {
|
|||||||
modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
|
modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
|
||||||
imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip")
|
imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task buildSdr(type: Jar) {
|
||||||
|
manifest {
|
||||||
|
attributes 'Implementation-Title': 'SdrTrunk project',
|
||||||
|
'Implementation-Version': version,
|
||||||
|
'Main-Class': 'io.github.dsheirer.gui.SDRTrunk',
|
||||||
|
'Class-Path': 'jmbe-0.3.2.jar jmbe-0.3.3.jar'
|
||||||
|
}
|
||||||
|
baseName = project.name + '-all'
|
||||||
|
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||||
|
with jar
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* ******************************************************************************
|
* ******************************************************************************
|
||||||
* sdrtrunk
|
* sdrtrunk
|
||||||
* Copyright (C) 2014-2018 Dennis Sheirer
|
* Copyright (C) 2014-2019 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -238,6 +238,11 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
|
|||||||
identifier = Joiner.on(", ").skipNulls().join(mAliases);
|
identifier = Joiner.on(", ").skipNulls().join(mAliases);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(identifier == null && mIdentifier != null)
|
||||||
|
{
|
||||||
|
identifier = mTalkgroupFormatPreference.format(mIdentifier);
|
||||||
|
}
|
||||||
|
|
||||||
if(identifier == null)
|
if(identifier == null)
|
||||||
{
|
{
|
||||||
identifier = "-----";
|
identifier = "-----";
|
||||||
|
|||||||
Reference in New Issue
Block a user