VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Propagate change to channel UIs

This commit is contained in:
f4exb 2019-05-09 21:07:05 +02:00
parent ec0865b409
commit 7e128335f1
20 changed files with 466 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -365,18 +365,23 @@ void ChannelAnalyzerGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void ChannelAnalyzerGUI::onMenuDialogCalled(const QPoint& p) void ChannelAnalyzerGUI::onMenuDialogCalled(const QPoint& p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.move(p); {
dialog.exec(); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.move(p);
dialog.exec();
m_settings.m_frequency = m_channelMarker.getCenterFrequency(); m_settings.m_frequency = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

43
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -205,28 +205,33 @@ void AMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void AMDemodGUI::onMenuDialogCalled(const QPoint &p) void AMDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.move(p); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.exec(); dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

43
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -318,29 +318,34 @@ void BFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void BFMDemodGUI::onMenuDialogCalled(const QPoint &p) void BFMDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

44
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -272,30 +272,34 @@ void DSDDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void DSDDemodGUI::onMenuDialogCalled(const QPoint &p) void DSDDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
//qDebug("DSDDemodGUI::onMenuDialogCalled: x: %d y: %d", p.x(), p.y()); if (m_contextMenuType == ContextMenuChannelSettings)
BasicChannelSettingsDialog dialog(&m_channelMarker, this); {
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void DSDDemodGUI::on_viewStatusLog_clicked() void DSDDemodGUI::on_viewStatusLog_clicked()

43
plugins/channelrx/demodfreedv/freedvdemodgui.cpp
View File

@ -206,29 +206,34 @@ void FreeDVDemodGUI::on_spanLog2_valueChanged(int value)
void FreeDVDemodGUI::onMenuDialogCalled(const QPoint &p) void FreeDVDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void FreeDVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) void FreeDVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)

43
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -225,28 +225,33 @@ void NFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void NFMDemodGUI::onMenuDialogCalled(const QPoint &p) void NFMDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.move(p); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.exec(); dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

43
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -235,29 +235,34 @@ void SSBDemodGUI::on_flipSidebands_clicked(bool checked)
void SSBDemodGUI::onMenuDialogCalled(const QPoint &p) void SSBDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void SSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) void SSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)

43
plugins/channelrx/demodwfm/wfmdemodgui.cpp
View File

@ -168,29 +168,34 @@ void WFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void WFMDemodGUI::onMenuDialogCalled(const QPoint &p) void WFMDemodGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

43
plugins/channelrx/freqtracker/freqtrackergui.cpp
View File

@ -246,28 +246,33 @@ void FreqTrackerGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void FreqTrackerGUI::onMenuDialogCalled(const QPoint &p) void FreqTrackerGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.move(p); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.exec(); dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :

41
plugins/channelrx/localsink/localsinkgui.cpp
View File

@ -251,28 +251,33 @@ void LocalSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void LocalSinkGUI::onMenuDialogCalled(const QPoint &p) void LocalSinkGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void LocalSinkGUI::on_decimationFactor_currentIndexChanged(int index) void LocalSinkGUI::on_decimationFactor_currentIndexChanged(int index)

41
plugins/channelrx/remotesink/remotesinkgui.cpp
View File

@ -247,28 +247,33 @@ void RemoteSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void RemoteSinkGUI::onMenuDialogCalled(const QPoint &p) void RemoteSinkGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void RemoteSinkGUI::on_decimationFactor_currentIndexChanged(int index) void RemoteSinkGUI::on_decimationFactor_currentIndexChanged(int index)

43
plugins/channelrx/udpsink/udpsinkgui.cpp
View File

@ -614,29 +614,34 @@ void UDPSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void UDPSinkGUI::onMenuDialogCalled(const QPoint &p) void UDPSinkGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettingsImmediate(); applySettingsImmediate();
}
resetContextMenuType();
} }
void UDPSinkGUI::leaveEvent(QEvent*) void UDPSinkGUI::leaveEvent(QEvent*)

43
plugins/channeltx/modam/ammodgui.cpp
View File

@ -278,28 +278,33 @@ void AMModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void AMModGUI::onMenuDialogCalled(const QPoint &p) void AMModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.move(p); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.exec(); dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

43
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -614,29 +614,34 @@ void ATVModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void ATVModGUI::onMenuDialogCalled(const QPoint &p) void ATVModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

43
plugins/channeltx/modfreedv/freedvmodgui.cpp
View File

@ -303,29 +303,34 @@ void FreeDVModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void FreeDVModGUI::onMenuDialogCalled(const QPoint &p) void FreeDVModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

43
plugins/channeltx/modnfm/nfmmodgui.cpp
View File

@ -295,28 +295,33 @@ void NFMModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void NFMModGUI::onMenuDialogCalled(const QPoint &p) void NFMModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.move(p); dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.exec(); dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

43
plugins/channeltx/modssb/ssbmodgui.cpp
View File

@ -377,29 +377,34 @@ void SSBModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void SSBModGUI::onMenuDialogCalled(const QPoint &p) void SSBModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

43
plugins/channeltx/modwfm/wfmmodgui.cpp
View File

@ -284,29 +284,34 @@ void WFMModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void WFMModGUI::onMenuDialogCalled(const QPoint &p) void WFMModGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :

41
plugins/channeltx/remotesource/remotesourcegui.cpp
View File

@ -274,28 +274,33 @@ void RemoteSourceGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void RemoteSourceGUI::onMenuDialogCalled(const QPoint &p) void RemoteSourceGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_title = m_channelMarker.getTitle(); m_settings.m_title = m_channelMarker.getTitle();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_settings.m_title); setWindowTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void RemoteSourceGUI::on_dataAddress_returnPressed() void RemoteSourceGUI::on_dataAddress_returnPressed()

41
plugins/channeltx/udpsource/udpsourcegui.cpp
View File

@ -471,28 +471,33 @@ void UDPSourceGUI::onWidgetRolled(QWidget* widget, bool rollDown)
void UDPSourceGUI::onMenuDialogCalled(const QPoint &p) void UDPSourceGUI::onMenuDialogCalled(const QPoint &p)
{ {
BasicChannelSettingsDialog dialog(&m_channelMarker, this); if (m_contextMenuType == ContextMenuChannelSettings)
dialog.setUseReverseAPI(m_settings.m_useReverseAPI); {
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress); BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort); dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex); dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex); dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
dialog.move(p); dialog.move(p);
dialog.exec(); dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_useReverseAPI = dialog.useReverseAPI(); m_settings.m_useReverseAPI = dialog.useReverseAPI();
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress(); m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort(); m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex(); m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex(); m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
setWindowTitle(m_channelMarker.getTitle()); setWindowTitle(m_channelMarker.getTitle());
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
applySettings(); applySettings();
}
resetContextMenuType();
} }
void UDPSourceGUI::leaveEvent(QEvent*) void UDPSourceGUI::leaveEvent(QEvent*)