diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp index 9e73950b7..f3587d03e 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp @@ -123,7 +123,6 @@ BeamSteeringCWModGUI::BeamSteeringCWModGUI(PluginAPI* pluginAPI, DeviceUISet *de m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channelmimo/interferometer/interferometergui.cpp b/plugins/channelmimo/interferometer/interferometergui.cpp index 19e01348d..6d57ff9da 100644 --- a/plugins/channelmimo/interferometer/interferometergui.cpp +++ b/plugins/channelmimo/interferometer/interferometergui.cpp @@ -147,7 +147,6 @@ InterferometerGUI::InterferometerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUI m_settings.setSpectrumGUI(ui->spectrumGUI); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); ui->spectrumGUI->setBuddies(m_spectrumVis, ui->glSpectrum); ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index fb839e645..1e7cd0253 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -549,7 +549,6 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device setTitleColor(m_channelMarker.getColor()); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); ui->spectrumGUI->setBuddies(m_spectrumVis, ui->glSpectrum); ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope); diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index ac1e0f0fa..67c260912 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -3740,7 +3740,6 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 2d9c805bf..cc81405a2 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -503,7 +503,6 @@ AISDemodGUI::AISDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 7a3eda71d..8a4020f6a 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -293,7 +293,6 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp index 43720e084..bb1e42acb 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.cpp +++ b/plugins/channelrx/demodapt/aptdemodgui.cpp @@ -634,7 +634,6 @@ APTDemodGUI::APTDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index e76ff36ed..a11a48317 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -261,7 +261,6 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base setTitleColor(m_channelMarker.getColor()); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index dfb2fd838..921a35a0d 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -422,7 +422,6 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp index 412a12e14..e7eefe4c9 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp @@ -420,7 +420,6 @@ ChirpChatDemodGUI::ChirpChatDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUI connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); ui->spectrumGUI->setBuddies(m_spectrumVis, ui->glSpectrum); diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp index 6c7feeddc..8e1729f12 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.cpp +++ b/plugins/channelrx/demoddab/dabdemodgui.cpp @@ -489,7 +489,6 @@ DABDemodGUI::DABDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index 2d745594a..83ffed036 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -276,7 +276,6 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba connect(&m_objChannelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); m_deviceUISet->addChannelMarker(&m_objChannelMarker); - m_deviceUISet->addRollupWidget(this); // QPixmap pixmapTarget = QPixmap(":/film.png"); // pixmapTarget = pixmapTarget.scaled(16, 16, Qt::KeepAspectRatio, Qt::SmoothTransformation); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 5bd437c50..83fd0db09 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -387,7 +387,6 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index 75ce5b79a..a1fed8784 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -307,7 +307,6 @@ FreeDVDemodGUI::FreeDVDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 3825bb7ef..e975c1b3d 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -424,7 +424,6 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp index 6a344d1ab..3490a5dc3 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.cpp +++ b/plugins/channelrx/demodpacket/packetdemodgui.cpp @@ -464,7 +464,6 @@ PacketDemodGUI::PacketDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp index 14472b25c..97ca224dd 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.cpp +++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp @@ -530,7 +530,6 @@ PagerDemodGUI::PagerDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp index 0cf731d3a..14c093e8f 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp @@ -609,7 +609,6 @@ RadiosondeDemodGUI::RadiosondeDemodGUI(PluginAPI* pluginAPI, DeviceUISet *device m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 7b266b878..f4b4392a9 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -350,8 +350,6 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); - connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/channelrx/demodvor/vordemodgui.cpp b/plugins/channelrx/demodvor/vordemodgui.cpp index 54cb5904b..b91b77238 100644 --- a/plugins/channelrx/demodvor/vordemodgui.cpp +++ b/plugins/channelrx/demodvor/vordemodgui.cpp @@ -1208,7 +1208,6 @@ VORDemodGUI::VORDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.cpp b/plugins/channelrx/demodvorsc/vordemodscgui.cpp index dbabc1268..9e741f7da 100644 --- a/plugins/channelrx/demodvorsc/vordemodscgui.cpp +++ b/plugins/channelrx/demodvorsc/vordemodscgui.cpp @@ -322,7 +322,6 @@ VORDemodSCGUI::VORDemodSCGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 0e0862d69..56264e6ad 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -254,7 +254,6 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp index cf1993061..42c0e0baa 100644 --- a/plugins/channelrx/filesink/filesinkgui.cpp +++ b/plugins/channelrx/filesink/filesinkgui.cpp @@ -220,7 +220,6 @@ FileSinkGUI::FileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index ba57f429e..378c1c426 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -351,7 +351,6 @@ FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); ui->glSpectrum->setCenterFrequency(0); m_pllChannelMarker.blockSignals(true); diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 558c270c2..33dcea644 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -126,7 +126,6 @@ LocalSinkGUI::LocalSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channelrx/noisefigure/noisefiguregui.cpp b/plugins/channelrx/noisefigure/noisefiguregui.cpp index 0f9a9c23f..2728c2605 100644 --- a/plugins/channelrx/noisefigure/noisefiguregui.cpp +++ b/plugins/channelrx/noisefigure/noisefiguregui.cpp @@ -630,7 +630,6 @@ NoiseFigureGUI::NoiseFigureGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp index fb73a4a6a..7e74542e2 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp @@ -2112,7 +2112,6 @@ RadioAstronomyGUI::RadioAstronomyGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUI m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp index f660370ac..7f92628a2 100644 --- a/plugins/channelrx/radioclock/radioclockgui.cpp +++ b/plugins/channelrx/radioclock/radioclockgui.cpp @@ -324,7 +324,6 @@ RadioClockGUI::RadioClockGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_settings.setScopeGUI(ui->scopeGUI); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index c2c114c4c..886d2248a 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -123,7 +123,6 @@ RemoteSinkGUI::RemoteSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp index f94e3b221..52113da64 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp @@ -206,7 +206,6 @@ SigMFFileSinkGUI::SigMFFileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISe m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index c2c9baaf4..939cb5a5f 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -201,7 +201,6 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp index 4fa0fcc23..63c2a3a3e 100644 --- a/plugins/channeltx/filesource/filesourcegui.cpp +++ b/plugins/channeltx/filesource/filesourcegui.cpp @@ -210,7 +210,6 @@ FileSourceGUI::FileSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp index d16375d26..316894394 100644 --- a/plugins/channeltx/localsource/localsourcegui.cpp +++ b/plugins/channeltx/localsource/localsourcegui.cpp @@ -121,7 +121,6 @@ LocalSourceGUI::LocalSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp index bf811a207..e9dfc2485 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp @@ -454,7 +454,6 @@ IEEE_802_15_4_ModGUI::IEEE_802_15_4_ModGUI(PluginAPI* pluginAPI, DeviceUISet *de m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modais/aismodgui.cpp b/plugins/channeltx/modais/aismodgui.cpp index 7a1fec6cd..cb4a2db98 100644 --- a/plugins/channeltx/modais/aismodgui.cpp +++ b/plugins/channeltx/modais/aismodgui.cpp @@ -477,7 +477,6 @@ AISModGUI::AISModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index e73ee98ef..1c0b4003b 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -385,7 +385,6 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampl m_settings.setCWKeyerGUI(ui->cwKeyerGUI); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index ec5e1ea7a..e9046d924 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -96,7 +96,6 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp index a7623d984..289c4ba21 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp @@ -450,7 +450,6 @@ ChirpChatModGUI::ChirpChatModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/moddatv/datvmodgui.cpp b/plugins/channeltx/moddatv/datvmodgui.cpp index 837452b17..6443d7779 100644 --- a/plugins/channeltx/moddatv/datvmodgui.cpp +++ b/plugins/channeltx/moddatv/datvmodgui.cpp @@ -96,7 +96,6 @@ DATVModGUI::DATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp index 55fa8dcdf..789cd8a59 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.cpp +++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp @@ -395,7 +395,6 @@ FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_channelMarker.setVisible(true); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index 2fe399f89..899a7878c 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -465,7 +465,6 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp index a647320c4..bd98f95d9 100644 --- a/plugins/channeltx/modpacket/packetmodgui.cpp +++ b/plugins/channeltx/modpacket/packetmodgui.cpp @@ -491,7 +491,6 @@ PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 6150d3928..cb7c99b91 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -472,7 +472,6 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam setTitleColor(m_channelMarker.getColor()); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index 991aaec65..473922fc5 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -399,7 +399,6 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp index aecba396e..c1d3fea70 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.cpp +++ b/plugins/channeltx/remotesource/remotesourcegui.cpp @@ -196,7 +196,6 @@ RemoteSourceGUI::RemoteSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, m_settings.setRollupState(&m_rollupState); m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp index 8e41b5402..5ac765630 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.cpp +++ b/plugins/channeltx/udpsource/udpsourcegui.cpp @@ -154,7 +154,6 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_channelMarker.setVisible(true); // activate signal on the last setting only m_deviceUISet->addChannelMarker(&m_channelMarker); - m_deviceUISet->addRollupWidget(this); connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); diff --git a/plugins/feature/afc/afcgui.cpp b/plugins/feature/afc/afcgui.cpp index d83f986fe..e6e4d606c 100644 --- a/plugins/feature/afc/afcgui.cpp +++ b/plugins/feature/afc/afcgui.cpp @@ -145,8 +145,6 @@ AFCGUI::AFCGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *featur m_afc = reinterpret_cast(feature); m_afc->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/ais/aisgui.cpp b/plugins/feature/ais/aisgui.cpp index 455d52f9b..5bbdd19d8 100644 --- a/plugins/feature/ais/aisgui.cpp +++ b/plugins/feature/ais/aisgui.cpp @@ -186,8 +186,6 @@ AISGUI::AISGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *featur m_ais = reinterpret_cast(feature); m_ais->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/antennatools/antennatoolsgui.cpp b/plugins/feature/antennatools/antennatoolsgui.cpp index 07dc57f00..add2c2cec 100644 --- a/plugins/feature/antennatools/antennatoolsgui.cpp +++ b/plugins/feature/antennatools/antennatoolsgui.cpp @@ -123,8 +123,6 @@ AntennaToolsGUI::AntennaToolsGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISe m_antennatools = reinterpret_cast(feature); m_antennatools->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp index bc4949c8c..2c4430d05 100644 --- a/plugins/feature/aprs/aprsgui.cpp +++ b/plugins/feature/aprs/aprsgui.cpp @@ -439,8 +439,6 @@ APRSGUI::APRSGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feat m_aprs = reinterpret_cast(feature); m_aprs->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/demodanalyzer/demodanalyzergui.cpp b/plugins/feature/demodanalyzer/demodanalyzergui.cpp index 4d42071bb..7846641bd 100644 --- a/plugins/feature/demodanalyzer/demodanalyzergui.cpp +++ b/plugins/feature/demodanalyzer/demodanalyzergui.cpp @@ -169,8 +169,6 @@ DemodAnalyzerGUI::DemodAnalyzerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUI ui->glScope->connectTimer(MainCore::instance()->getMasterTimer()); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); - m_featureUISet->addRollupWidget(this); - m_settings.setSpectrumGUI(ui->spectrumGUI); m_settings.setScopeGUI(ui->scopeGUI); m_settings.setRollupState(&m_rollupState); diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp index ffba05030..a7aebbdb5 100644 --- a/plugins/feature/gs232controller/gs232controllergui.cpp +++ b/plugins/feature/gs232controller/gs232controllergui.cpp @@ -148,8 +148,6 @@ GS232ControllerGUI::GS232ControllerGUI(PluginAPI* pluginAPI, FeatureUISet *featu m_gs232Controller = reinterpret_cast(feature); m_gs232Controller->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp index 56a038a48..9757e4919 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp +++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp @@ -154,8 +154,6 @@ JogdialControllerGUI::JogdialControllerGUI(PluginAPI* pluginAPI, FeatureUISet *f m_jogdialController = reinterpret_cast(feature); m_jogdialController->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp index de5401908..fb4e1cce9 100644 --- a/plugins/feature/map/mapgui.cpp +++ b/plugins/feature/map/mapgui.cpp @@ -206,7 +206,6 @@ MapGUI::MapGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *featur m_map = reinterpret_cast(feature); m_map->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/pertester/pertestergui.cpp b/plugins/feature/pertester/pertestergui.cpp index d53ce34c3..87f22b3a7 100644 --- a/plugins/feature/pertester/pertestergui.cpp +++ b/plugins/feature/pertester/pertestergui.cpp @@ -134,7 +134,6 @@ PERTesterGUI::PERTesterGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Fea m_perTester = reinterpret_cast(feature); m_perTester->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp index af4416ecb..235bd15d4 100644 --- a/plugins/feature/radiosonde/radiosondegui.cpp +++ b/plugins/feature/radiosonde/radiosondegui.cpp @@ -137,8 +137,6 @@ RadiosondeGUI::RadiosondeGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, F m_radiosonde = reinterpret_cast(feature); m_radiosonde->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); - connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/plugins/feature/rigctlserver/rigctlservergui.cpp b/plugins/feature/rigctlserver/rigctlservergui.cpp index be2b11a10..0ba6772b7 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.cpp +++ b/plugins/feature/rigctlserver/rigctlservergui.cpp @@ -134,7 +134,6 @@ RigCtlServerGUI::RigCtlServerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISe m_rigCtlServer = reinterpret_cast(feature); m_rigCtlServer->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/satellitetracker/satellitetrackergui.cpp b/plugins/feature/satellitetracker/satellitetrackergui.cpp index 157de5899..3a84b41ab 100644 --- a/plugins/feature/satellitetracker/satellitetrackergui.cpp +++ b/plugins/feature/satellitetracker/satellitetrackergui.cpp @@ -256,7 +256,6 @@ SatelliteTrackerGUI::SatelliteTrackerGUI(PluginAPI* pluginAPI, FeatureUISet *fea m_satelliteTracker = reinterpret_cast(feature); m_satelliteTracker->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/simpleptt/simplepttgui.cpp b/plugins/feature/simpleptt/simplepttgui.cpp index 9ec1e52d5..e92a2c7b4 100644 --- a/plugins/feature/simpleptt/simplepttgui.cpp +++ b/plugins/feature/simpleptt/simplepttgui.cpp @@ -158,7 +158,6 @@ SimplePTTGUI::SimplePTTGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Fea m_simplePTT = reinterpret_cast(feature); m_simplePTT->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp index fb85c5ed0..243bb41c4 100644 --- a/plugins/feature/startracker/startrackergui.cpp +++ b/plugins/feature/startracker/startrackergui.cpp @@ -262,7 +262,6 @@ StarTrackerGUI::StarTrackerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, m_starTracker = reinterpret_cast(feature); m_starTracker->setMessageQueueToGUI(&m_inputMessageQueue); - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); diff --git a/plugins/feature/vorlocalizer/vorlocalizergui.cpp b/plugins/feature/vorlocalizer/vorlocalizergui.cpp index e27fc2332..16f2948bb 100644 --- a/plugins/feature/vorlocalizer/vorlocalizergui.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizergui.cpp @@ -1243,7 +1243,6 @@ VORLocalizerGUI::VORLocalizerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISe connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms - m_featureUISet->addRollupWidget(this); m_settings.setRollupState(&m_rollupState); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index f42591168..95842d5aa 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -16,8 +16,6 @@ set(sdrgui_SOURCES gui/basicfeaturesettingsdialog.cpp gui/buttonswitch.cpp gui/channeladddialog.cpp - gui/channelsdock.cpp - gui/channelwindow.cpp gui/clickablelabel.cpp gui/colormapper.cpp gui/commanditem.cpp @@ -39,9 +37,7 @@ set(sdrgui_SOURCES gui/fmpreemphasisdialog.cpp gui/featureadddialog.cpp gui/featurelayout.cpp - gui/featuresdock.cpp gui/featurepresetsdialog.cpp - gui/featurewindow.cpp gui/fftwisdomdialog.cpp gui/flowlayout.cpp gui/glscope.cpp @@ -63,7 +59,6 @@ set(sdrgui_SOURCES gui/rollupcontents.cpp gui/rollupwidget.cpp gui/samplingdevicedialog.cpp - gui/samplingdevicesdock.cpp gui/scaleengine.cpp gui/scaledimage.cpp gui/sdrangelsplash.cpp @@ -119,8 +114,6 @@ set(sdrgui_HEADERS gui/basicfeaturesettingsdialog.h gui/buttonswitch.h gui/channeladddialog.h - gui/channelsdock.h - gui/channelwindow.h gui/colormapper.h gui/commanditem.h gui/commandsdialog.h @@ -142,9 +135,7 @@ set(sdrgui_HEADERS gui/fmpreemphasisdialog.h gui/featureadddialog.h gui/featurelayout.h - gui/featuresdock.h gui/featurepresetsdialog.h - gui/featurewindow.h gui/fftwisdomdialog.h gui/flowlayout.h gui/glscope.h @@ -167,7 +158,6 @@ set(sdrgui_HEADERS gui/rollupcontents.h gui/rollupwidget.h gui/samplingdevicedialog.h - gui/samplingdevicesdock.h gui/scaleengine.h gui/scaledimage.h gui/sdrangelsplash.h @@ -210,7 +200,7 @@ set(sdrgui_HEADERS ) set(sdrgui_FORMS - mainwindow.ui + # mainwindow.ui gui/aboutdialog.ui gui/addpresetdialog.ui gui/ambedevicesdialog.ui diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 1ecd73d63..90a8dd5f9 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -24,7 +24,7 @@ #include "dsp/dspdevicesinkengine.h" #include "gui/glspectrum.h" #include "gui/glspectrumgui.h" -#include "gui/channelwindow.h" +// #include "gui/channelwindow.h" #include "gui/workspace.h" #include "device/devicegui.h" #include "device/deviceset.h" @@ -48,7 +48,7 @@ DeviceUISet::DeviceUISet(int deviceSetIndex, DeviceSet *deviceSet) m_spectrumGUI = new GLSpectrumGUI; m_spectrumGUI->setBuddies(m_spectrumVis, m_spectrum); m_mainSpectrumGUI = new MainSpectrumGUI(m_spectrum, m_spectrumGUI); - m_channelWindow = new ChannelWindow; + // m_channelWindow = new ChannelWindow; m_deviceAPI = nullptr; m_deviceGUI = nullptr; m_deviceSourceEngine = nullptr; @@ -69,7 +69,7 @@ DeviceUISet::DeviceUISet(int deviceSetIndex, DeviceSet *deviceSet) DeviceUISet::~DeviceUISet() { - delete m_channelWindow; + // delete m_channelWindow; delete m_mainSpectrumGUI; // delete m_spectrumGUI; // done above // delete m_spectrum; @@ -97,11 +97,6 @@ void DeviceUISet::addChannelMarker(ChannelMarker* channelMarker) m_spectrum->addChannelMarker(channelMarker); } -void DeviceUISet::addRollupWidget(QWidget *widget) -{ - m_channelWindow->addRollupWidget(widget); -} - void DeviceUISet::registerRxChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelAPI, channelGUI, 0)); diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index f0e940fda..397944c25 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -28,7 +28,7 @@ class SpectrumVis; class GLSpectrum; class GLSpectrumGUI; class MainSpectrumGUI; -class ChannelWindow; +// class ChannelWindow; class DeviceAPI; class DeviceSet; class DSPDeviceSourceEngine; @@ -56,7 +56,7 @@ public: GLSpectrum *m_spectrum; GLSpectrumGUI *m_spectrumGUI; MainSpectrumGUI *m_mainSpectrumGUI; - ChannelWindow *m_channelWindow; + // ChannelWindow *m_channelWindow; DeviceAPI *m_deviceAPI; DeviceGUI *m_deviceGUI; DSPDeviceSourceEngine *m_deviceSourceEngine; @@ -76,7 +76,6 @@ public: GLSpectrum *getSpectrum() { return m_spectrum; } //!< Direct spectrum getter void setSpectrumScalingFactor(float scalef); void addChannelMarker(ChannelMarker* channelMarker); //!< Add channel marker to spectrum - void addRollupWidget(QWidget *widget); //!< Add rollup widget to channel window int getNumberOfChannels() const { return m_channelInstanceRegistrations.size(); } void freeChannels(); diff --git a/sdrgui/feature/featureuiset.cpp b/sdrgui/feature/featureuiset.cpp index 37ab5279c..54a290ec2 100644 --- a/sdrgui/feature/featureuiset.cpp +++ b/sdrgui/feature/featureuiset.cpp @@ -36,11 +36,6 @@ FeatureUISet::~FeatureUISet() freeFeatures(); } -void FeatureUISet::addRollupWidget(QWidget *) // TODO: remove -{ - // m_featureWindow->addRollupWidget(widget); -} - void FeatureUISet::registerFeatureInstance(FeatureGUI* featureGUI, Feature *feature) { m_featureInstanceRegistrations.append(FeatureInstanceRegistration(featureGUI, feature)); diff --git a/sdrgui/feature/featureuiset.h b/sdrgui/feature/featureuiset.h index e557527cf..ddd8d15dc 100644 --- a/sdrgui/feature/featureuiset.h +++ b/sdrgui/feature/featureuiset.h @@ -40,7 +40,6 @@ public: FeatureUISet(int tabIndex, FeatureSet *featureSet); ~FeatureUISet(); - void addRollupWidget(QWidget *widget); //!< Add feature rollup widget to feature window int getNumberOfFeatures() const { return m_featureInstanceRegistrations.size(); } void registerFeatureInstance(FeatureGUI* featureGUI, Feature *feature); void deleteFeature(int featureIndex); diff --git a/sdrgui/gui/channelsdock.cpp b/sdrgui/gui/channelsdock.cpp deleted file mode 100644 index 2b1010e21..000000000 --- a/sdrgui/gui/channelsdock.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include - -#include "channelsdock.h" - -ChannelsDock::ChannelsDock(QWidget *parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_channelAddDialog(this) -{ - m_titleBar = new QWidget(); - m_titleBarLayout = new QHBoxLayout(); - m_titleBarLayout->setMargin(0); - m_titleBar->setLayout(m_titleBarLayout); - - m_titleLabel = new QLabel(); - m_titleLabel->setText(QString("Channels")); - - m_addChannelButton = new QPushButton(); - QIcon addIcon(":/create.png"); - m_addChannelButton->setIcon(addIcon); - m_addChannelButton->setToolTip("Add channels"); - m_addChannelButton->setFixedSize(16, 16); - - m_normalButton = new QPushButton(); - QIcon normalIcon = style()->standardIcon(QStyle::SP_TitleBarNormalButton, 0, this); - m_normalButton->setIcon(normalIcon); - m_normalButton->setToolTip("Dock/undock"); - m_normalButton->setFixedSize(12, 12); - - m_closeButton = new QPushButton(); - QIcon closeIcon = style()->standardIcon(QStyle::SP_TitleBarCloseButton, 0, this); - m_closeButton->setIcon(closeIcon); - m_closeButton->setToolTip("Close"); - m_closeButton->setFixedSize(12, 12); - - m_titleBarLayout->addWidget(m_addChannelButton); - m_titleBarLayout->addWidget(m_titleLabel); - m_titleBarLayout->addWidget(m_normalButton); - m_titleBarLayout->addWidget(m_closeButton); - setTitleBarWidget(m_titleBar); - - QObject::connect( - m_addChannelButton, - &QPushButton::clicked, - this, - &ChannelsDock::addChannelDialog - ); - - QObject::connect( - m_normalButton, - &QPushButton::clicked, - this, - &ChannelsDock::toggleFloating - ); - - QObject::connect( - &m_channelAddDialog, - &ChannelAddDialog::addChannel, - this, - &ChannelsDock::addChannelEmitted - ); - - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(hide())); -} - -ChannelsDock::~ChannelsDock() -{ - delete m_closeButton; - delete m_normalButton; - delete m_addChannelButton; - delete m_titleLabel; - delete m_titleBarLayout; - delete m_titleBar; -} - -void ChannelsDock::toggleFloating() -{ - setFloating(!isFloating()); -} - -void ChannelsDock::addChannelDialog() -{ - m_channelAddDialog.exec(); - -} - -void ChannelsDock::addChannelEmitted(int channelIndex) -{ - if (channelIndex >= 0) { - emit addChannel(channelIndex); - } -} \ No newline at end of file diff --git a/sdrgui/gui/channelsdock.h b/sdrgui/gui/channelsdock.h deleted file mode 100644 index 96138354e..000000000 --- a/sdrgui/gui/channelsdock.h +++ /dev/null @@ -1,59 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef SDRGUI_GUI_CHANNELDOCK_H_ -#define SDRGUI_GUI_CHANNELDOCK_H_ - -#include - -#include "channeladddialog.h" - -class QHBoxLayout; -class QLabel; -class QPushButton; -class QStringList; - -class ChannelsDock : public QDockWidget -{ - Q_OBJECT -public: - ChannelsDock(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); - ~ChannelsDock(); - - void resetAvailableChannels() { m_channelAddDialog.resetChannelNames(); } - void addAvailableChannels(const QStringList& channelNames) { m_channelAddDialog.addChannelNames(channelNames); } - -private: - QPushButton *m_addChannelButton; - QWidget *m_titleBar; - QHBoxLayout *m_titleBarLayout; - QLabel *m_titleLabel; - QPushButton *m_normalButton; - QPushButton *m_closeButton; - ChannelAddDialog m_channelAddDialog; - -private slots: - void toggleFloating(); - void addChannelDialog(); - void addChannelEmitted(int channelIndex); - -signals: - void addChannel(int); -}; - -#endif // SDRGUI_GUI_CHANNELDOCK_H_ diff --git a/sdrgui/gui/channelwindow.cpp b/sdrgui/gui/channelwindow.cpp deleted file mode 100644 index 2849bf75f..000000000 --- a/sdrgui/gui/channelwindow.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include -#include -#include -#include "gui/channelwindow.h" -#include "gui/rollupwidget.h" - -ChannelWindow::ChannelWindow(QWidget* parent) : - QScrollArea(parent) -{ - m_container = new QWidget(this); - m_layout = new QBoxLayout(QBoxLayout::TopToBottom, m_container); - setWidget(m_container); - setWidgetResizable(true); - setBackgroundRole(QPalette::Base); - m_layout->setMargin(3); - m_layout->setSpacing(3); -} - -void ChannelWindow::addRollupWidget(QWidget* rollupWidget) -{ - rollupWidget->setParent(m_container); - m_container->layout()->addWidget(rollupWidget); -} - -void ChannelWindow::resizeEvent(QResizeEvent* event) -{ - if(event->size().height() > event->size().width()) { - m_layout->setDirection(QBoxLayout::TopToBottom); - m_layout->setAlignment(Qt::AlignTop); - } else { - m_layout->setDirection(QBoxLayout::LeftToRight); - m_layout->setAlignment(Qt::AlignLeft); - } - QScrollArea::resizeEvent(event); -} diff --git a/sdrgui/gui/channelwindow.h b/sdrgui/gui/channelwindow.h deleted file mode 100644 index 2a3dd7566..000000000 --- a/sdrgui/gui/channelwindow.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef INCLUDE_CHANNELWINDOW_H -#define INCLUDE_CHANNELWINDOW_H - -#include - -#include "export.h" - -class QBoxLayout; -class QSpacerItem; -class RollupWidget; - -class SDRGUI_API ChannelWindow : public QScrollArea { - Q_OBJECT - -public: - ChannelWindow(QWidget* parent = NULL); - - void addRollupWidget(QWidget* rollupWidget); - -protected: - QWidget* m_container; - QBoxLayout* m_layout; - - void resizeEvent(QResizeEvent* event); -}; - -#endif // INCLUDE_CHANNELWINDOW_H diff --git a/sdrgui/gui/featuresdock.cpp b/sdrgui/gui/featuresdock.cpp deleted file mode 100644 index 844e7973f..000000000 --- a/sdrgui/gui/featuresdock.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include - -#include "featuresdock.h" - -FeaturesDock::FeaturesDock(QWidget *parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_featureAddDialog(this) -{ - m_titleBar = new QWidget(); - m_titleBarLayout = new QHBoxLayout(); - m_titleBarLayout->setMargin(0); - m_titleBar->setLayout(m_titleBarLayout); - - m_titleLabel = new QLabel(); - m_titleLabel->setText(QString("Features")); - - m_addFeatureButton = new QPushButton(); - QIcon addIcon(":/create.png"); - m_addFeatureButton->setIcon(addIcon); - m_addFeatureButton->setToolTip("Add features"); - m_addFeatureButton->setFixedSize(16, 16); - - m_presetsButton = new QPushButton(); - QIcon presetsIcon(":/star.png"); - m_presetsButton->setIcon(presetsIcon); - m_presetsButton->setToolTip("Feature presets"); - m_presetsButton->setFixedSize(16, 16); - - m_normalButton = new QPushButton(); - QIcon normalIcon = style()->standardIcon(QStyle::SP_TitleBarNormalButton, 0, this); - m_normalButton->setIcon(normalIcon); - m_normalButton->setToolTip("Dock/undock"); - m_normalButton->setFixedSize(12, 12); - - m_closeButton = new QPushButton(); - QIcon closeIcon = style()->standardIcon(QStyle::SP_TitleBarCloseButton, 0, this); - m_closeButton->setIcon(closeIcon); - m_closeButton->setToolTip("Close"); - m_closeButton->setFixedSize(12, 12); - - m_titleBarLayout->addWidget(m_addFeatureButton); - m_titleBarLayout->addWidget(m_presetsButton); - m_titleBarLayout->addWidget(m_titleLabel); - m_titleBarLayout->addWidget(m_normalButton); - m_titleBarLayout->addWidget(m_closeButton); - setTitleBarWidget(m_titleBar); - - QObject::connect( - m_addFeatureButton, - &QPushButton::clicked, - this, - &FeaturesDock::addFeatureDialog - ); - - QObject::connect( - m_presetsButton, - &QPushButton::clicked, - this, - &FeaturesDock::presetsDialog - ); - - QObject::connect( - m_normalButton, - &QPushButton::clicked, - this, - &FeaturesDock::toggleFloating - ); - - QObject::connect( - &m_featureAddDialog, - &FeatureAddDialog::addFeature, - this, - &FeaturesDock::addFeatureEmitted - ); - - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(hide())); -} - -FeaturesDock::~FeaturesDock() -{ - delete m_closeButton; - delete m_normalButton; - delete m_addFeatureButton; - delete m_titleLabel; - delete m_titleBarLayout; - delete m_titleBar; -} - -void FeaturesDock::toggleFloating() -{ - setFloating(!isFloating()); -} - -void FeaturesDock::addFeatureDialog() -{ - m_featureAddDialog.exec(); -} - -void FeaturesDock::presetsDialog() -{ - m_featurePresetsDialog.populateTree(); - m_featurePresetsDialog.exec(); -} - -void FeaturesDock::addFeatureEmitted(int featureIndex) -{ - if (featureIndex >= 0) { - emit addFeature(featureIndex); - } -} diff --git a/sdrgui/gui/featuresdock.h b/sdrgui/gui/featuresdock.h deleted file mode 100644 index f50af852c..000000000 --- a/sdrgui/gui/featuresdock.h +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef SDRGUI_GUI_FEATURESDOCK_H_ -#define SDRGUI_GUI_FEATURESDOCK_H_ - -#include - -#include "featureadddialog.h" -#include "featurepresetsdialog.h" - -class QHBoxLayout; -class QLabel; -class QPushButton; -class QStringList; - -class FeaturesDock : public QDockWidget -{ - Q_OBJECT -public: - FeaturesDock(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); - ~FeaturesDock(); - - void resetAvailableFeatures() { m_featureAddDialog.resetFeatureNames(); } - void addAvailableFeatures(const QStringList& featureNames) { m_featureAddDialog.addFeatureNames(featureNames); } - - void setPresets(QList* presets) { m_featurePresetsDialog.setPresets(presets); } - void setFeatureUISet(FeatureUISet *featureUISet) { m_featurePresetsDialog.setFeatureUISet(featureUISet); } - void setPluginAPI(PluginAPI *pluginAPI) { m_featurePresetsDialog.setPluginAPI(pluginAPI); } - void setWebAPIAdapter(WebAPIAdapterInterface *apiAdapter) { m_featurePresetsDialog.setWebAPIAdapter(apiAdapter); } - -private: - QPushButton *m_addFeatureButton; - QPushButton *m_presetsButton; - QWidget *m_titleBar; - QHBoxLayout *m_titleBarLayout; - QLabel *m_titleLabel; - QPushButton *m_normalButton; - QPushButton *m_closeButton; - FeatureAddDialog m_featureAddDialog; - FeaturePresetsDialog m_featurePresetsDialog; - -private slots: - void toggleFloating(); - void addFeatureDialog(); - void presetsDialog(); - void addFeatureEmitted(int featureIndex); - -signals: - void addFeature(int); -}; - -#endif // SDRGUI_GUI_FEATURESDOCK_H_ diff --git a/sdrgui/gui/featurewindow.cpp b/sdrgui/gui/featurewindow.cpp deleted file mode 100644 index af9230b1e..000000000 --- a/sdrgui/gui/featurewindow.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 Edouard Griffiths, F4EXB // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include - -#include "featurewindow.h" -#include "rollupwidget.h" - -FeatureWindow::FeatureWindow(QWidget* parent) : - QScrollArea(parent) -{ - m_container = new QWidget(this); - m_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - m_splitter = new QSplitter(); - m_layout = new FeatureLayout(m_container, 3, 3, 3); - setWidget(m_container); - setWidgetResizable(true); - setBackgroundRole(QPalette::Base); - m_layout->addWidget(m_splitter); // Splitter must be added first -} - -void FeatureWindow::addRollupWidget(QWidget* rollupWidget) -{ - if (rollupWidget->sizePolicy().verticalPolicy() == QSizePolicy::Expanding) - { - rollupWidget->setParent(m_splitter); - m_splitter->addWidget(rollupWidget); - } - else - { - rollupWidget->setParent(m_container); - m_layout->addWidget(rollupWidget); - } -} - -void FeatureWindow::resizeEvent(QResizeEvent* event) -{ - if (event->size().height() > event->size().width()) - { - m_layout->setOrientation(Qt::Vertical); - m_splitter->setOrientation(Qt::Vertical); - } - else - { - m_layout->setOrientation(Qt::Horizontal); - m_splitter->setOrientation(Qt::Horizontal); - } - QScrollArea::resizeEvent(event); -} diff --git a/sdrgui/gui/featurewindow.h b/sdrgui/gui/featurewindow.h deleted file mode 100644 index 09889d5e9..000000000 --- a/sdrgui/gui/featurewindow.h +++ /dev/null @@ -1,46 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 Edouard Griffiths, F4EXB // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_FEATUREWINDOW_H -#define INCLUDE_FEATUREWINDOW_H - -#include -#include - -#include "export.h" -#include "featurelayout.h" - -class QBoxLayout; -class QSpacerItem; -class RollupWidget; - -class SDRGUI_API FeatureWindow : public QScrollArea { - Q_OBJECT - -public: - FeatureWindow(QWidget* parent = nullptr); - void addRollupWidget(QWidget* rollupWidget); - -protected: - QWidget* m_container; - FeatureLayout* m_layout; - QSplitter* m_splitter; - - void resizeEvent(QResizeEvent* event); -}; - -#endif // INCLUDE_FEATUREWINDOW_H diff --git a/sdrgui/gui/samplingdevicesdock.cpp b/sdrgui/gui/samplingdevicesdock.cpp deleted file mode 100644 index 6cdea954b..000000000 --- a/sdrgui/gui/samplingdevicesdock.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include - -#include "device/deviceenumerator.h" -#include "samplingdevicesdock.h" - -SamplingDevicesDock::SamplingDevicesDock(QWidget *parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_currentTabIndex(0) -{ - m_titleBar = new QWidget(); - m_titleBarLayout = new QHBoxLayout(); - m_titleBarLayout->setMargin(1); - m_titleBar->setLayout(m_titleBarLayout); - - m_titleLabel = new QLabel(); - m_titleLabel->setText(QString("Sampling device")); // will be changed dynamically - - m_changeDeviceButton = new QPushButton(); - QIcon changeIcon(":/swap.png"); - m_changeDeviceButton->setIcon(changeIcon); - m_changeDeviceButton->setToolTip("Change device"); - m_changeDeviceButton->setFixedSize(16, 16); - - m_reloadDeviceButton = new QPushButton(); - QIcon reloadIcon(":/recycle.png"); - m_reloadDeviceButton->setIcon(reloadIcon); - m_reloadDeviceButton->setToolTip("Reload device"); - m_reloadDeviceButton->setFixedSize(16, 16); - - m_normalButton = new QPushButton(); - QIcon normalIcon = style()->standardIcon(QStyle::SP_TitleBarNormalButton, 0, this); - m_normalButton->setIcon(normalIcon); - m_normalButton->setToolTip("Dock/undock"); - m_normalButton->setFixedSize(12, 12); - - m_closeButton = new QPushButton(); - QIcon closeIcon = style()->standardIcon(QStyle::SP_TitleBarCloseButton, 0, this); - m_closeButton->setIcon(closeIcon); - m_closeButton->setToolTip("Close"); - m_closeButton->setFixedSize(12, 12); - - m_titleBarLayout->addWidget(m_changeDeviceButton); - m_titleBarLayout->addWidget(m_reloadDeviceButton); - m_titleBarLayout->addWidget(m_titleLabel); - m_titleBarLayout->addWidget(m_normalButton); - m_titleBarLayout->addWidget(m_closeButton); - setTitleBarWidget(m_titleBar); - - QObject::connect( - m_changeDeviceButton, - &QPushButton::clicked, - this, - &SamplingDevicesDock::openChangeDeviceDialog - ); - - QObject::connect( - m_reloadDeviceButton, - &QPushButton::clicked, - this, - &SamplingDevicesDock::reloadDevice - ); - - QObject::connect( - m_normalButton, - &QPushButton::clicked, - this, - &SamplingDevicesDock::toggleFloating - ); - - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(hide())); -} - -SamplingDevicesDock::~SamplingDevicesDock() -{ - for (int i = 0; i < m_devicesInfo.size(); i++) { - delete m_devicesInfo[i].m_samplingDeviceDialog; - } - - delete m_closeButton; - delete m_normalButton; - delete m_reloadDeviceButton; - delete m_changeDeviceButton; - delete m_titleLabel; - delete m_titleBarLayout; - delete m_titleBar; -} - -void SamplingDevicesDock::addDevice(int deviceType, int deviceTabIndex) -{ - m_devicesInfo.push_back(DeviceInfo{ - deviceType, - deviceTabIndex, - new SamplingDeviceDialog(deviceType, this) - }); - - setCurrentTabIndex(deviceTabIndex); -} - -void SamplingDevicesDock::removeLastDevice() -{ - if (m_devicesInfo.size() > 0) - { - delete m_devicesInfo.back().m_samplingDeviceDialog; - m_devicesInfo.pop_back(); - } -} - -void SamplingDevicesDock::setCurrentTabIndex(int deviceTabIndex) -{ - m_currentTabIndex = deviceTabIndex; - QString newTitle; - m_devicesInfo[m_currentTabIndex].m_samplingDeviceDialog->getDeviceId(newTitle); - int newTitleSize = newTitle.size(); - - if (newTitleSize > 0) - { - if (newTitleSize > 40) { - newTitle.chop(newTitleSize - 40); - } - - m_titleLabel->setText(newTitle); - } -} - -void SamplingDevicesDock::setSelectedDeviceIndex(int deviceTabIndex, int deviceIndex) -{ - if (deviceTabIndex < m_devicesInfo.size()) - { - m_devicesInfo[deviceTabIndex].m_samplingDeviceDialog->setSelectedDeviceIndex(deviceIndex); - setCurrentTabIndex(m_currentTabIndex); // update title - } -} - -void SamplingDevicesDock::toggleFloating() -{ - setFloating(!isFloating()); -} - -void SamplingDevicesDock::reloadDevice() -{ - emit deviceChanged( - m_devicesInfo[m_currentTabIndex].m_deviceType, - m_devicesInfo[m_currentTabIndex].m_deviceTabIndex, - m_devicesInfo[m_currentTabIndex].m_samplingDeviceDialog->getSelectedDeviceIndex() - ); -} - -void SamplingDevicesDock::openChangeDeviceDialog() -{ - if (m_currentTabIndex < m_devicesInfo.size()) - { - m_devicesInfo[m_currentTabIndex].m_samplingDeviceDialog->exec(); - - if (m_devicesInfo[m_currentTabIndex].m_samplingDeviceDialog->hasChanged()) - { - setCurrentTabIndex(m_currentTabIndex); // update title - emit deviceChanged( - m_devicesInfo[m_currentTabIndex].m_deviceType, - m_devicesInfo[m_currentTabIndex].m_deviceTabIndex, - m_devicesInfo[m_currentTabIndex].m_samplingDeviceDialog->getSelectedDeviceIndex() - ); - } - } -} diff --git a/sdrgui/gui/samplingdevicesdock.h b/sdrgui/gui/samplingdevicesdock.h deleted file mode 100644 index a1eb75ca5..000000000 --- a/sdrgui/gui/samplingdevicesdock.h +++ /dev/null @@ -1,81 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2020 F4EXB // -// written by Edouard Griffiths // -// // -// 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 as 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 V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef SDRGUI_GUI_SAMPLINGDEVICESDOCK_H_ -#define SDRGUI_GUI_SAMPLINGDEVICESDOCK_H_ - -#include -#include - -#include "samplingdevicedialog.h" - -class QHBoxLayout; -class QLabel; -class QPushButton; -class SamplingDeviceDialog; - -class SamplingDevicesDock : public QDockWidget -{ - Q_OBJECT -public: - SamplingDevicesDock(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); - ~SamplingDevicesDock(); - - void addDevice(int deviceType, int deviceTabIndex); - void removeLastDevice(); - void setCurrentTabIndex(int deviceTabIndex); - void setSelectedDeviceIndex(int deviceTabIndex, int deviceIndex); - -private: - struct DeviceInfo - { - DeviceInfo(int deviceType, int deviceTabIndex, SamplingDeviceDialog *samplingDeviceDialog) : - m_deviceType(deviceType), - m_deviceTabIndex(deviceTabIndex), - m_samplingDeviceDialog(samplingDeviceDialog) - {} - DeviceInfo(const DeviceInfo& other) : - m_deviceType(other.m_deviceType), - m_deviceTabIndex(other.m_deviceTabIndex), - m_samplingDeviceDialog(other.m_samplingDeviceDialog) - {} - int m_deviceType; - int m_deviceTabIndex; - SamplingDeviceDialog *m_samplingDeviceDialog; - }; - - QPushButton *m_changeDeviceButton; - QPushButton *m_reloadDeviceButton; - QWidget *m_titleBar; - QHBoxLayout *m_titleBarLayout; - QLabel *m_titleLabel; - QPushButton *m_normalButton; - QPushButton *m_closeButton; - QList m_devicesInfo; - int m_currentTabIndex; - -private slots: - void toggleFloating(); - void reloadDevice(); - void openChangeDeviceDialog(); - -signals: - void deviceChanged(int deviceType, int deviceTabIndex, int newDeviceIndex); -}; - -#endif // SDRGUI_GUI_SAMPLINGDEVICESDOCK_H_ \ No newline at end of file diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 66963e309..44aa30a21 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -55,8 +55,6 @@ #include "gui/pluginsdialog.h" #include "gui/aboutdialog.h" #include "gui/rollupwidget.h" -#include "gui/channelwindow.h" -#include "gui/featurewindow.h" #include "gui/audiodialog.h" #include "gui/loggingdialog.h" #include "gui/deviceuserargsdialog.h"