From 54243fc9614ae2fe420780a9254cc8064ca5e264 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 18 May 2016 00:42:35 +0200
Subject: [PATCH] Multi device support: restored loaded plugins display from
 the main window

---
 sdrbase/gui/samplingdevicecontrol.cpp | 16 +++++-----
 sdrbase/gui/samplingdevicecontrol.h   |  2 +-
 sdrbase/gui/samplingdevicecontrol.ui  | 45 ---------------------------
 sdrbase/mainwindow.cpp                |  6 ++++
 sdrbase/mainwindow.h                  |  1 +
 sdrbase/mainwindow.ui                 |  2 ++
 6 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/sdrbase/gui/samplingdevicecontrol.cpp b/sdrbase/gui/samplingdevicecontrol.cpp
index 643326427..95f693594 100644
--- a/sdrbase/gui/samplingdevicecontrol.cpp
+++ b/sdrbase/gui/samplingdevicecontrol.cpp
@@ -52,14 +52,14 @@ void SamplingDeviceControl::populateChannelSelector()
     }
 }
 
-void SamplingDeviceControl::on_showLoadedPlugins_clicked(bool checked)
-{
-    if (m_pluginManager)
-    {
-        PluginsDialog pluginsDialog(m_pluginManager, this);
-        pluginsDialog.exec();
-    }
-}
+//void SamplingDeviceControl::on_showLoadedPlugins_clicked(bool checked)
+//{
+//    if (m_pluginManager)
+//    {
+//        PluginsDialog pluginsDialog(m_pluginManager, this);
+//        pluginsDialog.exec();
+//    }
+//}
 
 void SamplingDeviceControl::on_addChannel_clicked(bool checked)
 {
diff --git a/sdrbase/gui/samplingdevicecontrol.h b/sdrbase/gui/samplingdevicecontrol.h
index 365f0b6fb..ee2b65fb7 100644
--- a/sdrbase/gui/samplingdevicecontrol.h
+++ b/sdrbase/gui/samplingdevicecontrol.h
@@ -51,7 +51,7 @@ private:
     DeviceAPI *m_deviceAPI;
 
 private slots:
-    void on_showLoadedPlugins_clicked(bool checked);
+//    void on_showLoadedPlugins_clicked(bool checked);
     void on_addChannel_clicked(bool checked);
 };
 
diff --git a/sdrbase/gui/samplingdevicecontrol.ui b/sdrbase/gui/samplingdevicecontrol.ui
index ad0f7add9..6afb39add 100644
--- a/sdrbase/gui/samplingdevicecontrol.ui
+++ b/sdrbase/gui/samplingdevicecontrol.ui
@@ -77,25 +77,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="channelSelectLabel">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>30</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Chan</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QComboBox" name="channelSelect">
        <property name="toolTip">
@@ -129,32 +110,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="showLoadedPlugins">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>20</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Show loaded plugins</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../resources/res.qrc">
-         <normaloff>:/questionmark.png</normaloff>:/questionmark.png</iconset>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index e1cf8abe9..aced2e5db 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -610,6 +610,12 @@ void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item, int column)
 	on_presetLoad_clicked();
 }
 
+void MainWindow::on_action_Loaded_Plugins_triggered()
+{
+    PluginsDialog pluginsDialog(m_pluginManager, this);
+    pluginsDialog.exec();
+}
+
 void MainWindow::on_action_Audio_triggered()
 {
 	AudioDialog audioDialog(m_audioDeviceInfo, this);
diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h
index 886067765..52701abd3 100644
--- a/sdrbase/mainwindow.h
+++ b/sdrbase/mainwindow.h
@@ -149,6 +149,7 @@ private slots:
 	void on_action_DV_Serial_triggered(bool checked);
 	void on_sampleSource_currentIndexChanged(int index);
 	void on_sampleSource_confirmClicked(bool checked);
+	void on_action_Loaded_Plugins_triggered();
 	void on_action_About_triggered();
 	void on_action_addDevice_triggered();
 	void on_action_removeDevice_triggered();
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index 1ad027b5b..098075ee7 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -116,6 +116,8 @@
     <property name="title">
      <string>&amp;Help</string>
     </property>
+    <addaction name="action_Loaded_Plugins"/>
+    <addaction name="separator"/>
     <addaction name="action_About"/>
    </widget>
    <widget class="QMenu" name="menu_Window">