From f3f504c88d02b6a053da87f0eaff848230d30d52 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 21 Apr 2022 19:24:40 +0200 Subject: [PATCH] Massive UI revamping (v7): fixed widget size handling: sample sinks. Part of #1209 --- .../samplesink/audiooutput/audiooutputgui.cpp | 8 +++++ .../samplesink/audiooutput/audiooutputgui.h | 3 ++ .../samplesink/audiooutput/audiooutputgui.ui | 17 +++++------ .../bladerf1output/bladerf1outputgui.cpp | 8 +++++ .../bladerf1output/bladerf1outputgui.h | 3 ++ .../bladerf1output/bladerf1outputgui.ui | 20 ++++++++----- .../bladerf2output/bladerf2outputgui.cpp | 8 +++++ .../bladerf2output/bladerf2outputgui.h | 3 ++ .../bladerf2output/bladerf2outputgui.ui | 22 +++++++++----- .../samplesink/fileoutput/fileoutputgui.cpp | 8 +++++ plugins/samplesink/fileoutput/fileoutputgui.h | 3 ++ .../samplesink/fileoutput/fileoutputgui.ui | 20 ++++++++----- .../hackrfoutput/hackrfoutputgui.cpp | 8 +++++ .../samplesink/hackrfoutput/hackrfoutputgui.h | 3 ++ .../hackrfoutput/hackrfoutputgui.ui | 22 +++++++++----- .../limesdroutput/limesdroutputgui.cpp | 8 +++++ .../limesdroutput/limesdroutputgui.h | 3 ++ .../limesdroutput/limesdroutputgui.ui | 30 +++++++++++-------- .../samplesink/localoutput/localoutputgui.cpp | 8 +++++ .../samplesink/localoutput/localoutputgui.h | 3 ++ .../samplesink/localoutput/localoutputgui.ui | 16 ++++++++-- .../plutosdroutput/plutosdroutputgui.cpp | 8 +++++ .../plutosdroutput/plutosdroutputgui.h | 3 ++ .../plutosdroutput/plutosdroutputgui.ui | 22 +++++++++----- .../remoteoutput/remoteoutputgui.cpp | 8 +++++ .../samplesink/remoteoutput/remoteoutputgui.h | 3 ++ .../remoteoutput/remoteoutputgui.ui | 16 ++++++---- .../soapysdroutput/soapysdroutputgui.cpp | 7 +++++ .../soapysdroutput/soapysdroutputgui.h | 3 ++ .../soapysdroutput/soapysdroutputgui.ui | 30 +++++++++++++++---- plugins/samplesink/testsink/testsinkgui.cpp | 2 ++ plugins/samplesink/testsink/testsinkgui.h | 2 ++ plugins/samplesink/testsink/testsinkgui.ui | 4 +-- .../samplesink/usrpoutput/usrpoutputgui.cpp | 8 +++++ plugins/samplesink/usrpoutput/usrpoutputgui.h | 3 ++ .../samplesink/usrpoutput/usrpoutputgui.ui | 30 +++++++++++-------- .../samplesink/xtrxoutput/xtrxoutputgui.cpp | 8 +++++ plugins/samplesink/xtrxoutput/xtrxoutputgui.h | 3 ++ .../samplesink/xtrxoutput/xtrxoutputgui.ui | 22 +++++++++----- 39 files changed, 312 insertions(+), 94 deletions(-) diff --git a/plugins/samplesink/audiooutput/audiooutputgui.cpp b/plugins/samplesink/audiooutput/audiooutputgui.cpp index a9664a96b..8e680df1e 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.cpp +++ b/plugins/samplesink/audiooutput/audiooutputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "ui_audiooutputgui.h" #include "gui/colormapper.h" @@ -43,6 +44,7 @@ AudioOutputGui::AudioOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_audioOutput = (AudioOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#AudioOutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/audiooutput/readme.md"; @@ -100,6 +102,12 @@ 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 4a5b2d406..91d74861f 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.h +++ b/plugins/samplesink/audiooutput/audiooutputgui.h @@ -46,6 +46,9 @@ 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/audiooutput/audiooutputgui.ui b/plugins/samplesink/audiooutput/audiooutputgui.ui index 9baec9db9..bdbe5c47a 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.ui +++ b/plugins/samplesink/audiooutput/audiooutputgui.ui @@ -7,7 +7,7 @@ 0 0 360 - 149 + 106 @@ -19,7 +19,13 @@ 360 - 0 + 106 + + + + + 360 + 106 @@ -161,13 +167,6 @@ - - - - Qt::Horizontal - - - diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp index fa5a967e0..8d4218202 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include @@ -46,6 +47,7 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#Bladerf1OutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -108,6 +110,12 @@ 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 31ea820f6..4e0bbecc7 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.h @@ -46,6 +46,9 @@ 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/bladerf1output/bladerf1outputgui.ui b/plugins/samplesink/bladerf1output/bladerf1outputgui.ui index a63f40f7b..3106a75e5 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.ui +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.ui @@ -7,7 +7,7 @@ 0 0 360 - 214 + 159 @@ -19,7 +19,13 @@ 360 - 0 + 159 + + + + + 360 + 159 @@ -551,17 +557,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp index 7e82197d2..52585235e 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include @@ -49,6 +50,7 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) uint64_t f_min, f_max; ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#BladeRF2OutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/bladerf2output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); @@ -123,6 +125,12 @@ 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 bd447541e..4f6e6ce21 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.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::BladeRF2OutputGui* ui; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.ui b/plugins/samplesink/bladerf2output/bladerf2outputgui.ui index 3a5e17a28..0916b7243 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.ui +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 202 + 165
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 165 + + + + + 360 + 165 @@ -490,17 +496,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp index dfdef4781..9a52e7a06 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.cpp +++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "ui_fileoutputgui.h" #include "plugin/pluginapi.h" @@ -54,6 +55,7 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#FileOutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/fileoutput/readme.md"; @@ -115,6 +117,12 @@ 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 7d8906ebe..1ec881108 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.h +++ b/plugins/samplesink/fileoutput/fileoutputgui.h @@ -48,6 +48,9 @@ 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/fileoutput/fileoutputgui.ui b/plugins/samplesink/fileoutput/fileoutputgui.ui index a6c19111a..f089af530 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.ui +++ b/plugins/samplesink/fileoutput/fileoutputgui.ui @@ -7,7 +7,7 @@ 0 0 360 - 144 + 106
@@ -19,7 +19,13 @@ 360 - 0 + 106 + + + + + 360 + 106 @@ -367,17 +373,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index e48eba340..6700e804a 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include @@ -48,6 +49,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#HackRFOutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/hackrfoutput/readme.md"; @@ -109,6 +111,12 @@ 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 78d834806..b41fd3f24 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -56,6 +56,9 @@ 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/hackrfoutput/hackrfoutputgui.ui b/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui index da73a6cf2..bb34250dc 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 207 + 151
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 151 + + + + + 360 + 151 @@ -540,17 +546,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 158da7f39..9acb4ed60 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "ui_limesdroutputgui.h" #include "gui/colormapper.h" @@ -45,6 +46,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#LimeSDROutputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/limesdroutput/readme.md"; @@ -136,6 +138,12 @@ 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 125414032..c67e8e110 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -46,6 +46,9 @@ 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/limesdroutput/limesdroutputgui.ui b/plugins/samplesink/limesdroutput/limesdroutputgui.ui index faaf8f492..0ecc90907 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.ui +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 264 + 209
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 209 + + + + + 360 + 209 @@ -928,6 +934,11 @@ QToolTip{background-color: white; color: black;} + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget @@ -935,21 +946,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/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp index 22a1da49f..a1c376e97 100644 --- a/plugins/samplesink/localoutput/localoutputgui.cpp +++ b/plugins/samplesink/localoutput/localoutputgui.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "ui_localoutputgui.h" #include "gui/colormapper.h" @@ -62,6 +63,7 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#LocalOutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/localoutput/readme.md"; @@ -130,6 +132,12 @@ 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 da888c787..d6ec64ede 100644 --- a/plugins/samplesink/localoutput/localoutputgui.h +++ b/plugins/samplesink/localoutput/localoutputgui.h @@ -47,6 +47,9 @@ 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/localoutput/localoutputgui.ui b/plugins/samplesink/localoutput/localoutputgui.ui index 7e66d09c9..1037d177e 100644 --- a/plugins/samplesink/localoutput/localoutputgui.ui +++ b/plugins/samplesink/localoutput/localoutputgui.ui @@ -7,13 +7,25 @@ 0 0 360 - 68 + 47
+ + + 0 + 0 + + 360 - 0 + 47 + + + + + 360 + 47 diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index edb24a8d7..5140da0ff 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -48,6 +49,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#PlutoSDROutputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/plutosdroutput/readme.md"; @@ -120,6 +122,12 @@ 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 46bbd040d..50c74d13c 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.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::PlutoSDROutputGUI* ui; DeviceUISet* m_deviceUISet; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui b/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui index 2133d8be2..f60be2671 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 250 + 197 - + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 197 + + + + + 360 + 197 @@ -769,17 +775,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp index 6a384c80c..3fb588ca4 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -67,6 +68,7 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#RemoteOutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/remoteoutput/readme.md"; @@ -141,6 +143,12 @@ 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 3e7df619f..cbf0d522f 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.h +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.h @@ -78,6 +78,9 @@ 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/remoteoutput/remoteoutputgui.ui b/plugins/samplesink/remoteoutput/remoteoutputgui.ui index b6b7a7a51..7e2b69535 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.ui +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.ui @@ -9,20 +9,26 @@ 0 0 - 360 - 284 + 380 + 231
- + 0 0 - 360 - 0 + 380 + 231 + + + + + 380 + 231 diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp index d6525a0d6..427c2af74 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "dsp/dspengine.h" #include "dsp/dspcommands.h" @@ -59,6 +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); getContents()->setStyleSheet(QString(tr("#SoapySDROutputGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/soapysdroutput/readme.md"; @@ -443,6 +445,11 @@ bool SoapySDROutputGui::deserialize(const QByteArray& data) } } +void SoapySDROutputGui::resizeEvent(QResizeEvent* size) +{ + resize(360, height()); + size->accept(); +} bool SoapySDROutputGui::handleMessage(const Message& message) { diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h index a17339dfe..1021006cd 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h @@ -54,6 +54,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/samplesink/soapysdroutput/soapysdroutputgui.ui b/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui index 615c6e736..6ea2b933b 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui @@ -10,10 +10,16 @@ 236 + + + 0 + 0 + + 360 - 0 + 236 @@ -301,6 +307,18 @@ + + + 0 + 0 + + + + + 356 + 0 + + true @@ -336,17 +354,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget
gui/valuedial.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
TransverterButton QPushButton diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 08b6bcb59..85ab065a6 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -51,6 +51,8 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : { setAttribute(Qt::WA_DeleteOnClose, true); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setMinimumSize(m_MinimumWidth, m_MinimumHeight); getContents()->setStyleSheet(QString(tr("#TestSinkGui { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/testsink/readme.md"; diff --git a/plugins/samplesink/testsink/testsinkgui.h b/plugins/samplesink/testsink/testsinkgui.h index 6e861d24b..76d7e0a95 100644 --- a/plugins/samplesink/testsink/testsinkgui.h +++ b/plugins/samplesink/testsink/testsinkgui.h @@ -67,6 +67,8 @@ private: int m_lastEngineState; MessageQueue m_inputMessageQueue; SpectrumVis* m_spectrumVis; + static const int m_MinimumWidth = 360; + static const int m_MinimumHeight = 200 + 20 + 10 + 4*22 + 5; void blockApplySettings(bool block) { m_doApplySettings = !block; } void displaySettings(); diff --git a/plugins/samplesink/testsink/testsinkgui.ui b/plugins/samplesink/testsink/testsinkgui.ui index 267f0a318..4aff8ac27 100644 --- a/plugins/samplesink/testsink/testsinkgui.ui +++ b/plugins/samplesink/testsink/testsinkgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -316,7 +316,7 @@ - + 0 0 diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp index 3b8ac6f6b..aaa57aa14 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "ui_usrpoutputgui.h" #include "gui/colormapper.h" @@ -46,6 +47,7 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_usrpOutput = (USRPOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#USRPOutputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/usrpoutput/readme.md"; @@ -151,6 +153,12 @@ 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 ac6205488..481fd841f 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.h +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.h @@ -53,6 +53,9 @@ 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/usrpoutput/usrpoutputgui.ui b/plugins/samplesink/usrpoutput/usrpoutputgui.ui index 090f2b32a..a148de972 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.ui +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 214 + 163 - + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 163 + + + + + 360 + 163 @@ -708,6 +714,11 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
ValueDial QWidget @@ -715,21 +726,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/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index b2bccc8a8..2a034d5ad 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -19,6 +19,7 @@ #include #include +#include #include "ui_xtrxoutputgui.h" #include "gui/colormapper.h" @@ -47,6 +48,7 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getContents()->setStyleSheet(QString(tr("#XTRXOutputGUI { border: 1px solid %1 }") .arg(palette().highlight().color().darker(115).name()))); m_helpURL = "plugins/samplesink/xtrxoutput/readme.md"; @@ -119,6 +121,12 @@ 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 1e724396c..73ff03d7b 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h @@ -45,6 +45,9 @@ 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/samplesink/xtrxoutput/xtrxoutputgui.ui b/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui index 7e661afcf..52734149e 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 264 + 207
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 207 + + + + + 360 + 207 @@ -880,17 +886,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