VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-24 10:50:29 -05:00
Code Issues Projects Releases Wiki Activity

Multi device support: restored loaded plugins display from the main window

Browse Source
This commit is contained in:
f4exb 2016-05-18 00:42:35 +02:00
parent 7aa5ca7573
commit 54243fc961
6 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdrbase/gui/samplingdevicecontrol.cpp
View File

@ -52,14 +52,14 @@ void SamplingDeviceControl::populateChannelSelector()
} }
} }
void SamplingDeviceControl::on_showLoadedPlugins_clicked(bool checked) //void SamplingDeviceControl::on_showLoadedPlugins_clicked(bool checked)
{ //{
if (m_pluginManager) // if (m_pluginManager)
{ // {
PluginsDialog pluginsDialog(m_pluginManager, this); // PluginsDialog pluginsDialog(m_pluginManager, this);
pluginsDialog.exec(); // pluginsDialog.exec();
} // }
} //}
void SamplingDeviceControl::on_addChannel_clicked(bool checked) void SamplingDeviceControl::on_addChannel_clicked(bool checked)
{ {

2
sdrbase/gui/samplingdevicecontrol.h
View File

@ -51,7 +51,7 @@ private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;
private slots: private slots:
void on_showLoadedPlugins_clicked(bool checked); // void on_showLoadedPlugins_clicked(bool checked);
void on_addChannel_clicked(bool checked); void on_addChannel_clicked(bool checked);
}; };

45
sdrbase/gui/samplingdevicecontrol.ui
View File

@ -77,25 +77,6 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <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> <item>
<widget class="QComboBox" name="channelSelect"> <widget class="QComboBox" name="channelSelect">
<property name="toolTip"> <property name="toolTip">
@ -129,32 +110,6 @@
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
</layout> </layout>

6
sdrbase/mainwindow.cpp
View File

@ -610,6 +610,12 @@ void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item, int column)
on_presetLoad_clicked(); on_presetLoad_clicked();
} }
void MainWindow::on_action_Loaded_Plugins_triggered()
{
PluginsDialog pluginsDialog(m_pluginManager, this);
pluginsDialog.exec();
}
void MainWindow::on_action_Audio_triggered() void MainWindow::on_action_Audio_triggered()
{ {
AudioDialog audioDialog(m_audioDeviceInfo, this); AudioDialog audioDialog(m_audioDeviceInfo, this);

1
sdrbase/mainwindow.h
View File

@ -149,6 +149,7 @@ private slots:
void on_action_DV_Serial_triggered(bool checked); void on_action_DV_Serial_triggered(bool checked);
void on_sampleSource_currentIndexChanged(int index); void on_sampleSource_currentIndexChanged(int index);
void on_sampleSource_confirmClicked(bool checked); void on_sampleSource_confirmClicked(bool checked);
void on_action_Loaded_Plugins_triggered();
void on_action_About_triggered(); void on_action_About_triggered();
void on_action_addDevice_triggered(); void on_action_addDevice_triggered();
void on_action_removeDevice_triggered(); void on_action_removeDevice_triggered();

2
sdrbase/mainwindow.ui
View File

@ -116,6 +116,8 @@
<property name="title"> <property name="title">
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="action_Loaded_Plugins"/>
<addaction name="separator"/>
<addaction name="action_About"/> <addaction name="action_About"/>
</widget> </widget>
<widget class="QMenu" name="menu_Window"> <widget class="QMenu" name="menu_Window">