From 3b35e2232805253a5c5fd99ebe7b0f95a2566e26 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 22 Apr 2022 14:08:10 +0200 Subject: [PATCH] Massive UI revamping (v7): fixed widget size handling: MIMO and Rx channels. Part of #1209 --- .../beamsteeringcwmodgui.cpp | 8 ++ .../beamsteeringcwmod/beamsteeringcwmodgui.h | 3 + .../beamsteeringcwmod/beamsteeringcwmodgui.ui | 20 +++-- plugins/channelrx/demodais/aisdemodgui.ui | 28 +++--- plugins/channelrx/demodam/amdemodgui.cpp | 8 ++ plugins/channelrx/demodam/amdemodgui.h | 3 + plugins/channelrx/demodam/amdemodgui.ui | 22 +++-- plugins/channelrx/demodatv/atvdemodgui.cpp | 8 ++ plugins/channelrx/demodatv/atvdemodgui.h | 3 + plugins/channelrx/demodatv/atvdemodgui.ui | 40 +++++---- plugins/channelrx/demodbfm/bfmdemodgui.ui | 45 +++++++--- .../demodchirpchat/chirpchatdemodgui.ui | 26 +++++- plugins/channelrx/demoddatv/datvdemodgui.cpp | 8 ++ plugins/channelrx/demoddatv/datvdemodgui.h | 3 + plugins/channelrx/demoddatv/datvdemodgui.ui | 22 ++--- plugins/channelrx/demoddsd/dsddemodgui.cpp | 8 ++ plugins/channelrx/demoddsd/dsddemodgui.h | 3 + plugins/channelrx/demoddsd/dsddemodgui.ui | 32 ++++--- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 8 ++ plugins/channelrx/demodnfm/nfmdemodgui.h | 3 + plugins/channelrx/demodnfm/nfmdemodgui.ui | 22 +++-- .../channelrx/demodvorsc/vordemodscgui.cpp | 8 ++ plugins/channelrx/demodvorsc/vordemodscgui.h | 3 + plugins/channelrx/demodvorsc/vordemodscgui.ui | 26 +++--- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 7 ++ plugins/channelrx/demodwfm/wfmdemodgui.h | 3 + plugins/channelrx/demodwfm/wfmdemodgui.ui | 34 ++++--- plugins/channelrx/filesink/filesinkgui.ui | 33 +++++-- .../channelrx/freqtracker/freqtrackergui.ui | 48 ++++++---- plugins/channelrx/localsink/localsinkgui.cpp | 8 ++ plugins/channelrx/localsink/localsinkgui.h | 3 + plugins/channelrx/localsink/localsinkgui.ui | 26 +++--- plugins/channelrx/radioclock/radioclockgui.ui | 26 ++++-- .../channelrx/remotesink/remotesinkgui.cpp | 8 ++ plugins/channelrx/remotesink/remotesinkgui.h | 3 + plugins/channelrx/remotesink/remotesinkgui.ui | 18 ++-- .../sigmffilesink/sigmffilesinkgui.ui | 39 ++++++-- plugins/channelrx/udpsink/udpsinkgui.ui | 90 ++++++++++++++----- 38 files changed, 503 insertions(+), 203 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp index 5c35e4b8c..821beacab 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp @@ -16,6 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "device/deviceuiset.h" #include "gui/basicchannelsettingsdialog.h" @@ -61,6 +62,12 @@ bool BeamSteeringCWModGUI::deserialize(const QByteArray& data) } } +void BeamSteeringCWModGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool BeamSteeringCWModGUI::handleMessage(const Message& message) { if (BeamSteeringCWMod::MsgBasebandNotification::match(message)) @@ -97,6 +104,7 @@ BeamSteeringCWModGUI::BeamSteeringCWModGUI(PluginAPI* pluginAPI, DeviceUISet *de m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h index 984eb4dd4..ff1de3932 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h @@ -60,6 +60,9 @@ public: virtual int getStreamIndex() const { return -1; } virtual void setStreamIndex(int streamIndex) { (void) streamIndex; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::BeamSteeringCWModGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.ui b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.ui index 4872d6abb..2e281d13b 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.ui +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.ui @@ -6,20 +6,26 @@ 0 0 - 360 - 100 + 362 + 95 - + 0 0 - 360 - 100 + 362 + 95 + + + + + 362 + 95 @@ -34,8 +40,8 @@ - 0 - 0 + 2 + 2 358 91 diff --git a/plugins/channelrx/demodais/aisdemodgui.ui b/plugins/channelrx/demodais/aisdemodgui.ui index 85ea93b7b..7644db826 100644 --- a/plugins/channelrx/demodais/aisdemodgui.ui +++ b/plugins/channelrx/demodais/aisdemodgui.ui @@ -6,8 +6,8 @@ 0 0 - 388 - 446 + 382 + 500 @@ -18,8 +18,8 @@ - 352 - 0 + 382 + 500 @@ -39,7 +39,7 @@ 0 0 - 390 + 380 151 @@ -634,7 +634,7 @@ 0 210 - 391 + 380 171 @@ -719,9 +719,9 @@ - 20 + 0 400 - 351 + 380 341 @@ -916,18 +916,18 @@ QToolButton
gui/buttonswitch.h
- - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ValueDialZ QWidget
gui/valuedialz.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
LevelMeterSignalDB QWidget diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 35641d3e9..ec57930a7 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "amdemodgui.h" #include "amdemodssbdialog.h" @@ -72,6 +73,12 @@ bool AMDemodGUI::deserialize(const QByteArray& data) } } +void AMDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool AMDemodGUI::handleMessage(const Message& message) { if (AMDemod::MsgConfigureAMDemod::match(message)) @@ -260,6 +267,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demodam/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index cedcf4b0c..f32db77a2 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -47,6 +47,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::AMDemodGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/demodam/amdemodgui.ui b/plugins/channelrx/demodam/amdemodgui.ui index d4f9a2cf7..59ed9e21e 100644 --- a/plugins/channelrx/demodam/amdemodgui.ui +++ b/plugins/channelrx/demodam/amdemodgui.ui @@ -11,7 +11,7 @@ - + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 153 + + + + + 360 + 153 @@ -432,18 +438,18 @@ QToolButton
gui/buttonswitch.h
- - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ValueDialZ QWidget
gui/valuedialz.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
LevelMeterSignalDB QWidget diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 21cda893d..de96854cd 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "atvdemodgui.h" @@ -76,6 +77,12 @@ bool ATVDemodGUI::deserialize(const QByteArray& data) } } +void ATVDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + void ATVDemodGUI::displaySettings() { m_channelMarker.blockSignals(true); @@ -269,6 +276,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base m_basebandSampleRate(48000) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demodatv/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index 663d565a9..d950a0b1e 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -66,6 +66,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::ATVDemodGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui index d0678c3dd..1996a1164 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.ui +++ b/plugins/channelrx/demodatv/atvdemodgui.ui @@ -7,11 +7,11 @@ 0 0 700 - 699 + 675 - + 0 0 @@ -19,7 +19,13 @@ 700 - 500 + 675 + + + + + 700 + 675 @@ -37,7 +43,7 @@ - 10 + 0 10 681 83 @@ -572,7 +578,7 @@ - 10 + 0 570 681 104 @@ -1020,7 +1026,7 @@ - 10 + 2 100 680 461 @@ -1154,17 +1160,23 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
+ + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +
RollupContents QWidget
gui/rollupcontents.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
GLScope QWidget @@ -1177,12 +1189,6 @@
gui/glscopegui.h
1
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
TVScreenAnalog QWidget diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.ui b/plugins/channelrx/demodbfm/bfmdemodgui.ui index c4ade4633..8409d6ab6 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.ui +++ b/plugins/channelrx/demodbfm/bfmdemodgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -19,7 +19,7 @@ 642 - 0 + 670 @@ -508,6 +508,12 @@ 151 + + + 0 + 0 + + Baseband Spectrum @@ -529,6 +535,12 @@ + + + 0 + 0 + + Liberation Mono @@ -538,7 +550,14 @@ - + + + + 0 + 0 + + +
@@ -1883,21 +1902,15 @@
- - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ButtonSwitch QToolButton
gui/buttonswitch.h
- LevelMeterSignalDB + ValueDialZ QWidget -
gui/levelmeter.h
+
gui/valuedialz.h
1
@@ -1913,9 +1926,15 @@ 1 - ValueDialZ + RollupContents QWidget -
gui/valuedialz.h
+
gui/rollupcontents.h
+ 1 +
+ + LevelMeterSignalDB + QWidget +
gui/levelmeter.h
1
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.ui b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.ui index 4415af525..e05f01499 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.ui +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.ui @@ -10,6 +10,12 @@ 680 + + + 0 + 0 + + 532 @@ -1180,6 +1186,12 @@ 260 + + + 0 + 0 + + 373 @@ -1207,6 +1219,12 @@ + + + 0 + 0 + + 0 @@ -1223,9 +1241,9 @@ - RollupContents + ValueDialZ QWidget -
gui/rollupcontents.h
+
gui/valuedialz.h
1
@@ -1241,9 +1259,9 @@ 1 - ValueDialZ + RollupContents QWidget -
gui/valuedialz.h
+
gui/rollupcontents.h
1
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index c2ed28dae..d16cd2ffe 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "device/deviceuiset.h" #include "dsp/dspengine.h" @@ -80,6 +81,12 @@ bool DATVDemodGUI::deserialize(const QByteArray& arrData) } } +void DATVDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool DATVDemodGUI::handleMessage(const Message& message) { if (DATVDemodReport::MsgReportModcodCstlnChange::match(message)) @@ -214,6 +221,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba m_cstlnSetByModcod(false) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demoddatv/readme.md"; ui->screenTV->setColor(true); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 34b987c10..c39c5a143 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -65,6 +65,9 @@ public: static const char* const m_strChannelID; +protected: + void resizeEvent(QResizeEvent* size); + private slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.ui b/plugins/channelrx/demoddatv/datvdemodgui.ui index d4ec6ce0b..9fee9975f 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.ui +++ b/plugins/channelrx/demoddatv/datvdemodgui.ui @@ -11,7 +11,7 @@ - + 0 0 @@ -19,7 +19,7 @@ 530 - 442 + 476 @@ -1394,10 +1394,9 @@ - RollupContents - QWidget -
gui/rollupcontents.h
- 1 + ButtonSwitch + QToolButton +
gui/buttonswitch.h
ValueDialZ @@ -1405,17 +1404,18 @@
gui/valuedialz.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
LevelMeterSignalDB QWidget
gui/levelmeter.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
DATVideoRender QWidget diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 201d95bd0..870d907a0 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include @@ -82,6 +83,12 @@ bool DSDDemodGUI::deserialize(const QByteArray& data) } } +void DSDDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool DSDDemodGUI::handleMessage(const Message& message) { if (DSDDemod::MsgConfigureDSDDemod::match(message)) @@ -337,6 +344,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_dsdStatusTextDialog(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demoddsd/readme.md"; ui->screenTV->setColor(true); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 27589f019..e5de1b302 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -68,6 +68,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: // typedef enum // { diff --git a/plugins/channelrx/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui index 295059813..338f619f7 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.ui +++ b/plugins/channelrx/demoddsd/dsddemodgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -19,7 +19,13 @@ 650 - 0 + 392 + + + + + 650 + 392 @@ -1231,29 +1237,29 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
+ + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +
RollupContents QWidget
gui/rollupcontents.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
LevelMeterSignalDB QWidget
gui/levelmeter.h
1
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
TVScreen QWidget diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index a6e670963..22f98352b 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "ui_nfmdemodgui.h" #include "plugin/pluginapi.h" @@ -55,6 +56,12 @@ bool NFMDemodGUI::deserialize(const QByteArray& data) } } +void NFMDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool NFMDemodGUI::handleMessage(const Message& message) { if (NFMDemodReport::MsgReportCTCSSFreq::match(message)) @@ -360,6 +367,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demodnfm/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index e320900d6..a2394ea8f 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -46,6 +46,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::NFMDemodGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui index 6ff83f5c7..4433218c9 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.ui +++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -19,7 +19,13 @@ 360 - 0 + 197 + + + + + 360 + 197 @@ -783,18 +789,18 @@ QToolButton
gui/buttonswitch.h
- - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ValueDialZ QWidget
gui/valuedialz.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
LevelMeterSignalDB QWidget diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.cpp b/plugins/channelrx/demodvorsc/vordemodscgui.cpp index d0e7c0e0a..81800543c 100644 --- a/plugins/channelrx/demodvorsc/vordemodscgui.cpp +++ b/plugins/channelrx/demodvorsc/vordemodscgui.cpp @@ -19,6 +19,7 @@ #include #include +#include #include "device/deviceuiset.h" #include "dsp/dspengine.h" @@ -76,6 +77,12 @@ bool VORDemodSCGUI::deserialize(const QByteArray& data) } } +void VORDemodSCGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool VORDemodSCGUI::handleMessage(const Message& message) { if (VORDemodSC::MsgConfigureVORDemod::match(message)) @@ -291,6 +298,7 @@ VORDemodSCGUI::VORDemodSCGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demodvorsc/readme.md"; diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.h b/plugins/channelrx/demodvorsc/vordemodscgui.h index 058d36c20..53e23bac4 100644 --- a/plugins/channelrx/demodvorsc/vordemodscgui.h +++ b/plugins/channelrx/demodvorsc/vordemodscgui.h @@ -64,6 +64,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::VORDemodSCGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.ui b/plugins/channelrx/demodvorsc/vordemodscgui.ui index e406cd4c2..775897c7d 100644 --- a/plugins/channelrx/demodvorsc/vordemodscgui.ui +++ b/plugins/channelrx/demodvorsc/vordemodscgui.ui @@ -6,12 +6,12 @@ 0 0 - 402 - 189 + 352 + 110
- + 0 0 @@ -22,6 +22,12 @@ 110 + + + 352 + 110 + + Liberation Sans @@ -613,6 +619,12 @@ + + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +
RollupContents QWidget @@ -625,19 +637,13 @@
gui/levelmeter.h
1
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
audioMute - + diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 50a5b723f..b01e10d74 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -55,6 +55,12 @@ bool WFMDemodGUI::deserialize(const QByteArray& data) } } +void WFMDemodGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool WFMDemodGUI::handleMessage(const Message& message) { if (WFMDemod::MsgConfigureWFMDemod::match(message)) @@ -219,6 +225,7 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_audioSampleRate(-1) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/demodwfm/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index e456cd5fc..ad4442667 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -44,6 +44,9 @@ public slots: void channelMarkerChangedByCursor(); void channelMarkerHighlightedByCursor(); +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::WFMDemodGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.ui b/plugins/channelrx/demodwfm/wfmdemodgui.ui index d6ef37d7e..16090ceb7 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.ui +++ b/plugins/channelrx/demodwfm/wfmdemodgui.ui @@ -10,16 +10,22 @@ 170
+ + + 0 + 0 + + 302 - 0 + 170 302 - 16777215 + 170 @@ -435,6 +441,18 @@ + + ValueDial + QWidget +
gui/valuedial.h
+ 1 +
+ + ValueDialZ + QWidget +
gui/valuedialz.h
+ 1 +
RollupContents QWidget @@ -447,18 +465,6 @@
gui/levelmeter.h
1
- - ValueDialZ - QWidget -
gui/valuedialz.h
- 1 -
- - ValueDial - QWidget -
gui/valuedial.h
- 1 -
diff --git a/plugins/channelrx/filesink/filesinkgui.ui b/plugins/channelrx/filesink/filesinkgui.ui index b109a54f9..99c330cdb 100644 --- a/plugins/channelrx/filesink/filesinkgui.ui +++ b/plugins/channelrx/filesink/filesinkgui.ui @@ -10,6 +10,12 @@ 458
+ + + 0 + 0 + + 552 @@ -508,7 +514,7 @@
- + 0 @@ -517,8 +523,11 @@ 351 - - Channel Spectrum + + + 0 + 0 + @@ -526,6 +535,12 @@ + + + 0 + 0 + + 0 @@ -547,12 +562,6 @@ - - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ButtonSwitch QToolButton @@ -576,6 +585,12 @@
gui/glspectrumgui.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
diff --git a/plugins/channelrx/freqtracker/freqtrackergui.ui b/plugins/channelrx/freqtracker/freqtrackergui.ui index 72ba59785..460ddadcb 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.ui +++ b/plugins/channelrx/freqtracker/freqtrackergui.ui @@ -7,11 +7,11 @@ 0 0 400 - 327 + 360 - + 0 0 @@ -19,7 +19,7 @@ 400 - 100 + 360 @@ -754,6 +754,12 @@ 161 + + + 0 + 0 + + Channel Spectrum @@ -775,6 +781,18 @@ + + + 0 + 0 + + + + + 390 + 200 + + Liberation Mono @@ -790,23 +808,11 @@
- - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ButtonSwitch QToolButton
gui/buttonswitch.h
- - LevelMeterSignalDB - QWidget -
gui/levelmeter.h
- 1 -
ValueDialZ QWidget @@ -825,6 +831,18 @@
gui/glspectrumgui.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
+ + LevelMeterSignalDB + QWidget +
gui/levelmeter.h
+ 1 +
diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 89d85d450..328baed95 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -16,6 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "device/deviceuiset.h" #include "gui/basicchannelsettingsdialog.h" @@ -68,6 +69,12 @@ bool LocalSinkGUI::deserialize(const QByteArray& data) } } +void LocalSinkGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool LocalSinkGUI::handleMessage(const Message& message) { if (DSPSignalNotification::match(message)) @@ -106,6 +113,7 @@ LocalSinkGUI::LocalSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/localsink/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h index 6d678d563..201615245 100644 --- a/plugins/channelrx/localsink/localsinkgui.h +++ b/plugins/channelrx/localsink/localsinkgui.h @@ -60,6 +60,9 @@ public: virtual int getStreamIndex() const { return m_settings.m_streamIndex; } virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::LocalSinkGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/localsink/localsinkgui.ui b/plugins/channelrx/localsink/localsinkgui.ui index dc64076d2..7e05df7fa 100644 --- a/plugins/channelrx/localsink/localsinkgui.ui +++ b/plugins/channelrx/localsink/localsinkgui.ui @@ -6,26 +6,26 @@ 0 0 - 320 - 110 + 303 + 100 - + 0 0 - 320 + 303 100 - 320 - 16777215 + 303 + 100 @@ -40,8 +40,8 @@ - 10 - 10 + 2 + 2 301 91 @@ -329,17 +329,17 @@ + + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
RollupContents QWidget
gui/rollupcontents.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-
diff --git a/plugins/channelrx/radioclock/radioclockgui.ui b/plugins/channelrx/radioclock/radioclockgui.ui index 4f3d6cd2d..4ace8a0f7 100644 --- a/plugins/channelrx/radioclock/radioclockgui.ui +++ b/plugins/channelrx/radioclock/radioclockgui.ui @@ -11,7 +11,7 @@
- + 0 0 @@ -595,6 +595,12 @@ 341 + + + 0 + 0 + + Waveforms @@ -616,6 +622,12 @@ + + + 0 + 0 + + 200 @@ -637,18 +649,18 @@ - - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ValueDialZ QWidget
gui/valuedialz.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
LevelMeterSignalDB QWidget diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index 50f4cf9ad..5a7f288f1 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -16,6 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "device/deviceuiset.h" #include "gui/basicchannelsettingsdialog.h" @@ -63,6 +64,12 @@ bool RemoteSinkGUI::deserialize(const QByteArray& data) } } +void RemoteSinkGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool RemoteSinkGUI::handleMessage(const Message& message) { if (RemoteSink::MsgConfigureRemoteSink::match(message)) @@ -102,6 +109,7 @@ RemoteSinkGUI::RemoteSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas m_tickCount(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/channelrx/remotesink/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h index 441ae61ec..39287de17 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.h +++ b/plugins/channelrx/remotesink/remotesinkgui.h @@ -60,6 +60,9 @@ public: virtual int getStreamIndex() const { return m_settings.m_streamIndex; } virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::RemoteSinkGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/channelrx/remotesink/remotesinkgui.ui b/plugins/channelrx/remotesink/remotesinkgui.ui index 9f9d3526f..a42ce341a 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.ui +++ b/plugins/channelrx/remotesink/remotesinkgui.ui @@ -6,26 +6,26 @@ 0 0 - 320 - 157 + 304 + 143 - + 0 0 - 320 - 100 + 304 + 143 - 320 - 16777215 + 304 + 143 @@ -40,8 +40,8 @@ - 10 - 10 + 2 + 2 301 141 diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui index b2e55f758..eedbfb34b 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui @@ -10,6 +10,12 @@ 458 + + + 0 + 0 + + 552 @@ -34,6 +40,12 @@ 100 + + + 0 + 0 + + 550 @@ -505,7 +517,7 @@
- + 0 @@ -514,8 +526,11 @@ 351 - - Channel Spectrum + + + 0 + 0 + @@ -523,6 +538,12 @@ + + + 0 + 0 + + 0 @@ -544,12 +565,6 @@ - - RollupContents - QWidget -
gui/rollupcontents.h
- 1 -
ButtonSwitch QToolButton @@ -573,6 +588,12 @@
gui/glspectrumgui.h
1
+ + RollupContents + QWidget +
gui/rollupcontents.h
+ 1 +
diff --git a/plugins/channelrx/udpsink/udpsinkgui.ui b/plugins/channelrx/udpsink/udpsinkgui.ui index ea438e23c..8a9d71230 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.ui +++ b/plugins/channelrx/udpsink/udpsinkgui.ui @@ -6,22 +6,22 @@ 0 0 - 383 + 360 355 + + + 0 + 0 + + - 342 + 360 0 - - - 400 - 16777215 - - Liberation Sans @@ -34,15 +34,15 @@ - 2 + 0 2 - 380 + 356 142 - 380 + 356 0 @@ -183,6 +183,15 @@ + + + + 26 + 26 + 26 + + + @@ -203,6 +212,15 @@ + + + + 26 + 26 + 26 + + + @@ -223,11 +241,21 @@ + + + + 26 + 26 + 26 + + + + Liberation Sans 8 @@ -819,12 +847,24 @@ - 15 + 0 160 - 231 + 356 156 + + + 0 + 0 + + + + + 356 + 0 + + Channel Spectrum @@ -846,6 +886,12 @@ + + + 0 + 0 + + Liberation Mono @@ -862,9 +908,14 @@ - RollupContents + ButtonSwitch + QToolButton +
gui/buttonswitch.h
+
+ + ValueDialZ QWidget -
gui/rollupcontents.h
+
gui/valuedialz.h
1
@@ -880,16 +931,11 @@ 1 - ValueDialZ + RollupContents QWidget -
gui/valuedialz.h
+
gui/rollupcontents.h
1
- - ButtonSwitch - QToolButton -
gui/buttonswitch.h
-