diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index f69e6b199..83310101f 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -68,7 +67,7 @@ BladeRF2MIMOGui::BladeRF2MIMOGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#BladeRF2MIMOGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/bladerf2mimo/readme.md"; m_sampleMIMO = (BladeRF2MIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); @@ -145,12 +144,6 @@ bool BladeRF2MIMOGui::deserialize(const QByteArray& data) } } -void BladeRF2MIMOGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void BladeRF2MIMOGui::displaySettings() { updateFrequencyLimits(); diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h index 53b1f05f2..cab43ce5d 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::BladeRF2MIMOGui* ui; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index 604277253..fa1756887 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -70,7 +69,7 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#LimeSDRMIMOGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/limesdrmimo/readme.md"; m_limeSDRMIMO = (LimeSDRMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); @@ -145,12 +144,6 @@ bool LimeSDRMIMOGUI::deserialize(const QByteArray& data) } } -void LimeSDRMIMOGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void LimeSDRMIMOGUI::handleInputMessages() { Message* message; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h index badb71b25..918e1e12c 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::LimeSDRMIMOGUI* ui; diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp index d0d082f76..66faee965 100644 --- a/plugins/samplemimo/metismiso/metismisogui.cpp +++ b/plugins/samplemimo/metismiso/metismisogui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -58,7 +57,7 @@ MetisMISOGui::MetisMISOGui(DeviceUISet *deviceUISet, QWidget* parent) : m_txSampleRate = 48000; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#MetisMISOGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/metismiso/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -113,12 +112,6 @@ void MetisMISOGui::setCenterFrequency(qint64 centerFrequency) sendSettings(); } -void MetisMISOGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - QByteArray MetisMISOGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplemimo/metismiso/metismisogui.h b/plugins/samplemimo/metismiso/metismisogui.h index 812a8f221..4c9d8263a 100644 --- a/plugins/samplemimo/metismiso/metismisogui.h +++ b/plugins/samplemimo/metismiso/metismisogui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::MetisMISOGui* ui; diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp index 2f3691fd4..8d3f28c70 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -70,7 +69,7 @@ PlutoSDRMIMOGUI::PlutoSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#PlutoSDRMIMOGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/plutosdrmimo/readme.md"; m_sampleMIMO = (PlutoSDRMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); @@ -146,12 +145,6 @@ bool PlutoSDRMIMOGUI::deserialize(const QByteArray& data) } } -void PlutoSDRMIMOGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void PlutoSDRMIMOGUI::displaySettings() { if (m_rxElseTx) diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h index b3adb5aaa..1cd6be762 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::PlutoSDRMIMOGUI* ui; diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index 537c7df82..9a566b3e7 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -57,7 +56,7 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : setAttribute(Qt::WA_DeleteOnClose, true); m_helpURL = "plugins/samplemimo/testmi/readme.md"; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#TestMIGui { background-color: rgb(64, 64, 64); }"); m_sampleMIMO = m_deviceUISet->m_deviceAPI->getSampleMIMO(); @@ -126,12 +125,6 @@ bool TestMIGui::deserialize(const QByteArray& data) } } -void TestMIGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void TestMIGui::on_startStop_toggled(bool checked) { if (m_doApplySettings) diff --git a/plugins/samplemimo/testmi/testmigui.h b/plugins/samplemimo/testmi/testmigui.h index 41a949014..7874b36bf 100644 --- a/plugins/samplemimo/testmi/testmigui.h +++ b/plugins/samplemimo/testmi/testmigui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::TestMIGui* ui; diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index d7f00396b..1f32e8496 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -54,7 +54,7 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) : m_helpURL = "plugins/samplemimo/testmosync/readme.md"; QWidget *contents = getContents(); ui->setupUi(contents); - setSizePolicy(contents->sizePolicy()); + sizeToContents(); getContents()->setStyleSheet("#TestMOSyncGui { background-color: rgb(64, 64, 64); }"); m_sampleMIMO = (TestMOSync*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index 5e7dcdf40..e6816037c 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -67,7 +66,7 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#XTRXMIMOGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/xtrxmimo/readme.md"; m_xtrxMIMO = (XTRXMIMO*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); @@ -142,12 +141,6 @@ bool XTRXMIMOGUI::deserialize(const QByteArray& data) } } -void XTRXMIMOGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void XTRXMIMOGUI::handleInputMessages() { Message* message; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h index d35a50b3a..3e7e027d5 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::XTRXMIMOGUI* ui; diff --git a/plugins/samplesink/audiooutput/audiooutputgui.cpp b/plugins/samplesink/audiooutput/audiooutputgui.cpp index 9a709f09c..63614ed77 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.cpp +++ b/plugins/samplesink/audiooutput/audiooutputgui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "ui_audiooutputgui.h" #include "gui/colormapper.h" @@ -44,7 +43,7 @@ AudioOutputGui::AudioOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_audioOutput = (AudioOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#AudioOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/audiooutput/readme.md"; @@ -103,12 +102,6 @@ bool AudioOutputGui::deserialize(const QByteArray& data) } } -void AudioOutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool AudioOutputGui::handleMessage(const Message& message) { if (AudioOutput::MsgConfigureAudioOutput::match(message)) diff --git a/plugins/samplesink/audiooutput/audiooutputgui.h b/plugins/samplesink/audiooutput/audiooutputgui.h index bff0acf8a..ad8f6e79c 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.h +++ b/plugins/samplesink/audiooutput/audiooutputgui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::AudioOutputGui* ui; diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index 8e18af396..8ec280297 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include @@ -47,7 +46,7 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#Bladerf1OutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000); @@ -115,12 +114,6 @@ bool Bladerf1OutputGui::deserialize(const QByteArray& data) } } -void Bladerf1OutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool Bladerf1OutputGui::handleMessage(const Message& message) { if (Bladerf1Output::MsgConfigureBladerf1::match(message)) diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.h b/plugins/samplesink/bladerf1output/bladerf1outputgui.h index 423f8102f..eca723d55 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::Bladerf1OutputGui* ui; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index a61f040b4..78fe63cdf 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include @@ -50,7 +49,7 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) uint64_t f_min, f_max; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#BladeRF2OutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/bladerf2output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -127,12 +126,6 @@ bool BladeRF2OutputGui::deserialize(const QByteArray& data) } } -void BladeRF2OutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void BladeRF2OutputGui::updateFrequencyLimits() { // values in kHz diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.h b/plugins/samplesink/bladerf2output/bladerf2outputgui.h index 8fff311cf..10a149fbd 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.h @@ -47,9 +47,6 @@ public: virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::BladeRF2OutputGui* ui; diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp index 47c2ac7b7..fc2cd7825 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.cpp +++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "ui_fileoutputgui.h" #include "plugin/pluginapi.h" @@ -55,7 +54,7 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#FileOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/fileoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -119,12 +118,6 @@ bool FileOutputGui::deserialize(const QByteArray& data) } } -void FileOutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool FileOutputGui::handleMessage(const Message& message) { if (FileOutput::MsgConfigureFileOutput::match(message)) diff --git a/plugins/samplesink/fileoutput/fileoutputgui.h b/plugins/samplesink/fileoutput/fileoutputgui.h index 31781534d..09afdc292 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.h +++ b/plugins/samplesink/fileoutput/fileoutputgui.h @@ -48,9 +48,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::FileOutputGui* ui; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index 6de54ec15..dac003a81 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include @@ -49,7 +48,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#HackRFOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/hackrfoutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -113,12 +112,6 @@ bool HackRFOutputGui::deserialize(const QByteArray& data) } } -void HackRFOutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void HackRFOutputGui::blockApplySettings(bool block) { m_doApplySettings = !block; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h index a39da9401..2b3ec64ab 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -56,9 +56,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::HackRFOutputGui* ui; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 66aeb9870..60e9c98a2 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "ui_limesdroutputgui.h" #include "gui/colormapper.h" @@ -46,7 +45,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#LimeSDROutputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/limesdroutput/readme.md"; @@ -140,12 +139,6 @@ bool LimeSDROutputGUI::deserialize(const QByteArray& data) } } -void LimeSDROutputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void LimeSDROutputGUI::updateFrequencyLimits() { // values in kHz diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index b501dc4f7..b3c08b09d 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::LimeSDROutputGUI* ui; diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp index d75d452b4..489d5b6a7 100644 --- a/plugins/samplesink/localoutput/localoutputgui.cpp +++ b/plugins/samplesink/localoutput/localoutputgui.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include "ui_localoutputgui.h" #include "gui/colormapper.h" @@ -63,7 +62,7 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#LocalOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/localoutput/readme.md"; @@ -133,12 +132,6 @@ bool LocalOutputGui::deserialize(const QByteArray& data) } } -void LocalOutputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool LocalOutputGui::handleMessage(const Message& message) { if (LocalOutput::MsgConfigureLocalOutput::match(message)) diff --git a/plugins/samplesink/localoutput/localoutputgui.h b/plugins/samplesink/localoutput/localoutputgui.h index cedde9a5d..97c9da291 100644 --- a/plugins/samplesink/localoutput/localoutputgui.h +++ b/plugins/samplesink/localoutput/localoutputgui.h @@ -47,9 +47,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::LocalOutputGui* ui; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index baa891a30..c8bdb0998 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -49,7 +48,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#PlutoSDROutputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/plutosdroutput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -125,12 +124,6 @@ bool PlutoSDROutputGUI::deserialize(const QByteArray& data) } } -void PlutoSDROutputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool PlutoSDROutputGUI::handleMessage(const Message& message) { (void) message; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h index 9400be985..f8b95eb88 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h @@ -48,9 +48,6 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::PlutoSDROutputGUI* ui; PlutoSDROutputSettings m_settings; diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp index 46e4f72d2..30b7342e1 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -68,7 +67,7 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#RemoteOutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/remoteoutput/readme.md"; @@ -145,12 +144,6 @@ bool RemoteOutputSinkGui::deserialize(const QByteArray& data) } } -void RemoteOutputSinkGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool RemoteOutputSinkGui::handleMessage(const Message& message) { if (RemoteOutput::MsgConfigureRemoteOutput::match(message)) diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.h b/plugins/samplesink/remoteoutput/remoteoutputgui.h index d7fec2506..19c75c5d9 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.h +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.h @@ -78,9 +78,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::RemoteOutputGui* ui; diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index 4e9b59a5c..1c9d08547 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -60,7 +60,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) setAttribute(Qt::WA_DeleteOnClose, true); m_sampleSink = (SoapySDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + sizeToContents(); getContents()->setStyleSheet("#SoapySDROutputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/soapysdroutput/readme.md"; diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 88bdb0fd9..d86ddbd45 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -53,7 +53,7 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_helpURL = "plugins/samplesink/testsink/readme.md"; QWidget *contents = getContents(); ui->setupUi(contents); - setSizePolicy(contents->sizePolicy()); + sizeToContents(); setMinimumSize(m_MinimumWidth, m_MinimumHeight); getContents()->setStyleSheet("#TestSinkGui { background-color: rgb(64, 64, 64); }"); m_sampleSink = (TestSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index 02e758dba..266ae7bcb 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -18,7 +18,6 @@ #include #include -#include #include "ui_usrpoutputgui.h" #include "gui/colormapper.h" @@ -47,7 +46,7 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpOutput = (USRPOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#USRPOutputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/usrpoutput/readme.md"; @@ -154,12 +153,6 @@ bool USRPOutputGUI::deserialize(const QByteArray& data) } } -void USRPOutputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void USRPOutputGUI::updateFrequencyLimits() { // values in kHz diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.h b/plugins/samplesink/usrpoutput/usrpoutputgui.h index 74a8e0003..eff29ca59 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.h +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.h @@ -53,9 +53,6 @@ public: virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::USRPOutputGUI* ui; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index 51d8dbe7e..dcb5ef372 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -19,7 +19,6 @@ #include #include -#include #include "ui_xtrxoutputgui.h" #include "gui/colormapper.h" @@ -48,7 +47,7 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#XTRXOutputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesink/xtrxoutput/readme.md"; @@ -123,12 +122,6 @@ bool XTRXOutputGUI::deserialize(const QByteArray& data) } } -void XTRXOutputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool XTRXOutputGUI::handleMessage(const Message& message) { diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h index 615cb64de..f9d0f179a 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::XTRXOutputGUI* ui; diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 5e3e983b7..67c76b8d2 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include @@ -48,7 +47,7 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#AirspyGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/airspy/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -109,12 +108,6 @@ bool AirspyGui::deserialize(const QByteArray& data) } } -void AirspyGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool AirspyGui::handleMessage(const Message& message) { if (AirspyInput::MsgConfigureAirspy::match(message)) diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index 249829252..98fb4b375 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -48,9 +48,6 @@ public: uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::AirspyGui* ui; diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index bb67f3fc6..6720e543a 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include @@ -47,7 +46,7 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#AirspyHFGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/airspyhf/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -108,12 +107,6 @@ bool AirspyHFGui::deserialize(const QByteArray& data) } } -void AirspyHFGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool AirspyHFGui::handleMessage(const Message& message) { if (AirspyHFInput::MsgConfigureAirspyHF::match(message)) diff --git a/plugins/samplesource/airspyhf/airspyhfgui.h b/plugins/samplesource/airspyhf/airspyhfgui.h index ddfc17aef..4ff7aad1a 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.h +++ b/plugins/samplesource/airspyhf/airspyhfgui.h @@ -49,9 +49,6 @@ public: uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::AirspyHFGui* ui; diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp index f873573e0..0d662846f 100644 --- a/plugins/samplesource/audioinput/audioinputgui.cpp +++ b/plugins/samplesource/audioinput/audioinputgui.cpp @@ -18,7 +18,6 @@ #include #include -#include #include "ui_audioinputgui.h" #include "gui/colormapper.h" @@ -44,7 +43,7 @@ AudioInputGui::AudioInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AudioInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#AudioInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/audioinput/readme.md"; @@ -98,12 +97,6 @@ bool AudioInputGui::deserialize(const QByteArray& data) } } -void AudioInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool AudioInputGui::handleMessage(const Message& message) { if (AudioInput::MsgConfigureAudioInput::match(message)) diff --git a/plugins/samplesource/audioinput/audioinputgui.h b/plugins/samplesource/audioinput/audioinputgui.h index 88b11432b..9de6904c3 100644 --- a/plugins/samplesource/audioinput/audioinputgui.h +++ b/plugins/samplesource/audioinput/audioinputgui.h @@ -47,9 +47,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::AudioInputGui* ui; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 785745fd7..41a718cec 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include @@ -49,7 +48,7 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (Bladerf1Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#Bladerf1InputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/bladerf1input/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -118,12 +117,6 @@ bool Bladerf1InputGui::deserialize(const QByteArray& data) } } -void Bladerf1InputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool Bladerf1InputGui::handleMessage(const Message& message) { if (Bladerf1Input::MsgConfigureBladerf1::match(message)) diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.h b/plugins/samplesource/bladerf1input/bladerf1inputgui.h index 1228e8928..27ebcf2d7 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.h @@ -72,9 +72,6 @@ private: bool handleMessage(const Message& message); void makeUIConnections(); -protected: - void resizeEvent(QResizeEvent* size); - private slots: void handleInputMessages(); void on_centerFrequency_changed(quint64 value); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index adbb44098..a12ebeb97 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include @@ -52,7 +51,7 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : uint64_t f_min, f_max; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#Bladerf2InputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/bladerf2input/readme.md"; @@ -140,12 +139,6 @@ bool BladeRF2InputGui::deserialize(const QByteArray& data) } } -void BladeRF2InputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void BladeRF2InputGui::updateFrequencyLimits() { // values in kHz diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.h b/plugins/samplesource/bladerf2input/bladerf2inputgui.h index 62b6a1b0f..ff224f479 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.h @@ -79,9 +79,6 @@ private: bool handleMessage(const Message& message); void makeUIConnections(); -protected: - void resizeEvent(QResizeEvent* size); - private slots: void handleInputMessages(); void on_centerFrequency_changed(quint64 value); diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 4d24f9cfa..b8528f5f1 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "ui_fcdprogui.h" #include "gui/colormapper.h" @@ -45,7 +44,7 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#FCDProGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/fcdpro/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -200,12 +199,6 @@ bool FCDProGui::deserialize(const QByteArray& data) } } -void FCDProGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool FCDProGui::handleMessage(const Message& message) { if (FCDProInput::MsgConfigureFCDPro::match(message)) diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index c4f7376c8..1429fd9ea 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -70,9 +70,6 @@ private: bool handleMessage(const Message& message); void makeUIConnections(); -protected: - void resizeEvent(QResizeEvent* size); - private slots: void handleInputMessages(); void on_centerFrequency_changed(quint64 value); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index aed9efbeb..4c2583510 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "ui_fcdproplusgui.h" #include "gui/colormapper.h" @@ -46,7 +45,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#FCDProPlusGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/fcdproplus/readme.md"; @@ -119,12 +118,6 @@ bool FCDProPlusGui::deserialize(const QByteArray& data) } } -void FCDProPlusGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool FCDProPlusGui::handleMessage(const Message& message) { if (FCDProPlusInput::MsgConfigureFCDProPlus::match(message)) diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index a0226de56..de099012f 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -69,9 +69,6 @@ private: bool handleMessage(const Message& message); void makeUIConnections(); -protected: - void resizeEvent(QResizeEvent* size); - private slots: void handleInputMessages(); void on_centerFrequency_changed(quint64 value); diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp index 1b8bdd33c..143925a3b 100644 --- a/plugins/samplesource/fileinput/fileinputgui.cpp +++ b/plugins/samplesource/fileinput/fileinputgui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "ui_fileinputgui.h" #include "plugin/pluginapi.h" @@ -57,7 +56,7 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet = deviceUISet; setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#FileInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/fileinput/readme.md"; ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); @@ -119,12 +118,6 @@ bool FileInputGUI::deserialize(const QByteArray& data) } } -void FileInputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void FileInputGUI::handleInputMessages() { Message* message; diff --git a/plugins/samplesource/fileinput/fileinputgui.h b/plugins/samplesource/fileinput/fileinputgui.h index 8c5be3ec3..bc7ac5057 100644 --- a/plugins/samplesource/fileinput/fileinputgui.h +++ b/plugins/samplesource/fileinput/fileinputgui.h @@ -47,9 +47,6 @@ public: virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::FileInputGUI* ui; diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 3c8484500..1f2d15c20 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include @@ -50,7 +49,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#HackRFInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/hackrfinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -118,12 +117,6 @@ bool HackRFInputGui::deserialize(const QByteArray& data) } } -void HackRFInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool HackRFInputGui::handleMessage(const Message& message) { if (HackRFInput::MsgConfigureHackRF::match(message)) diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index 93be43577..33c7f38d8 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -55,9 +55,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::HackRFInputGui* ui; diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp index ce90bcfc5..4c8ba4e57 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "ui_kiwisdrgui.h" #include "plugin/pluginapi.h" @@ -68,7 +67,7 @@ KiwiSDRGui::KiwiSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_statusColors.push_back("rgb(232, 85, 232)"); // Disconnected (magenta) ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#KiwiSDRGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/kiwisdr/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -123,12 +122,6 @@ bool KiwiSDRGui::deserialize(const QByteArray& data) } } -void KiwiSDRGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void KiwiSDRGui::on_startStop_toggled(bool checked) { if (m_doApplySettings) diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.h b/plugins/samplesource/kiwisdr/kiwisdrgui.h index 7e39465fb..2586186c4 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.h +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.h @@ -47,9 +47,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::KiwiSDRGui* ui; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 5888627e4..c08137c58 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include @@ -50,7 +49,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#LimeSDRInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/limesdrinput/readme.md"; @@ -146,12 +145,6 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data) } } -void LimeSDRInputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool LimeSDRInputGUI::handleMessage(const Message& message) { if (LimeSDRInput::MsgConfigureLimeSDR::match(message)) diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h index 7f57b1caa..3b3162c61 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -45,9 +45,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::LimeSDRInputGUI* ui; diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp index b3f6da06d..955d4620e 100644 --- a/plugins/samplesource/localinput/localinputgui.cpp +++ b/plugins/samplesource/localinput/localinputgui.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include "ui_localinputgui.h" #include "gui/colormapper.h" @@ -76,7 +75,7 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#LocalInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/localinput/readme.md"; @@ -146,12 +145,6 @@ bool LocalInputGui::deserialize(const QByteArray& data) } } -void LocalInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool LocalInputGui::handleMessage(const Message& message) { if (LocalInput::MsgConfigureLocalInput::match(message)) diff --git a/plugins/samplesource/localinput/localinputgui.h b/plugins/samplesource/localinput/localinputgui.h index bdafb77b7..b45851d91 100644 --- a/plugins/samplesource/localinput/localinputgui.h +++ b/plugins/samplesource/localinput/localinputgui.h @@ -47,9 +47,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::LocalInputGui* ui; diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index faee81742..fffb5e238 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "device/deviceapi.h" #include "device/deviceuiset.h" @@ -45,7 +44,7 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#PerseusGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/perseus/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -106,13 +105,6 @@ bool PerseusGui::deserialize(const QByteArray& data) } } -void PerseusGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - - bool PerseusGui::handleMessage(const Message& message) { // Returned messages to update the GUI (usually from web interface) diff --git a/plugins/samplesource/perseus/perseusgui.h b/plugins/samplesource/perseus/perseusgui.h index d515eb9de..98e183db4 100644 --- a/plugins/samplesource/perseus/perseusgui.h +++ b/plugins/samplesource/perseus/perseusgui.h @@ -48,9 +48,6 @@ public: uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::PerseusGui* ui; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index f974fe7ac..01bb6456c 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -50,7 +49,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#PlutoSDRInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/plutosdrinput/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -129,12 +128,6 @@ bool PlutoSDRInputGui::deserialize(const QByteArray& data) } } -void PlutoSDRInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool PlutoSDRInputGui::handleMessage(const Message& message) { if (PlutoSDRInput::MsgConfigurePlutoSDR::match(message)) diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h index 282ea20c0..d491924ca 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -48,9 +48,6 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::PlutoSDRInputGUI* ui; PlutoSDRInputSettings m_settings; diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index 800fffd83..71ba66c35 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include "ui_remoteinputgui.h" #include "gui/colormapper.h" @@ -73,7 +72,7 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#RemoteInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/remoteinput/readme.md"; @@ -152,12 +151,6 @@ bool RemoteInputGui::deserialize(const QByteArray& data) } } -void RemoteInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool RemoteInputGui::handleMessage(const Message& message) { if (RemoteInput::MsgConfigureRemoteInput::match(message)) diff --git a/plugins/samplesource/remoteinput/remoteinputgui.h b/plugins/samplesource/remoteinput/remoteinputgui.h index ef652e86a..4047feac9 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.h +++ b/plugins/samplesource/remoteinput/remoteinputgui.h @@ -49,9 +49,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::RemoteInputGui* ui; diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp index 80974f85e..396efadc5 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include "ui_remotetcpinputgui.h" #include "gui/colormapper.h" @@ -54,7 +53,7 @@ RemoteTCPInputGui::RemoteTCPInputGui(DeviceUISet *deviceUISet, QWidget* parent) setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#RemoteTCPInputGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/remotetcpinput/readme.md"; @@ -138,12 +137,6 @@ bool RemoteTCPInputGui::deserialize(const QByteArray& data) } } -void RemoteTCPInputGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool RemoteTCPInputGui::handleMessage(const Message& message) { if (RemoteTCPInput::MsgConfigureRemoteTCPInput::match(message)) diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.h b/plugins/samplesource/remotetcpinput/remotetcpinputgui.h index e96c8e4e2..22b07de73 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.h +++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.h @@ -96,9 +96,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::RemoteTCPInputGui* ui; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 544d5a98c..8cceb9800 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "rtlsdrgui.h" @@ -46,7 +45,7 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#RTLSDRGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/rtlsdr/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -128,12 +127,6 @@ bool RTLSDRGui::deserialize(const QByteArray& data) } } -void RTLSDRGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool RTLSDRGui::handleMessage(const Message& message) { if (RTLSDRInput::MsgConfigureRTLSDR::match(message)) diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index 55013150e..a290d246a 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -47,9 +47,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::RTLSDRGui* ui; diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index 46542d152..9759e2e74 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "sdrplaygui.h" @@ -44,7 +43,7 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#SDRPlayGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/sdrplay/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -128,12 +127,6 @@ bool SDRPlayGui::deserialize(const QByteArray& data) } } -void SDRPlayGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool SDRPlayGui::handleMessage(const Message& message) { if (SDRPlayInput::MsgConfigureSDRPlay::match(message)) diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index 267d0dc92..f53596fb7 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -47,9 +47,6 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::SDRPlayGui* ui; diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp index 749675366..23ad2d11c 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp @@ -18,7 +18,6 @@ #include #include -#include #include "sdrplayv3gui.h" #include "sdrplayv3input.h" @@ -44,7 +43,7 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) : m_sdrPlayV3Input = (SDRPlayV3Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#SDRPlayV3Gui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/sdrplayv3/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -164,12 +163,6 @@ bool SDRPlayV3Gui::deserialize(const QByteArray& data) } } -void SDRPlayV3Gui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool SDRPlayV3Gui::handleMessage(const Message& message) { if (SDRPlayV3Input::MsgConfigureSDRPlayV3::match(message)) diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.h b/plugins/samplesource/sdrplayv3/sdrplayv3gui.h index 0f04429d9..42e2a2ede 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.h +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.h @@ -47,9 +47,6 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::SDRPlayV3Gui* ui; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index c94be303c..1a446452d 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "ui_sigmffileinputgui.h" #include "plugin/pluginapi.h" @@ -66,7 +65,7 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_helpURL = "plugins/samplesource/sigmffileinput/readme.md"; QWidget *contents = getContents(); ui->setupUi(contents); - setSizePolicy(contents->sizePolicy()); + sizeToContents(); contents->setStyleSheet("#SigMFFileInputGUI { background-color: rgb(64, 64, 64); }"); ui->fileNameText->setText(m_metaFileName); diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index 0cfb4e202..408e60715 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "ui_testsourcegui.h" #include "plugin/pluginapi.h" @@ -55,7 +54,7 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#TestSourceGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/testsource/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -120,12 +119,6 @@ bool TestSourceGui::deserialize(const QByteArray& data) } } -void TestSourceGui::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - void TestSourceGui::on_startStop_toggled(bool checked) { if (m_doApplySettings) diff --git a/plugins/samplesource/testsource/testsourcegui.h b/plugins/samplesource/testsource/testsourcegui.h index 90bf61e60..58ba25ff0 100644 --- a/plugins/samplesource/testsource/testsourcegui.h +++ b/plugins/samplesource/testsource/testsourcegui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::TestSourceGui* ui; diff --git a/plugins/samplesource/testsource/testsourcegui.ui b/plugins/samplesource/testsource/testsourcegui.ui index 4852944ea..8d3418adf 100644 --- a/plugins/samplesource/testsource/testsourcegui.ui +++ b/plugins/samplesource/testsource/testsourcegui.ui @@ -24,7 +24,7 @@ - 386 + 380 343 diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index 61a40584e..089228fdc 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include @@ -51,7 +50,7 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpInput = (USRPInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#USRPInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/usrpinput/readme.md"; @@ -157,12 +156,6 @@ bool USRPInputGUI::deserialize(const QByteArray& data) } } -void USRPInputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool USRPInputGUI::handleMessage(const Message& message) { if (USRPInput::MsgConfigureUSRP::match(message)) diff --git a/plugins/samplesource/usrpinput/usrpinputgui.h b/plugins/samplesource/usrpinput/usrpinputgui.h index 41fa7dbd9..305ee36bf 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.h +++ b/plugins/samplesource/usrpinput/usrpinputgui.h @@ -51,9 +51,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::USRPInputGUI* ui; diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 177d995c0..f5fe67520 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include @@ -51,7 +50,7 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXInput = (XTRXInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizeToContents(); getContents()->setStyleSheet("#XTRXInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/xtrxinput/readme.md"; @@ -126,12 +125,6 @@ bool XTRXInputGUI::deserialize(const QByteArray& data) } } -void XTRXInputGUI::resizeEvent(QResizeEvent* size) -{ - adjustSize(); - size->accept(); -} - bool XTRXInputGUI::handleMessage(const Message& message) { diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.h b/plugins/samplesource/xtrxinput/xtrxinputgui.h index 4772f86c9..20d6e6908 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.h +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.h @@ -46,9 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } -protected: - void resizeEvent(QResizeEvent* size); - private: Ui::XTRXInputGUI* ui; diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp index e7f32e484..4dac186eb 100644 --- a/sdrgui/device/devicegui.cpp +++ b/sdrgui/device/devicegui.cpp @@ -111,6 +111,12 @@ DeviceGUI::DeviceGUI(QWidget *parent) : m_shrinkButton->setIcon(shrinkIcon); m_shrinkButton->setToolTip("Adjust window to minimum size"); + m_maximizeButton = new QPushButton(); + m_maximizeButton->setFixedSize(20, 20); + QIcon maximizeIcon(":/maximize.png"); + m_maximizeButton->setIcon(maximizeIcon); + m_maximizeButton->setToolTip("Adjust window to maximum size"); + m_closeButton = new QPushButton(); m_closeButton->setFixedSize(20, 20); QIcon closeIcon(":/cross.png"); @@ -153,6 +159,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) : m_topLayout->addWidget(m_helpButton); m_topLayout->addWidget(m_moveButton); m_topLayout->addWidget(m_shrinkButton); + m_topLayout->addWidget(m_maximizeButton); m_topLayout->addWidget(m_closeButton); m_centerLayout = new QHBoxLayout(); @@ -186,6 +193,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) : connect(m_helpButton, SIGNAL(clicked()), this, SLOT(showHelp())); connect(m_moveButton, SIGNAL(clicked()), this, SLOT(openMoveToWorkspaceDialog())); connect(m_shrinkButton, SIGNAL(clicked()), this, SLOT(shrinkWindow())); + connect(m_maximizeButton, SIGNAL(clicked()), this, SLOT(maximizeWindow())); connect(this, SIGNAL(forceShrink()), this, SLOT(shrinkWindow())); connect(m_closeButton, SIGNAL(clicked()), this, SLOT(close())); connect(m_showSpectrumButton, SIGNAL(clicked()), this, SLOT(showSpectrumHandler())); @@ -214,6 +222,7 @@ DeviceGUI::~DeviceGUI() delete m_statusLabel; delete m_closeButton; delete m_shrinkButton; + delete m_maximizeButton; delete m_moveButton; delete m_helpButton; delete m_titleLabel; @@ -226,6 +235,37 @@ DeviceGUI::~DeviceGUI() qDebug("DeviceGUI::~DeviceGUI: end"); } +// Size the window according to the size of the m_contents widget +// This allows the window min/max size and size policy to be set by the .ui file +void DeviceGUI::sizeToContents() +{ + // Set window size policy to the size policy of m_contents widget + QSizePolicy policy = getContents()->sizePolicy(); + setSizePolicy(policy); + + // If size policy is fixed, hide widgets that resize the window + if ((policy.verticalPolicy() == QSizePolicy::Fixed) && (policy.horizontalPolicy() == QSizePolicy::Fixed)) + { + m_shrinkButton->hide(); + m_maximizeButton->hide(); + // The resize grip can magically reappear after being maximized, so delete it, to prevent this + delete m_sizeGripBottomRight; + m_sizeGripBottomRight = nullptr; + } + + // Calculate min/max size for window. This is min/max size of contents, plus + // extra needed for window frame and title bar + QSize size; + size = getContents()->maximumSize(); + size.setHeight(std::min(size.height() + getAdditionalHeight(), QWIDGETSIZE_MAX)); + size.setWidth(std::min(size.width() + m_resizer.m_gripSize * 2, QWIDGETSIZE_MAX)); + setMaximumSize(size); + size = getContents()->minimumSize(); + size.setHeight(std::min(size.height() + getAdditionalHeight(), QWIDGETSIZE_MAX)); + size.setWidth(std::min(size.width() + m_resizer.m_gripSize * 2, QWIDGETSIZE_MAX)); + setMinimumSize(size); +} + void DeviceGUI::setWorkspaceIndex(int index) { m_workspaceIndex = index; @@ -352,9 +392,15 @@ void DeviceGUI::showAllChannelsHandler() void DeviceGUI::shrinkWindow() { qDebug("DeviceGUI::shrinkWindow"); + showNormal(); // In case it had been maximized adjustSize(); } +void DeviceGUI::maximizeWindow() +{ + showMaximized(); +} + void DeviceGUI::deviceSetPresetsDialog() { QPoint p = mapFromGlobal(QCursor::pos()); diff --git a/sdrgui/device/devicegui.h b/sdrgui/device/devicegui.h index 32f4a90f8..bd272b06a 100644 --- a/sdrgui/device/devicegui.h +++ b/sdrgui/device/devicegui.h @@ -68,6 +68,7 @@ public: virtual MessageQueue* getInputMessageQueue() = 0; QWidget *getContents() { return m_contents; } + void sizeToContents(); void setDeviceType(DeviceType type); DeviceType getDeviceType() const { return m_deviceType; } void setTitle(const QString& title); @@ -97,6 +98,7 @@ protected: protected slots: void shrinkWindow(); + void maximizeWindow(); private: bool isOnMovingPad(); @@ -113,6 +115,7 @@ private: QPushButton *m_helpButton; QPushButton *m_moveButton; QPushButton *m_shrinkButton; + QPushButton *m_maximizeButton; QPushButton *m_closeButton; QPushButton *m_showSpectrumButton; QPushButton *m_showAllChannelsButton; diff --git a/sdrgui/gui/workspace.cpp b/sdrgui/gui/workspace.cpp index 830b9aeed..6487426ac 100644 --- a/sdrgui/gui/workspace.cpp +++ b/sdrgui/gui/workspace.cpp @@ -444,6 +444,14 @@ void Workspace::stackSubWindows() // Spacing between windows const int spacing = 2; + // Shrink devices to minimum size, in case they have been maximized + for (auto window : devices) + { + QSize size = window->minimumSizeHint(); + size.expandedTo(window->minimumSize()); + window->resize(size); + } + // Calculate width and height needed for devices int deviceMinWidth = 0; int deviceTotalMinHeight = 0; diff --git a/sdrgui/resources/maximize.png b/sdrgui/resources/maximize.png new file mode 100644 index 000000000..1f8fc676e Binary files /dev/null and b/sdrgui/resources/maximize.png differ diff --git a/sdrgui/resources/res.qrc b/sdrgui/resources/res.qrc index 1c7d14c12..5d4c898da 100644 --- a/sdrgui/resources/res.qrc +++ b/sdrgui/resources/res.qrc @@ -142,6 +142,7 @@ dock.png help.png shrink.png + maximize.png exit.png hide.png channels.png