GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#90 [WIP] GUI is functioning again and the new channels table is showing calls and the audio panel is now horizontal. Lots of gui tweaks still to do.

Browse Source
This commit is contained in:
Denny
2017-01-19 22:10:49 -05:00
parent 5f179c4863
commit ce47d2545d
15 changed files with 193 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/audio/AudioChannelPanel.java
View File

@@ -23,6 +23,8 @@ import audio.output.AudioOutput;
import channel.metadata.Metadata;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
@@ -37,8 +39,9 @@ public class AudioChannelPanel extends JPanel
implements Listener<AudioEvent>, SettingChangeListener
{
private static final long serialVersionUID = 1L;
private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class);
private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 12);
private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
private Color mLabelColor;
private Color mDetailsColor;
@@ -49,12 +52,12 @@ public class AudioChannelPanel extends JPanel
private JLabel mChannelName = new JLabel(" ");
private JLabel mToLabel = new JLabel("TO:");
private JLabel mTo = new JLabel("-----");
private JLabel mToAlias = new JLabel("");
private JLabel mToAlias = new JLabel(" ");
private JLabel mMutedLabel = new JLabel(" ");
private JLabel mMutedLabel = new JLabel("MUTED");
private JLabel mFromLabel = new JLabel("FROM:");
private JLabel mFrom = new JLabel("-----");
private JLabel mFromAlias = new JLabel("");
private JLabel mFromAlias = new JLabel(" ");
private boolean mConfigured = false;
@@ -82,9 +85,15 @@ public class AudioChannelPanel extends JPanel
private void init()
{
setLayout(new MigLayout("insets 0 0 0 0", "[][right][][grow,fill]", "[]0[]0[grow,fill]"));
setLayout(new MigLayout("align center center, insets 0 0 0 0",
"[][][right][grow,fill][grow,fill][right][grow,fill][grow,fill]", ""));
setBackground(Color.BLACK);
mMutedLabel.setFont(mFont);
mMutedLabel.setForeground(Color.RED);
mMutedLabel.setVisible(false);
add(mMutedLabel);
mChannelName = new JLabel(mAudioOutput != null ? mAudioOutput.getChannelName() : " ");
mChannelName.setFont(mFont);
mChannelName.setForeground(mDetailsColor);
@@ -107,11 +116,7 @@ public class AudioChannelPanel extends JPanel
mToAlias.setFont(mFont);
mToAlias.setForeground(mLabelColor);
add(mToAlias, "wrap");
mMutedLabel.setFont(mFont);
mMutedLabel.setForeground(Color.RED);
add(mMutedLabel);
add(mToAlias);
mFromLabel.setFont(mFont);
if(mAudioOutput != null)
@@ -130,8 +135,7 @@ public class AudioChannelPanel extends JPanel
mFromAlias.setFont(mFont);
mFromAlias.setForeground(mLabelColor);
add(mFromAlias, "wrap");
add(mFromAlias);
}
@Override
@@ -156,7 +160,7 @@ public class AudioChannelPanel extends JPanel
@Override
public void run()
{
mMutedLabel.setText(mAudioOutput.isMuted() ? "M" : " ");
mMutedLabel.setVisible(mAudioOutput.isMuted());
}
});
break;
@@ -171,8 +175,8 @@ public class AudioChannelPanel extends JPanel
*/
private void resetLabels()
{
updateLabel(mFromLabel, null, mFromAlias, null);
updateLabel(mToLabel, null, mToAlias, null);
updateLabel(mFrom, null, mFromAlias, null);
updateLabel(mTo, null, mToAlias, null);
mConfigured = false;
}
@@ -190,7 +194,7 @@ public class AudioChannelPanel extends JPanel
if(alias != null)
{
aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 16));
}
else
{
@@ -220,10 +224,10 @@ public class AudioChannelPanel extends JPanel
@Override
public void run()
{
updateLabel(mFromLabel, metadata.getPrimaryAddressFrom().getIdentifier(),
updateLabel(mFrom, metadata.getPrimaryAddressFrom().getIdentifier(),
mFromAlias, metadata.getPrimaryAddressFrom().getAlias());
updateLabel(mToLabel, metadata.getPrimaryAddressTo().getIdentifier(),
updateLabel(mTo, metadata.getPrimaryAddressTo().getIdentifier(),
mToAlias, metadata.getPrimaryAddressTo().getAlias());
mConfigured = true;

12
src/audio/AudioChannelsPanel.java
View File

@@ -33,15 +33,17 @@ public class AudioChannelsPanel extends JPanel
public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
{
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]"));
setLayout(new MigLayout("insets 0 0 0 0", "[][grow,fill][][grow,fill]", "[grow,fill]"));
setBackground(Color.BLACK);
List<AudioOutput> outputs = controller.getAudioOutputs();
addSeparator();
for(int x = 0; x < outputs.size(); x++)
{
add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)), "wrap");
add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)), "growx");
if(x < outputs.size() - 1)
{
@@ -54,14 +56,14 @@ public class AudioChannelsPanel extends JPanel
if(outputs.size() == 1)
{
addSeparator();
add(new AudioChannelPanel(iconManager, settingsManager, null), "wrap");
add(new AudioChannelPanel(iconManager, settingsManager, null), "growx");
}
}
private void addSeparator()
{
JSeparator separator = new JSeparator(JSeparator.HORIZONTAL);
JSeparator separator = new JSeparator(JSeparator.VERTICAL);
separator.setBackground(Color.DARK_GRAY);
add(separator, "span,growx");
add(separator);
}
}

4
src/audio/AudioPanel.java
View File

@@ -45,9 +45,9 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
private static final Logger mLog = LoggerFactory.getLogger(AudioPanel.class);
private static ImageIcon MUTED_ICON = IconManager.getScaledIcon(
new ImageIcon("images/audio_muted.png"), 38);
new ImageIcon("images/audio_muted.png"), 20);
private static ImageIcon UNMUTED_ICON = IconManager.getScaledIcon(
new ImageIcon("images/audio_unmuted.png"), 38);
new ImageIcon("images/audio_unmuted.png"), 20);
private IconManager mIconManager;
private SettingsManager mSettingsManager;