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

#831 Resolves issue with playlist editor and channel map editor. (#832)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-05-24 08:11:39 -04:00
committed by GitHub
parent 2c3648f8c2
commit 2bb5082943
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java
View File

@@ -247,7 +247,7 @@ public class MPT1327ConfigurationEditor extends ChannelConfigurationEditor
mChannelMapComboBox.setMaxWidth(Double.MAX_VALUE); mChannelMapComboBox.setMaxWidth(Double.MAX_VALUE);
mChannelMapComboBox.setDisable(true); mChannelMapComboBox.setDisable(true);
mChannelMapComboBox.setTooltip(new Tooltip("Select a channel map to use for this system")); mChannelMapComboBox.setTooltip(new Tooltip("Select a channel map to use for this system"));
mChannelMapComboBox.getItems().addAll(getPlaylistManager().getChannelMapModel().getChannelMaps()); mChannelMapComboBox.setItems(getPlaylistManager().getChannelMapModel().getChannelMaps());
mChannelMapComboBox.setDisable(true); mChannelMapComboBox.setDisable(true);
mChannelMapComboBox.getSelectionModel().selectedItemProperty() mChannelMapComboBox.getSelectionModel().selectedItemProperty()
.addListener((observable, oldValue, newValue) -> modifiedProperty().set(true)); .addListener((observable, oldValue, newValue) -> modifiedProperty().set(true));

6
src/main/java/io/github/dsheirer/playlist/PlaylistManager.java
View File

@@ -32,6 +32,7 @@ import io.github.dsheirer.controller.channel.Channel.ChannelType;
import io.github.dsheirer.controller.channel.ChannelEvent; import io.github.dsheirer.controller.channel.ChannelEvent;
import io.github.dsheirer.controller.channel.ChannelModel; import io.github.dsheirer.controller.channel.ChannelModel;
import io.github.dsheirer.controller.channel.ChannelProcessingManager; import io.github.dsheirer.controller.channel.ChannelProcessingManager;
import io.github.dsheirer.controller.channel.map.ChannelMap;
import io.github.dsheirer.controller.channel.map.ChannelMapModel; import io.github.dsheirer.controller.channel.map.ChannelMapModel;
import io.github.dsheirer.icon.IconModel; import io.github.dsheirer.icon.IconModel;
import io.github.dsheirer.module.log.EventLogManager; import io.github.dsheirer.module.log.EventLogManager;
@@ -113,10 +114,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave()); mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave());
mChannelMapModel.addListener(t -> { mChannelMapModel.getChannelMaps().addListener((ListChangeListener<ChannelMap>)c -> schedulePlaylistSave());
//Save the playlist for all channel map events
schedulePlaylistSave();
});
mBroadcastModel.addListener(broadcastEvent -> { mBroadcastModel.addListener(broadcastEvent -> {
switch(broadcastEvent.getEvent()) switch(broadcastEvent.getEvent())