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

Adds AliasModel, AliasController tab with new AliasEditor

Browse Source
This commit is contained in:
denny
2016-01-24 15:46:55 -05:00
parent 15edcdebe6
commit 75714072b2
12 changed files with 686 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controller/ControllerPanel.java
View File

@@ -37,6 +37,8 @@ import playlist.PlaylistManager;
import settings.SettingsManager;
import source.SourceManager;
import spectrum.ChannelSpectrumPanel;
import alias.AliasController;
import alias.AliasModel;
import audio.AudioManager;
import audio.AudioPanel;
@@ -58,8 +60,10 @@ public class ControllerPanel extends JPanel
private MessageActivityPanel mMessageActivityPanel;
private ChannelSpectrumPanel mChannelSpectrumPanel;
private AliasController mAliasController;
private ChannelController mPlaylistEditor;
private ChannelController mChannelController;
private JideTabbedPane mTabbedPane;
@@ -77,6 +81,7 @@ public class ControllerPanel extends JPanel
public ControllerPanel( AudioManager audioManager,
ConfigurationControllerModel controller,
AliasModel aliasModel,
ChannelModel channelModel,
ChannelProcessingManager channelProcessingManager,
MapService mapService,
@@ -103,7 +108,9 @@ public class ControllerPanel extends JPanel
mChannelStateList = new ChannelList( channelModel, channelProcessingManager,
playlistManager, mSettingsManager );
mPlaylistEditor = new ChannelController( channelModel, playlistManager, sourceManager );
mChannelController = new ChannelController( channelModel, playlistManager, sourceManager );
mAliasController = new AliasController( aliasModel, mSettingsManager );
init();
}
@@ -129,7 +136,8 @@ public class ControllerPanel extends JPanel
mTabbedPane = new JideTabbedPane();
mTabbedPane.setFont( this.getFont() );
mTabbedPane.setForeground( Color.BLACK );
mTabbedPane.addTab( "Channels", mPlaylistEditor );
mTabbedPane.addTab( "Channels", mChannelController );
mTabbedPane.addTab( "Aliases", mAliasController );
mTabbedPane.addTab( "Configuration", mSystemControlSplitPane );
mTabbedPane.addTab( "Channel Spectrum", mChannelSpectrumPanel );
mTabbedPane.addTab( "Events", mCallEventPanel );

2
src/controller/channel/ChannelController.java
View File

@@ -140,7 +140,7 @@ public class ChannelController extends JPanel
}
/**
* Selects the channel's table row and scrolls the table's viewport to show it
* Adds the channel to the channel model/table and scrolls to view it
*/
private void addChannel( Channel channel )
{

2
src/controller/channel/ChannelEditor.java
View File

@@ -120,7 +120,7 @@ public class ChannelEditor extends JPanel
private void initGUI()
{
setLayout( new MigLayout( "fill,wrap 2", "[right,grow][grow]", "[][][][][grow][]" ) );
setLayout( new MigLayout( "fill,wrap 2", "[right,grow][grow]", "[][][][][grow]" ) );
mEnableButton.addActionListener( this );
mEnableButton.setEnabled( false );