Multi device support: cleanup after last commit

plugins/channel/chanalyzer/chanalyzerplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "chanalyzergui.h"
 #include "chanalyzerplugin.h"
@@ -28,8 +27,6 @@ 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);
 }
 

plugins/channel/demodam/amplugin.cpp

@@ -1,7 +1,6 @@
 #include "amplugin.h"
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "amdemodgui.h"
 
@@ -29,8 +28,6 @@ void AMPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI = pluginAPI;
 
 	// register AM demodulator
-//	QAction* action = new QAction(tr("&AM Demodulator"), this);
-//	connect(action, SIGNAL(triggered()), this, SLOT(createInstanceAM()));
 	m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.am", this);
 }
 

plugins/channel/demodbfm/bfmplugin.cpp

@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 
 #include "bfmplugin.h"
@@ -47,8 +46,6 @@ 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);
 }
 

plugins/channel/demoddsd/dsddemodplugin.cpp

@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "dsddemodplugin.h"
 #include "dsddemodgui.h"
@@ -45,8 +44,6 @@ 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);
 }
 

plugins/channel/demodlora/loraplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "loraplugin.h"
 #include "lorademodgui.h"
@@ -28,8 +27,6 @@ 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);
 }
 

plugins/channel/demodnfm/nfmplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "nfmplugin.h"
 #include "nfmdemodgui.h"
@@ -28,8 +27,6 @@ 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);
 }
 

plugins/channel/demodssb/ssbplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "ssbplugin.h"
 #include "ssbdemodgui.h"
@@ -28,8 +27,6 @@ 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);
 }
 

plugins/channel/demodwfm/wfmplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 
 #include "wfmdemodgui.h"
@@ -29,8 +28,6 @@ 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);
 }
 

plugins/channel/tcpsrc/tcpsrcplugin.cpp

@@ -1,5 +1,4 @@
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 #include "tcpsrcplugin.h"
 #include "tcpsrcgui.h"
@@ -28,8 +27,6 @@ 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);
 }
 

plugins/channel/udpsrc/udpsrcplugin.cpp

@@ -18,7 +18,6 @@
 #include "udpsrcplugin.h"
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 
 #include "udpsrcgui.h"
@@ -47,8 +46,6 @@ 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);
 }
 

sdrbase/mainwindow.cpp

@@ -238,11 +238,6 @@ 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::addChannelRollup(QWidget* widget)
 {
 	m_deviceUIs.back()->m_channelWindow->addRollupWidget(widget);

sdrbase/mainwindow.h

@@ -71,7 +71,6 @@ public:
 
 	MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; }
 
-//	void addChannelCreateAction(QAction* action);
 	void addChannelRollup(QWidget* widget);
 	void addViewAction(QAction* action);
 

sdrbase/mainwindow.ui

@@ -118,17 +118,6 @@
     </property>
     <addaction name="action_About"/>
    </widget>
-   <widget class="QMenu" name="menu_Channels">
-    <property name="font">
-     <font>
-      <family>Sans Serif</family>
-      <pointsize>9</pointsize>
-     </font>
-    </property>
-    <property name="title">
-     <string>&amp;Channels</string>
-    </property>
-   </widget>
    <widget class="QMenu" name="menu_Window">
     <property name="font">
      <font>
@@ -150,7 +139,6 @@
    <addaction name="menu_File"/>
    <addaction name="menu_View"/>
    <addaction name="menu_Acquisition"/>
-   <addaction name="menu_Channels"/>
    <addaction name="menu_Window"/>
    <addaction name="menuPreferences"/>
    <addaction name="menu_Help"/>

sdrbase/plugin/pluginapi.cpp

@@ -24,9 +24,9 @@ void PluginAPI::setInputGUI(QWidget* inputGUI)
     m_pluginManager->setInputGUI(inputGUI);
 }
 
-void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action)
+void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin)
 {
-	m_pluginManager->registerChannel(channelName, plugin, action);
+	m_pluginManager->registerChannel(channelName, plugin);
 }
 
 void PluginAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)

sdrbase/plugin/pluginapi.h

@@ -31,7 +31,7 @@ public:
 	void setInputGUI(QWidget* inputGUI);
 
 	// Channel stuff
-	void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0);
+	void registerChannel(const QString& channelName, PluginInterface* plugin);
 	void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
 	void addChannelRollup(QWidget* pluginGUI);
 	void removeChannelInstance(PluginGUI* pluginGUI);

sdrbase/plugin/pluginmanager.cpp

@@ -51,10 +51,9 @@ void PluginManager::loadPlugins()
 	updateSampleSourceDevices();
 }
 
-void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action)
+void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin)
 {
 	m_channelRegistrations.append(ChannelRegistration(channelName, plugin));
-//	m_mainWindow->addChannelCreateAction(action);
 }
 
 void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)

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 = 0);
+	void registerChannel(const QString& channelName, PluginInterface* plugin);
 	void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
 	void addChannelRollup(QWidget* pluginGUI);
 	void removeChannelInstance(PluginGUI* pluginGUI);