Updates application title bar with currently displayed tuner.
This commit is contained in:
Denny Sheirer
2019-02-17 05:49:26 -05:00
committed by GitHub
parent d9fa2bea5b
commit 2394d51a51
3 changed files with 60 additions and 48 deletions

View File

@@ -1,21 +1,23 @@
/* /*
* ******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2019 Dennis Sheirer
* *
* 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 * * Copyright (C) 2014-2019 Dennis Sheirer
* the Free Software Foundation, either version 3 of the License, or * *
* (at your option) any later version. * * 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
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
* *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* *****************************************************************************
*/ */
package io.github.dsheirer.gui; package io.github.dsheirer.gui;
@@ -395,9 +397,9 @@ public class SDRTrunk implements Listener<TunerEvent>
viewMenu.add(new BroadcastStatusVisibleMenuItem(mControllerPanel)); viewMenu.add(new BroadcastStatusVisibleMenuItem(mControllerPanel));
viewMenu.add(new JSeparator()); viewMenu.add(new JSeparator());
for(Tuner tuner: mSourceManager.getTunerModel().getTuners()) for(Tuner tuner : mSourceManager.getTunerModel().getTuners())
{ {
viewMenu.add(new ShowTunerMenuItem(mSpectralPanel, tuner)); viewMenu.add(new ShowTunerMenuItem(mSourceManager.getTunerModel(), tuner));
} }
viewMenu.add(new JSeparator()); viewMenu.add(new JSeparator());
@@ -406,7 +408,7 @@ public class SDRTrunk implements Listener<TunerEvent>
viewMenu.add(new JSeparator()); viewMenu.add(new JSeparator());
JMenuItem preferencesItem = new JMenuItem("Preferences"); JMenuItem preferencesItem = new JMenuItem("Preferences");
preferencesItem.addActionListener(e -> MyEventBus.getEventBus() preferencesItem.addActionListener(e -> MyEventBus.getEventBus()
.post(new PreferenceEditorViewRequest(PreferenceEditorType.CHANNEL_EVENT))); .post(new PreferenceEditorViewRequest(PreferenceEditorType.CHANNEL_EVENT)));
viewMenu.add(preferencesItem); viewMenu.add(preferencesItem);
menuBar.add(viewMenu); menuBar.add(viewMenu);

View File

@@ -1,22 +1,30 @@
/******************************************************************************* /*
* sdr-trunk
* Copyright (C) 2014-2018 Dennis Sheirer
* *
* 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 the Free Software Foundation, either version 3 of the License, or (at your option) any * * Copyright (C) 2014-2019 Dennis Sheirer
* later version. * *
* * 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
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
* *
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License along with this program. */
* If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package io.github.dsheirer.spectrum; package io.github.dsheirer.spectrum;
import io.github.dsheirer.properties.SystemProperties; import io.github.dsheirer.properties.SystemProperties;
import io.github.dsheirer.source.tuner.Tuner; import io.github.dsheirer.source.tuner.Tuner;
import io.github.dsheirer.source.tuner.TunerEvent;
import io.github.dsheirer.source.tuner.TunerModel;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
import java.awt.EventQueue; import java.awt.EventQueue;
@@ -25,13 +33,13 @@ import java.awt.event.ActionListener;
public class ShowTunerMenuItem extends JMenuItem public class ShowTunerMenuItem extends JMenuItem
{ {
private SpectralDisplayPanel mSpectralDisplayPanel; private TunerModel mTunerModel;
private Tuner mTuner; private Tuner mTuner;
public ShowTunerMenuItem(SpectralDisplayPanel spectralDisplayPanel, Tuner tuner) public ShowTunerMenuItem(TunerModel tunerModel, Tuner tuner)
{ {
super(tuner != null ? "Show: " + tuner.getName() : "(empty)"); super(tuner != null ? "Show: " + tuner.getName() : "(empty)");
mSpectralDisplayPanel = spectralDisplayPanel; mTunerModel = tunerModel;
mTuner = tuner; mTuner = tuner;
addActionListener(new ActionListener() addActionListener(new ActionListener()
@@ -44,7 +52,7 @@ public class ShowTunerMenuItem extends JMenuItem
@Override @Override
public void run() public void run()
{ {
mSpectralDisplayPanel.showTuner(mTuner); mTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
SystemProperties properties = SystemProperties.getInstance(); SystemProperties properties = SystemProperties.getInstance();
properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true); properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true);
} }

View File

@@ -1,21 +1,23 @@
/* /*
* ******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2019 Dennis Sheirer
* *
* 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 * * Copyright (C) 2014-2019 Dennis Sheirer
* the Free Software Foundation, either version 3 of the License, or * *
* (at your option) any later version. * * 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
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU General Public License for more details.
* *
* * You should have received a copy of the GNU General Public License
* * along with this program. If not, see <http://www.gnu.org/licenses/>
* * *****************************************************************************
* *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* *****************************************************************************
*/ */
package io.github.dsheirer.spectrum; package io.github.dsheirer.spectrum;
@@ -806,7 +808,7 @@ public class SpectralDisplayPanel extends JPanel implements Listener<ReusableCom
separatorAdded = true; separatorAdded = true;
} }
contextMenu.add(new ShowTunerMenuItem(SpectralDisplayPanel.this, tuner)); contextMenu.add(new ShowTunerMenuItem(mTunerModel, tuner));
} }
} }