From 90d331675a47b37d81ce74cf5c50d31102820343 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 21 Apr 2022 07:53:36 +0200 Subject: [PATCH] Massive UI revamping (v7): fixed widget size handling: sample sources. Part ofs #1209 --- plugins/samplesource/airspy/airspygui.cpp | 8 ++ plugins/samplesource/airspy/airspygui.h | 3 + plugins/samplesource/airspy/airspygui.ui | 24 +++--- plugins/samplesource/airspyhf/airspyhfgui.cpp | 8 ++ plugins/samplesource/airspyhf/airspyhfgui.h | 3 + plugins/samplesource/airspyhf/airspyhfgui.ui | 25 ++++--- .../samplesource/audioinput/audioinputgui.cpp | 8 ++ .../samplesource/audioinput/audioinputgui.h | 3 + .../samplesource/audioinput/audioinputgui.ui | 46 ++++++++++-- .../bladerf1input/bladerf1inputgui.cpp | 8 ++ .../bladerf1input/bladerf1inputgui.h | 3 + .../bladerf1input/bladerf1inputgui.ui | 22 ++++-- .../bladerf2input/bladerf2inputgui.cpp | 8 ++ .../bladerf2input/bladerf2inputgui.h | 3 + .../bladerf2input/bladerf2inputgui.ui | 22 ++++-- plugins/samplesource/fcdpro/fcdprogui.cpp | 8 ++ plugins/samplesource/fcdpro/fcdprogui.h | 3 + plugins/samplesource/fcdpro/fcdprogui.ui | 22 ++++-- .../samplesource/fcdproplus/fcdproplusgui.cpp | 8 ++ .../samplesource/fcdproplus/fcdproplusgui.h | 3 + .../samplesource/fcdproplus/fcdproplusgui.ui | 22 ++++-- .../samplesource/fileinput/fileinputgui.cpp | 8 ++ plugins/samplesource/fileinput/fileinputgui.h | 3 + .../samplesource/fileinput/fileinputgui.ui | 13 ++-- .../hackrfinput/hackrfinputgui.cpp | 8 ++ .../samplesource/hackrfinput/hackrfinputgui.h | 3 + .../hackrfinput/hackrfinputgui.ui | 24 +++--- plugins/samplesource/kiwisdr/kiwisdrgui.cpp | 8 ++ plugins/samplesource/kiwisdr/kiwisdrgui.h | 3 + plugins/samplesource/kiwisdr/kiwisdrgui.ui | 25 ++++--- .../limesdrinput/limesdrinputgui.cpp | 8 ++ .../limesdrinput/limesdrinputgui.h | 3 + .../limesdrinput/limesdrinputgui.ui | 32 ++++---- .../samplesource/localinput/localinputgui.cpp | 8 ++ .../samplesource/localinput/localinputgui.h | 3 + .../samplesource/localinput/localinputgui.ui | 31 ++++++-- plugins/samplesource/perseus/perseusgui.cpp | 9 +++ plugins/samplesource/perseus/perseusgui.h | 3 + plugins/samplesource/perseus/perseusgui.ui | 22 ++++-- .../plutosdrinput/plutosdrinputgui.cpp | 8 ++ .../plutosdrinput/plutosdrinputgui.h | 3 + .../plutosdrinput/plutosdrinputgui.ui | 22 ++++-- .../remoteinput/remoteinputgui.cpp | 8 ++ .../samplesource/remoteinput/remoteinputgui.h | 3 + .../remoteinput/remoteinputgui.ui | 40 ++++++---- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 9 ++- plugins/samplesource/rtlsdr/rtlsdrgui.h | 3 + plugins/samplesource/rtlsdr/rtlsdrgui.ui | 22 ++++-- plugins/samplesource/sdrplay/sdrplaygui.cpp | 8 ++ plugins/samplesource/sdrplay/sdrplaygui.h | 3 + plugins/samplesource/sdrplay/sdrplaygui.ui | 29 ++++--- .../samplesource/sdrplayv3/sdrplayv3gui.cpp | 8 ++ plugins/samplesource/sdrplayv3/sdrplayv3gui.h | 3 + .../samplesource/sdrplayv3/sdrplayv3gui.ui | 41 +++++----- .../sigmffileinput/sigmffileinputgui.cpp | 8 ++ .../sigmffileinput/sigmffileinputgui.h | 3 + .../sigmffileinput/sigmffileinputgui.ui | 16 ++-- .../soapysdrinput/soapysdrinputgui.cpp | 8 ++ .../soapysdrinput/soapysdrinputgui.h | 3 + .../soapysdrinput/soapysdrinputgui.ui | 34 +++++++-- .../samplesource/testsource/testsourcegui.cpp | 8 ++ .../samplesource/testsource/testsourcegui.h | 3 + .../samplesource/testsource/testsourcegui.ui | 75 ++++++++++++++----- .../samplesource/usrpinput/usrpinputgui.cpp | 8 ++ plugins/samplesource/usrpinput/usrpinputgui.h | 3 + .../samplesource/usrpinput/usrpinputgui.ui | 30 +++++--- .../samplesource/xtrxinput/xtrxinputgui.cpp | 8 ++ plugins/samplesource/xtrxinput/xtrxinputgui.h | 3 + .../samplesource/xtrxinput/xtrxinputgui.ui | 26 ++++--- 69 files changed, 695 insertions(+), 225 deletions(-) diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index 951b14c0d..09b22bb81 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -47,6 +48,7 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#AirspyGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -104,6 +106,12 @@ 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 4d9ac8006..cc8151b50 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -48,6 +48,9 @@ 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/airspy/airspygui.ui b/plugins/samplesource/airspy/airspygui.ui index e59c34ce1..c0bd4ebb4 100644 --- a/plugins/samplesource/airspy/airspygui.ui +++ b/plugins/samplesource/airspy/airspygui.ui @@ -7,11 +7,11 @@ 0 0 360 - 244 + 187 - + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 187 + + + + + 360 + 187 @@ -286,7 +292,7 @@ - + 0 0 @@ -612,17 +618,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index c8831abaa..3426f0f10 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -46,6 +47,7 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#AirspyHFGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/airspyhf/readme.md"; @@ -104,6 +106,12 @@ 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 aeb7bc5b1..238003e29 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.h +++ b/plugins/samplesource/airspyhf/airspyhfgui.h @@ -49,6 +49,9 @@ 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/airspyhf/airspyhfgui.ui b/plugins/samplesource/airspyhf/airspyhfgui.ui index efd5e525b..399a64899 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.ui +++ b/plugins/samplesource/airspyhf/airspyhfgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 180 + 137
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 137 + + + + + 360 + 137 @@ -49,9 +55,6 @@ - - 4 - @@ -584,17 +587,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp index 5d186ed09..c0ae6373e 100644 --- a/plugins/samplesource/audioinput/audioinputgui.cpp +++ b/plugins/samplesource/audioinput/audioinputgui.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "ui_audioinputgui.h" #include "gui/colormapper.h" @@ -43,6 +44,7 @@ AudioInputGui::AudioInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (AudioInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#AudioInputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/audioinput/readme.md"; @@ -95,6 +97,12 @@ 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 9febcfbfd..a11d90cae 100644 --- a/plugins/samplesource/audioinput/audioinputgui.h +++ b/plugins/samplesource/audioinput/audioinputgui.h @@ -47,6 +47,9 @@ 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/audioinput/audioinputgui.ui b/plugins/samplesource/audioinput/audioinputgui.ui index 1d5ff0178..6be0b2e39 100644 --- a/plugins/samplesource/audioinput/audioinputgui.ui +++ b/plugins/samplesource/audioinput/audioinputgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 191 + + + + + 360 + 191 @@ -29,7 +35,7 @@ - FunCubeDongle + Audio @@ -49,15 +55,18 @@ - - 4 - + + + 0 + 0 + + start/stop acquisition @@ -105,6 +114,31 @@ + + + + + 0 + 0 + + + + + 5 + 32 + + + + + 5 + 32 + + + + + + + diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp index 5c378ef94..9c4051878 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -48,6 +49,7 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (Bladerf1Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#Bladerf1InputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/bladerf1input/readme.md"; @@ -114,6 +116,12 @@ 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 45e6b7294..9202e42f2 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.h @@ -72,6 +72,9 @@ 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/bladerf1input/bladerf1inputgui.ui b/plugins/samplesource/bladerf1input/bladerf1inputgui.ui index 1ab849e8a..4d9ffaf4f 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.ui +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 250 + 173
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 173 + + + + + 360 + 173 @@ -684,17 +690,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index f1a2a3637..d96c48b2a 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -51,6 +52,7 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : uint64_t f_min, f_max; ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#Bladerf2InputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/bladerf2input/readme.md"; @@ -136,6 +138,12 @@ 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 2647fccd6..45c842676 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.h @@ -79,6 +79,9 @@ 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.ui b/plugins/samplesource/bladerf2input/bladerf2inputgui.ui index fd648fe31..fa03a988c 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.ui +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 209 + 172
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 172 + + + + + 360 + 172 @@ -552,17 +558,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index ee7a60bd0..638f570da 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "ui_fcdprogui.h" #include "gui/colormapper.h" @@ -44,6 +45,7 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#FCDProGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fcdpro/readme.md"; @@ -197,6 +199,12 @@ 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 4ddf0afa2..717d0a588 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -70,6 +70,9 @@ 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.ui b/plugins/samplesource/fcdpro/fcdprogui.ui index 3e75bb1d6..9f777151b 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.ui +++ b/plugins/samplesource/fcdpro/fcdprogui.ui @@ -7,11 +7,11 @@ 0 0 360 - 443 + 394
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 394 + + + + + 360 + 394 @@ -613,17 +619,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 33503edfd..3630fd7f4 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "ui_fcdproplusgui.h" #include "gui/colormapper.h" @@ -45,6 +46,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#FCDProPlusGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fcdproplus/readme.md"; @@ -115,6 +117,12 @@ 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 8e4090fe7..317c0ab0b 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -69,6 +69,9 @@ 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.ui b/plugins/samplesource/fcdproplus/fcdproplusgui.ui index 982210b30..191bca334 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.ui +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 219 + 162
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 162 + + + + + 360 + 162 @@ -455,17 +461,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp index 39bc4004b..13130ca3b 100644 --- a/plugins/samplesource/fileinput/fileinputgui.cpp +++ b/plugins/samplesource/fileinput/fileinputgui.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "ui_fileinputgui.h" #include "plugin/pluginapi.h" @@ -56,6 +57,7 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#FileInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/fileinput/readme.md"; @@ -117,6 +119,12 @@ 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 b447b2cb6..43a7d49ac 100644 --- a/plugins/samplesource/fileinput/fileinputgui.h +++ b/plugins/samplesource/fileinput/fileinputgui.h @@ -47,6 +47,9 @@ 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/fileinput/fileinputgui.ui b/plugins/samplesource/fileinput/fileinputgui.ui index 512b97571..6285afe43 100644 --- a/plugins/samplesource/fileinput/fileinputgui.ui +++ b/plugins/samplesource/fileinput/fileinputgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 202 + + + + + 360 + 202 @@ -52,9 +58,6 @@ - - 4 - diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 2c1658f28..6f6adcf02 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -49,6 +50,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#HackRFInputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/hackrfinput/readme.md"; @@ -114,6 +116,12 @@ 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 2a90c045c..c9840a3b5 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -55,6 +55,9 @@ 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/hackrfinput/hackrfinputgui.ui b/plugins/samplesource/hackrfinput/hackrfinputgui.ui index d28afc6ba..08a06ddef 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.ui +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 272 + 230 - + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 230 + + + + + 360 + 230 @@ -116,7 +122,7 @@ 32 - 50 + 0 @@ -661,17 +667,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp index 2676ceea1..c6444f519 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "ui_kiwisdrgui.h" #include "plugin/pluginapi.h" @@ -67,6 +68,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); getContents()->setStyleSheet(QString(tr("#KiwiSDRGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/kiwisdr/readme.md"; @@ -121,6 +123,12 @@ 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 60b0936f2..90ebe736a 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.h +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.h @@ -47,6 +47,9 @@ 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/kiwisdr/kiwisdrgui.ui b/plugins/samplesource/kiwisdr/kiwisdrgui.ui index 1a843a4d3..e1b799d65 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.ui +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 146 + 106
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 106 + + + + + 360 + 106 @@ -52,9 +58,6 @@ - - 4 - @@ -314,17 +317,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 20e374c75..b515535c5 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -49,6 +50,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDRInput = (LimeSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#LimeSDRInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/limesdrinput/readme.md"; @@ -142,6 +144,12 @@ 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 2da4a4a39..eac7ce41e 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -45,6 +45,9 @@ 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/limesdrinput/limesdrinputgui.ui b/plugins/samplesource/limesdrinput/limesdrinputgui.ui index b69695c8c..61d89ebaf 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.ui +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.ui @@ -6,8 +6,8 @@ 0 0 - 360 - 266 + 370 + 209
@@ -18,8 +18,14 @@ - 360 - 0 + 370 + 209 + + + + + 370 + 209 @@ -1157,6 +1163,11 @@ QToolTip{background-color: white; color: black;} + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget @@ -1164,21 +1175,16 @@ QToolTip{background-color: white; color: black;} 1 - ButtonSwitch - QToolButton -
gui/buttonswitch.h
+ ValueDialZ + QWidget +
gui/valuedialz.h
+ 1
TransverterButton QPushButton
gui/transverterbutton.h
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
ExternalClockButton QToolButton diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp index d5a657dfa..cab4d3e22 100644 --- a/plugins/samplesource/localinput/localinputgui.cpp +++ b/plugins/samplesource/localinput/localinputgui.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "ui_localinputgui.h" #include "gui/colormapper.h" @@ -75,6 +76,7 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#LocalInputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/localinput/readme.md"; @@ -143,6 +145,12 @@ 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 3822ee69a..dfa8a25bd 100644 --- a/plugins/samplesource/localinput/localinputgui.h +++ b/plugins/samplesource/localinput/localinputgui.h @@ -47,6 +47,9 @@ 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/localinput/localinputgui.ui b/plugins/samplesource/localinput/localinputgui.ui index d2d8398d4..ba4ffa686 100644 --- a/plugins/samplesource/localinput/localinputgui.ui +++ b/plugins/samplesource/localinput/localinputgui.ui @@ -7,13 +7,25 @@ 0 0 360 - 110 + 80
+ + + 0 + 0 + + 360 - 0 + 80 + + + + + 360 + 110 @@ -43,15 +55,24 @@ - - 4 - + + + 0 + 0 + + + + + 26 + 16777215 + + start/stop acquisition diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index 0b4a8c049..9176fc0a1 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "device/deviceapi.h" #include "device/deviceuiset.h" @@ -44,6 +45,7 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#PerseusGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/perseus/readme.md"; @@ -102,6 +104,13 @@ 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 26e51a937..dc3273258 100644 --- a/plugins/samplesource/perseus/perseusgui.h +++ b/plugins/samplesource/perseus/perseusgui.h @@ -48,6 +48,9 @@ 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/perseus/perseusgui.ui b/plugins/samplesource/perseus/perseusgui.ui index 7630ced73..0b22c36a5 100644 --- a/plugins/samplesource/perseus/perseusgui.ui +++ b/plugins/samplesource/perseus/perseusgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 182 + 136
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 136 + + + + + 360 + 136 @@ -458,17 +464,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index 5ce1de780..9c7b757ce 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -49,6 +50,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (PlutoSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#PlutoSDRInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/plutosdrinput/readme.md"; @@ -122,6 +124,12 @@ 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 2ed58ae5c..878b30db4 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -48,6 +48,9 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::PlutoSDRInputGUI* ui; DeviceUISet* m_deviceUISet; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui index 7d8a8df4c..999f168af 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 291 + 240
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 240 + + + + + 360 + 240 @@ -1010,17 +1016,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp index aa8187ece..40e0d6267 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.cpp +++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "ui_remoteinputgui.h" #include "gui/colormapper.h" @@ -72,6 +73,7 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStampms = 0; ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#RemoteInputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/remoteinput/readme.md"; @@ -148,6 +150,12 @@ 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 aaea76579..e9f8013c5 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.h +++ b/plugins/samplesource/remoteinput/remoteinputgui.h @@ -49,6 +49,9 @@ 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/remoteinput/remoteinputgui.ui b/plugins/samplesource/remoteinput/remoteinputgui.ui index bc766560e..62c10e414 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.ui +++ b/plugins/samplesource/remoteinput/remoteinputgui.ui @@ -7,13 +7,25 @@ 0 0 360 - 400 + 380
+ + + 0 + 0 + + 360 - 0 + 380 + + + + + 360 + 400 @@ -757,13 +769,6 @@ - - - - Qt::Horizontal - - - @@ -1040,6 +1045,13 @@ + + + + Qt::Horizontal + + + @@ -1065,17 +1077,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 35e9fc142..cd8e7b588 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "rtlsdrgui.h" @@ -46,7 +47,7 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); - QString s(tr("")); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#RTLSDRGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/rtlsdr/readme.md"; @@ -126,6 +127,12 @@ 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 ec1e22bd3..29cf1470c 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -47,6 +47,9 @@ 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/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui index df02e0cd5..74fce0106 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 229 + 217
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 217 + + + + + 360 + 217 @@ -645,17 +651,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index 0ab1d750e..9a82aec84 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "sdrplaygui.h" @@ -43,6 +44,7 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = (SDRPlayInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#SDRPlayGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sdrplay/readme.md"; @@ -124,6 +126,12 @@ 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 d9d720084..6e9196c22 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -47,6 +47,9 @@ 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/sdrplay/sdrplaygui.ui b/plugins/samplesource/sdrplay/sdrplaygui.ui index 7afef29c8..000007b44 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.ui +++ b/plugins/samplesource/sdrplay/sdrplaygui.ui @@ -7,11 +7,11 @@ 0 0 360 - 257 + 202
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 202 + + + + + 360 + 202 @@ -642,27 +648,20 @@ - - - - Qt::Horizontal - - - + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp index 53fd850da..691c8ce58 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "sdrplayv3gui.h" #include "sdrplayv3input.h" @@ -43,6 +44,7 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) : m_sdrPlayV3Input = (SDRPlayV3Input*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#SDRPlayV3Gui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sdrplayv3/readme.md"; @@ -160,6 +162,12 @@ 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 39462b66d..59fe97011 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.h +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.h @@ -47,6 +47,9 @@ 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/sdrplayv3/sdrplayv3gui.ui b/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui index fea992488..3f9470b80 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui @@ -6,20 +6,26 @@ 0 0 - 360 - 303 + 410 + 234
- + 0 0 - 360 - 0 + 410 + 234 + + + + + 410 + 234 @@ -186,13 +192,6 @@ - - - - LO ppm - - - @@ -212,10 +211,10 @@ - - - - Qt::Horizontal + + + + LO ppm @@ -768,17 +767,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index d2f88919a..69ad7658c 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "ui_sigmffileinputgui.h" #include "plugin/pluginapi.h" @@ -62,6 +63,7 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); getContents()->setStyleSheet(QString(tr("#SigMFFileInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/sigmffileinput/readme.md"; @@ -129,6 +131,12 @@ bool SigMFFileInputGUI::deserialize(const QByteArray& data) } } +void SigMFFileInputGUI::resizeEvent(QResizeEvent* size) +{ + resize(436, height()); + size->accept(); +} + void SigMFFileInputGUI::handleInputMessages() { Message* message; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h index 381ad5ea9..30f3cf9a3 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h @@ -47,6 +47,9 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::SigMFFileInputGUI* ui; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui index 3cc1946bd..8ef55dd12 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui @@ -6,20 +6,26 @@ 0 0 - 360 - 391 + 436 + 436
- + 0 0 - 360 - 0 + 436 + 436 + + + + + 436 + 16777215 diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp index fa97d6638..6e3337ed7 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -61,6 +62,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : setAttribute(Qt::WA_DeleteOnClose, true); m_sampleSource = (SoapySDRInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); getContents()->setStyleSheet(QString(tr("#SoapySDRInputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/soapysdrinput/readme.md"; @@ -447,6 +449,12 @@ bool SoapySDRInputGui::deserialize(const QByteArray& data) } } +void SoapySDRInputGui::resizeEvent(QResizeEvent* size) +{ + resize(360, height()); + size->accept(); +} + bool SoapySDRInputGui::handleMessage(const Message& message) { if (SoapySDRInput::MsgConfigureSoapySDRInput::match(message)) diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h index 483f9e823..0f896a921 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h @@ -52,6 +52,9 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } +protected: + void resizeEvent(QResizeEvent* size); + private: void createRangesControl( ItemSettingGUI **settingGUI, diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui b/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui index 8e1720a2e..e5d81f55c 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui @@ -10,12 +10,24 @@ 238 + + + 0 + 0 + + 360 0 + + + 360 + 16777215 + + Liberation Sans @@ -363,6 +375,18 @@ + + + 0 + 0 + + + + + 356 + 0 + + Qt::ScrollBarAsNeeded @@ -401,17 +425,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index e6236daf8..a97f72de4 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "ui_testsourcegui.h" #include "plugin/pluginapi.h" @@ -54,6 +55,7 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource = m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#TestSourceGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/testsource/readme.md"; @@ -113,6 +115,12 @@ 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 c6243b0ff..01473a90b 100644 --- a/plugins/samplesource/testsource/testsourcegui.h +++ b/plugins/samplesource/testsource/testsourcegui.h @@ -46,6 +46,9 @@ 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 889037318..bd492ff6a 100644 --- a/plugins/samplesource/testsource/testsourcegui.ui +++ b/plugins/samplesource/testsource/testsourcegui.ui @@ -6,20 +6,26 @@ 0 0 - 360 - 337 + 381 + 331
- + 0 0 - 360 - 0 + 381 + 331 + + + + + 381 + 331 @@ -272,6 +278,12 @@ + + + 55 + 0 + + 50 @@ -695,17 +707,16 @@ - - - - Qt::Horizontal - - - + + + 0 + 22 + + Amp fine @@ -719,6 +730,12 @@ 0
+ + + 0 + 22 + + Amp coarse @@ -817,6 +834,12 @@ + + + 0 + 22 + + Q bias @@ -838,6 +861,12 @@ + + + 0 + 22 + + I bias @@ -882,6 +911,12 @@ + + + 0 + 22 + + DC bias @@ -926,6 +961,12 @@ + + + 0 + 22 + + Phase @@ -979,17 +1020,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
ValueDialZ QWidget diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp index d2edc86bd..77ee8fb0e 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.cpp +++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -50,6 +51,7 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpInput = (USRPInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#USRPInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/usrpinput/readme.md"; @@ -152,6 +154,12 @@ 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 d9c61d808..9749ccd9c 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.h +++ b/plugins/samplesource/usrpinput/usrpinputgui.h @@ -51,6 +51,9 @@ 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/usrpinput/usrpinputgui.ui b/plugins/samplesource/usrpinput/usrpinputgui.ui index d31bd2bdd..6916cc9eb 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.ui +++ b/plugins/samplesource/usrpinput/usrpinputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 221 + 174
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 174 + + + + + 360 + 174 @@ -774,6 +780,11 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget @@ -781,21 +792,16 @@ 1 - ButtonSwitch - QToolButton -
gui/buttonswitch.h
+ ValueDialZ + QWidget +
gui/valuedialz.h
+ 1
TransverterButton QPushButton
gui/transverterbutton.h
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 92409fad1..63f4096dd 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -50,6 +51,7 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXInput = (XTRXInput*) m_deviceUISet->m_deviceAPI->getSampleSource(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#XTRXInputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesource/xtrxinput/readme.md"; @@ -122,6 +124,12 @@ 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 7f8221479..72862c5c6 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.h +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.h @@ -46,6 +46,9 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::XTRXInputGUI* ui; diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.ui b/plugins/samplesource/xtrxinput/xtrxinputgui.ui index 55b4aa3c2..c26cd98a5 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.ui +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.ui @@ -6,20 +6,26 @@ 0 0 - 360 - 264 + 370 + 207
- + 0 0 - 360 - 0 + 370 + 207 + + + + + 370 + 207 @@ -1072,17 +1078,17 @@ QToolTip{background-color: white; color: black;} + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
ValueDialZ QWidget