mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

pull/6/head
f4exb 2016-05-18 00:42:35 +02:00
rodzic 7aa5ca7573
commit 54243fc961
6 zmienionych plików z 18 dodań i 54 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
sdrbase/gui/samplingdevicecontrol.cpp
Wyświetl plik

@ -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)
{

2
sdrbase/gui/samplingdevicecontrol.h
Wyświetl plik

@ -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);
};

45
sdrbase/gui/samplingdevicecontrol.ui
Wyświetl plik

@ -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>

6
sdrbase/mainwindow.cpp
Wyświetl plik

@ -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);

1
sdrbase/mainwindow.h
Wyświetl plik

@ -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();

2
sdrbase/mainwindow.ui
Wyświetl plik

@ -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">