From 8ce5ca51e238fd467e4f88e63ea0cac312ae7f27 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 29 Nov 2023 05:06:54 +0100 Subject: [PATCH] Apply PR #1888 changes to samplemimo plugins --- CHANGELOG | 2 +- debian/changelog | 2 +- plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp | 1 + plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp | 1 + plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp | 2 +- plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp | 1 + plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp | 2 +- plugins/samplemimo/metismiso/metismisogui.cpp | 1 + plugins/samplemimo/metismiso/metismisoplugin.cpp | 2 +- plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp | 1 + plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp | 2 +- plugins/samplemimo/testmi/testmigui.cpp | 1 + plugins/samplemimo/testmi/testmiplugin.cpp | 2 +- plugins/samplemimo/testmosync/testmosyncgui.cpp | 1 + plugins/samplemimo/testmosync/testmosyncplugin.cpp | 2 +- plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp | 1 + plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp | 2 +- 17 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f2a37227b..a7c7ee3f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,7 +7,7 @@ sdrangel (7.17.1-1) unstable; urgency=medium * DSD Demod - Fix loss of constellation. PR #1883. Fixes #1836 * Remote TCP - Fix FIFO size adjustment. Fixes SR > 3 MS/s. PR #1886. Fixes #1885. * Indicate audio FIFO underflow/overflow. PR #1887 - * ix resize cursor not being cleared when mouse moves over child widgets. PR #1888 + * Fix resize cursor not being cleared when mouse moves over child widgets. PR #1888 * Prevent popup menu when scrolling tables. PR #1889 * Use custom save/restore geometry for MDI sub=windows. PR #1890. Fixes #1835 * Use MDI restore when loading config. PR #1890 diff --git a/debian/changelog b/debian/changelog index 3152d44b6..7f5a9d6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ sdrangel (7.17.1-1) unstable; urgency=medium * DSD Demod - Fix loss of constellation. PR #1883. Fixes #1836 * Remote TCP - Fix FIFO size adjustment. Fixes SR > 3 MS/s. PR #1886. Fixes #1885. * Indicate audio FIFO underflow/overflow. PR #1887 - * ix resize cursor not being cleared when mouse moves over child widgets. PR #1888 + * Fix resize cursor not being cleared when mouse moves over child widgets. PR #1888 * Prevent popup menu when scrolling tables. PR #1889 * Use custom save/restore geometry for MDI sub=windows. PR #1890. Fixes #1835 * Use MDI restore when loading config. PR #1890 diff --git a/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp b/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp index 06171cf55..918c868f4 100644 --- a/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp +++ b/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp @@ -100,6 +100,7 @@ AudioCATSISOGUI::AudioCATSISOGUI(DeviceUISet *deviceUISet, QWidget* parent) : makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } AudioCATSISOGUI::~AudioCATSISOGUI() diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index 1436b89ed..ec62638d6 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -105,6 +105,7 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) : sendSettings(); makeUIConnections(); + m_resizer.enableChildMouseTracking(); } BladeRF2MIMOGui::~BladeRF2MIMOGui() diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp index 262e24077..c94622b02 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp @@ -33,7 +33,7 @@ const PluginDescriptor BladeRF2MIMOPlugin::m_pluginDescriptor = { QStringLiteral("BladeRF2"), QStringLiteral("BladeRF2 MIMO"), - QStringLiteral("7.8.2"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index 04b7e517b..c8d5c0389 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -107,6 +107,7 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : sendSettings(); makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } LimeSDRMIMOGUI::~LimeSDRMIMOGUI() diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp index c71ecb22b..52378f455 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp @@ -34,7 +34,7 @@ const PluginDescriptor LimeSDRMIMOPlugin::m_pluginDescriptor = { QStringLiteral("LimeSDR"), QStringLiteral("LimeSDR MIMO"), - QStringLiteral("7.8.2"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp index ce4ad695e..dcc68ddd5 100644 --- a/plugins/samplemimo/metismiso/metismisogui.cpp +++ b/plugins/samplemimo/metismiso/metismisogui.cpp @@ -79,6 +79,7 @@ MetisMISOGui::MetisMISOGui(DeviceUISet *deviceUISet, QWidget* parent) : makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } MetisMISOGui::~MetisMISOGui() diff --git a/plugins/samplemimo/metismiso/metismisoplugin.cpp b/plugins/samplemimo/metismiso/metismisoplugin.cpp index fc6d4bc73..af4694d70 100644 --- a/plugins/samplemimo/metismiso/metismisoplugin.cpp +++ b/plugins/samplemimo/metismiso/metismisoplugin.cpp @@ -34,7 +34,7 @@ const PluginDescriptor MetisMISOPlugin::m_pluginDescriptor = { QStringLiteral("MetisMISO"), QStringLiteral("Metis MISO"), - QStringLiteral("7.8.5"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp index 7dfe914dc..5a62409e8 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp @@ -110,6 +110,7 @@ PlutoSDRMIMOGUI::PlutoSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } PlutoSDRMIMOGUI::~PlutoSDRMIMOGUI() diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp index a9b0e36c0..3a93a9392 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp @@ -34,7 +34,7 @@ const PluginDescriptor PlutoSDRMIMOPlugin::m_pluginDescriptor = { QStringLiteral("PlutoSDR"), QStringLiteral("PlutoSDR MIMO"), - QStringLiteral("7.15.3"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index 0ad065280..ec2f0f598 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -92,6 +92,7 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } TestMIGui::~TestMIGui() diff --git a/plugins/samplemimo/testmi/testmiplugin.cpp b/plugins/samplemimo/testmi/testmiplugin.cpp index 70dc3d2f8..69f7e0725 100644 --- a/plugins/samplemimo/testmi/testmiplugin.cpp +++ b/plugins/samplemimo/testmi/testmiplugin.cpp @@ -33,7 +33,7 @@ const PluginDescriptor TestMIPlugin::m_pluginDescriptor = { QStringLiteral("TestMI"), QStringLiteral("Test Multiple Input"), - QStringLiteral("7.8.1"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index 6d7bec001..cf5b97e74 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -90,6 +90,7 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet->setSpectrumScalingFactor(SDR_TX_SCALEF); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &))); + m_resizer.enableChildMouseTracking(); } TestMOSyncGui::~TestMOSyncGui() diff --git a/plugins/samplemimo/testmosync/testmosyncplugin.cpp b/plugins/samplemimo/testmosync/testmosyncplugin.cpp index 7bfc9acab..5553ae865 100644 --- a/plugins/samplemimo/testmosync/testmosyncplugin.cpp +++ b/plugins/samplemimo/testmosync/testmosyncplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor TestMOSyncPlugin::m_pluginDescriptor = { QStringLiteral("TestMOSync"), QStringLiteral("Test Synchronous Multiple Output"), - QStringLiteral("7.8.2"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index 7a69d9901..191a75631 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -105,6 +105,7 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : sendSettings(); makeUIConnections(); DialPopup::addPopupsToChildDials(this); + m_resizer.enableChildMouseTracking(); } XTRXMIMOGUI::~XTRXMIMOGUI() diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp index 384df09d1..60e4e2aa6 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp @@ -34,7 +34,7 @@ const PluginDescriptor XTRXMIMOPlugin::m_pluginDescriptor = { QStringLiteral("XTRX"), QStringLiteral("XTRX MIMO"), - QStringLiteral("7.8.2"), + QStringLiteral("7.17.1"), QStringLiteral("(c) Edouard Griffiths, F4EXB"), QStringLiteral("https://github.com/f4exb/sdrangel"), true,