diff --git a/plugins/channel/chanalyzer/chanalyzerplugin.cpp b/plugins/channel/chanalyzer/chanalyzerplugin.cpp index cbfa5bd44..15dd2e4a0 100644 --- a/plugins/channel/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channel/chanalyzer/chanalyzerplugin.cpp @@ -28,9 +28,9 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register demodulator - QAction* action = new QAction(tr("&ChannelAnalyzer"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceChannelAnalyzer())); - m_pluginAPI->registerChannel("org.f4exb.sdrangelove.channel.chanalyzer", this, action); +// QAction* action = new QAction(tr("&ChannelAnalyzer"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceChannelAnalyzer())); + m_pluginAPI->registerChannel("org.f4exb.sdrangelove.channel.chanalyzer", this); } PluginGUI* ChannelAnalyzerPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodam/amplugin.cpp b/plugins/channel/demodam/amplugin.cpp index 6aa195939..4acb1ece1 100644 --- a/plugins/channel/demodam/amplugin.cpp +++ b/plugins/channel/demodam/amplugin.cpp @@ -29,9 +29,9 @@ void AMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register AM demodulator - QAction* action = new QAction(tr("&AM Demodulator"), this); +// QAction* action = new QAction(tr("&AM Demodulator"), this); // connect(action, SIGNAL(triggered()), this, SLOT(createInstanceAM())); - m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.am", this, action); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.am", this); } PluginGUI* AMPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodbfm/bfmplugin.cpp b/plugins/channel/demodbfm/bfmplugin.cpp index d68dc9da2..6f2a7d14b 100644 --- a/plugins/channel/demodbfm/bfmplugin.cpp +++ b/plugins/channel/demodbfm/bfmplugin.cpp @@ -47,9 +47,9 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register BFM demodulator - QAction* action = new QAction(tr("&Broadcast FM Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceBFM())); - m_pluginAPI->registerChannel("sdrangel.channel.bfm", this, action); +// QAction* action = new QAction(tr("&Broadcast FM Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceBFM())); + m_pluginAPI->registerChannel("sdrangel.channel.bfm", this); } PluginGUI* BFMPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demoddsd/dsddemodplugin.cpp b/plugins/channel/demoddsd/dsddemodplugin.cpp index 856f4172f..bc3e2f699 100644 --- a/plugins/channel/demoddsd/dsddemodplugin.cpp +++ b/plugins/channel/demoddsd/dsddemodplugin.cpp @@ -45,9 +45,9 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register DSD demodulator - QAction* action = new QAction(tr("&DSD Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceDSDDemod())); - m_pluginAPI->registerChannel("sdrangel.channel.dsddemod", this, action); +// QAction* action = new QAction(tr("&DSD Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceDSDDemod())); + m_pluginAPI->registerChannel("sdrangel.channel.dsddemod", this); } PluginGUI* DSDDemodPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodlora/loraplugin.cpp b/plugins/channel/demodlora/loraplugin.cpp index 88bd41140..5a7f60961 100644 --- a/plugins/channel/demodlora/loraplugin.cpp +++ b/plugins/channel/demodlora/loraplugin.cpp @@ -28,9 +28,9 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register demodulator - QAction* action = new QAction(tr("&LoRa Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceLoRa())); - m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.lora", this, action); +// QAction* action = new QAction(tr("&LoRa Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceLoRa())); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.lora", this); } PluginGUI* LoRaPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodnfm/nfmplugin.cpp b/plugins/channel/demodnfm/nfmplugin.cpp index 71f9e7fb4..d1e07e94a 100644 --- a/plugins/channel/demodnfm/nfmplugin.cpp +++ b/plugins/channel/demodnfm/nfmplugin.cpp @@ -28,9 +28,9 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register NFM demodulator - QAction* action = new QAction(tr("&NFM Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceNFM())); - m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.nfm", this, action); +// QAction* action = new QAction(tr("&NFM Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceNFM())); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.nfm", this); } PluginGUI* NFMPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodssb/ssbplugin.cpp b/plugins/channel/demodssb/ssbplugin.cpp index 2f9997c72..a941b53e0 100644 --- a/plugins/channel/demodssb/ssbplugin.cpp +++ b/plugins/channel/demodssb/ssbplugin.cpp @@ -28,9 +28,9 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register demodulator - QAction* action = new QAction(tr("&SSB Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceSSB())); - m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.ssb", this, action); +// QAction* action = new QAction(tr("&SSB Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceSSB())); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.ssb", this); } PluginGUI* SSBPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/demodwfm/wfmplugin.cpp b/plugins/channel/demodwfm/wfmplugin.cpp index 97ba7b7d3..43fa0aee7 100644 --- a/plugins/channel/demodwfm/wfmplugin.cpp +++ b/plugins/channel/demodwfm/wfmplugin.cpp @@ -29,9 +29,9 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register WFM demodulator - QAction* action = new QAction(tr("&WFM Demodulator"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceWFM())); - m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.wfm", this, action); +// QAction* action = new QAction(tr("&WFM Demodulator"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceWFM())); + m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.wfm", this); } PluginGUI* WFMPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/tcpsrc/tcpsrcplugin.cpp b/plugins/channel/tcpsrc/tcpsrcplugin.cpp index e47adb883..2419beb9e 100644 --- a/plugins/channel/tcpsrc/tcpsrcplugin.cpp +++ b/plugins/channel/tcpsrc/tcpsrcplugin.cpp @@ -28,9 +28,9 @@ void TCPSrcPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register TCP Channel Source - QAction* action = new QAction(tr("&TCP Source"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceTCPSrc())); - m_pluginAPI->registerChannel("sdrangel.channel.tcpsrc", this, action); +// QAction* action = new QAction(tr("&TCP Source"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceTCPSrc())); + m_pluginAPI->registerChannel("sdrangel.channel.tcpsrc", this); } PluginGUI* TCPSrcPlugin::createChannel(const QString& channelName) diff --git a/plugins/channel/udpsrc/udpsrcplugin.cpp b/plugins/channel/udpsrc/udpsrcplugin.cpp index 0262a7cbe..6473808f9 100644 --- a/plugins/channel/udpsrc/udpsrcplugin.cpp +++ b/plugins/channel/udpsrc/udpsrcplugin.cpp @@ -47,9 +47,9 @@ void UDPSrcPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI = pluginAPI; // register TCP Channel Source - QAction* action = new QAction(tr("&UDP Source"), this); - connect(action, SIGNAL(triggered()), this, SLOT(createInstanceUDPSrc())); - m_pluginAPI->registerChannel("sdrangel.channel.udpsrc", this, action); +// QAction* action = new QAction(tr("&UDP Source"), this); +// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceUDPSrc())); + m_pluginAPI->registerChannel("sdrangel.channel.udpsrc", this); } PluginGUI* UDPSrcPlugin::createChannel(const QString& channelName) diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index ece4c8b32..62cb483e7 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -238,10 +238,10 @@ void MainWindow::removeLastDevice() m_deviceUIs.pop_back(); } -void MainWindow::addChannelCreateAction(QAction* action) // TODO: move to some tabbed UI -{ - ui->menu_Channels->addAction(action); -} +//void MainWindow::addChannelCreateAction(QAction* action) // TODO: move to some tabbed UI +//{ +// ui->menu_Channels->addAction(action); +//} void MainWindow::addChannelRollup(QWidget* widget) { diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h index 153c2c5f4..ebc21bc65 100644 --- a/sdrbase/mainwindow.h +++ b/sdrbase/mainwindow.h @@ -71,7 +71,7 @@ public: MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } - void addChannelCreateAction(QAction* action); +// void addChannelCreateAction(QAction* action); void addChannelRollup(QWidget* widget); void addViewAction(QAction* action); diff --git a/sdrbase/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h index 2c9c7a466..212ce3338 100644 --- a/sdrbase/plugin/pluginapi.h +++ b/sdrbase/plugin/pluginapi.h @@ -31,7 +31,7 @@ public: void setInputGUI(QWidget* inputGUI); // Channel stuff - void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action); + void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0); void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void addChannelRollup(QWidget* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI); diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index 96d7c5e85..4527bd877 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -54,7 +54,7 @@ void PluginManager::loadPlugins() void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action) { m_channelRegistrations.append(ChannelRegistration(channelName, plugin)); - m_mainWindow->addChannelCreateAction(action); +// m_mainWindow->addChannelCreateAction(action); } void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI) diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 43114a152..fb3453b3c 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -46,7 +46,7 @@ public: const Plugins& getPlugins() const { return m_plugins; } // Callbacks from the plugins - void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action); + void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0); void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void addChannelRollup(QWidget* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI);