From 90386842cac905718d4f051ff1b464eea273de33 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 21 Apr 2022 23:31:01 +0200 Subject: [PATCH] Massive UI revamping (v7): fixed widget size handling: features. Part of #1209 --- plugins/feature/afc/afcgui.cpp | 8 +++++ plugins/feature/afc/afcgui.h | 3 ++ plugins/feature/afc/afcgui.ui | 16 ++++++--- .../feature/antennatools/antennatoolsgui.cpp | 9 +++++ .../feature/antennatools/antennatoolsgui.h | 3 ++ .../feature/antennatools/antennatoolsgui.ui | 22 ++++++++----- .../gs232controller/gs232controllergui.cpp | 8 +++++ .../gs232controller/gs232controllergui.h | 3 ++ .../gs232controller/gs232controllergui.ui | 2 +- .../jogdialcontrollergui.cpp | 8 +++++ .../jogdialcontroller/jogdialcontrollergui.h | 1 + .../jogdialcontroller/jogdialcontrollergui.ui | 33 +++++++------------ plugins/feature/pertester/pertestergui.cpp | 8 +++++ plugins/feature/pertester/pertestergui.h | 3 ++ plugins/feature/pertester/pertestergui.ui | 32 ++++++++++-------- .../feature/rigctlserver/rigctlservergui.cpp | 8 +++++ .../feature/rigctlserver/rigctlservergui.h | 3 ++ .../feature/rigctlserver/rigctlservergui.ui | 20 +++++------ plugins/feature/simpleptt/simplepttgui.cpp | 8 +++++ plugins/feature/simpleptt/simplepttgui.h | 3 ++ plugins/feature/simpleptt/simplepttgui.ui | 20 +++++------ 21 files changed, 152 insertions(+), 69 deletions(-) diff --git a/plugins/feature/afc/afcgui.cpp b/plugins/feature/afc/afcgui.cpp index a5924e9ea..c21fa1eba 100644 --- a/plugins/feature/afc/afcgui.cpp +++ b/plugins/feature/afc/afcgui.cpp @@ -16,6 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "feature/featureuiset.h" #include "device/deviceset.h" @@ -65,6 +66,12 @@ bool AFCGUI::deserialize(const QByteArray& data) } } +void AFCGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool AFCGUI::handleMessage(const Message& message) { if (AFC::MsgConfigureAFC::match(message)) @@ -131,6 +138,7 @@ AFCGUI::AFCGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *featur m_lastFeatureState(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/afc/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/afc/afcgui.h b/plugins/feature/afc/afcgui.h index 83c73a537..2a93e25c2 100644 --- a/plugins/feature/afc/afcgui.h +++ b/plugins/feature/afc/afcgui.h @@ -48,6 +48,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::AFCGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/afc/afcgui.ui b/plugins/feature/afc/afcgui.ui index 373da46f5..de65c6172 100644 --- a/plugins/feature/afc/afcgui.ui +++ b/plugins/feature/afc/afcgui.ui @@ -6,19 +6,25 @@ 0 0 - 340 - 160 + 320 + 100 - + 0 0 - 340 + 320 + 100 + + + + + 320 100 @@ -37,7 +43,7 @@ 0 0 340 - 151 + 111 diff --git a/plugins/feature/antennatools/antennatoolsgui.cpp b/plugins/feature/antennatools/antennatoolsgui.cpp index b1e55847f..53bb417f0 100644 --- a/plugins/feature/antennatools/antennatoolsgui.cpp +++ b/plugins/feature/antennatools/antennatoolsgui.cpp @@ -18,6 +18,8 @@ #include +#include + #include "feature/featureuiset.h" #include "gui/basicfeaturesettingsdialog.h" #include "channel/channelwebapiutils.h" @@ -68,6 +70,12 @@ bool AntennaToolsGUI::deserialize(const QByteArray& data) } } +void AntennaToolsGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool AntennaToolsGUI::handleMessage(const Message& message) { if (AntennaTools::MsgConfigureAntennaTools::match(message)) @@ -115,6 +123,7 @@ AntennaToolsGUI::AntennaToolsGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISe m_deviceSets(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/antennatools/readme.md"; diff --git a/plugins/feature/antennatools/antennatoolsgui.h b/plugins/feature/antennatools/antennatoolsgui.h index 95823f9a3..764e82c17 100644 --- a/plugins/feature/antennatools/antennatoolsgui.h +++ b/plugins/feature/antennatools/antennatoolsgui.h @@ -51,6 +51,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::AntennaToolsGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/antennatools/antennatoolsgui.ui b/plugins/feature/antennatools/antennatoolsgui.ui index 73cff9790..69f88452a 100644 --- a/plugins/feature/antennatools/antennatoolsgui.ui +++ b/plugins/feature/antennatools/antennatoolsgui.ui @@ -6,20 +6,26 @@ 0 0 - 394 - 523 + 374 + 584 - + 0 0 - 360 - 0 + 374 + 584 + + + + + 374 + 584 @@ -37,10 +43,10 @@ - 16 - 19 + 0 + 0 371 - 481 + 581 diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp index e777ee052..9fdcc2e55 100644 --- a/plugins/feature/gs232controller/gs232controllergui.cpp +++ b/plugins/feature/gs232controller/gs232controllergui.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "SWGTargetAzimuthElevation.h" @@ -70,6 +71,12 @@ bool GS232ControllerGUI::deserialize(const QByteArray& data) } } +void GS232ControllerGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool GS232ControllerGUI::handleMessage(const Message& message) { if (GS232Controller::MsgConfigureGS232Controller::match(message)) @@ -141,6 +148,7 @@ GS232ControllerGUI::GS232ControllerGUI(PluginAPI* pluginAPI, FeatureUISet *featu m_lastOnTarget(false) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/gs232controller/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/gs232controller/gs232controllergui.h b/plugins/feature/gs232controller/gs232controllergui.h index 887d5d783..6761b87c6 100644 --- a/plugins/feature/gs232controller/gs232controllergui.h +++ b/plugins/feature/gs232controller/gs232controllergui.h @@ -50,6 +50,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::GS232ControllerGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/gs232controller/gs232controllergui.ui b/plugins/feature/gs232controller/gs232controllergui.ui index 3b7ff827b..e159e79ea 100644 --- a/plugins/feature/gs232controller/gs232controllergui.ui +++ b/plugins/feature/gs232controller/gs232controllergui.ui @@ -11,7 +11,7 @@ - + 0 0 diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp index 3db3ca647..357ed4485 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp +++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "feature/featureuiset.h" #include "gui/basicfeaturesettingsdialog.h" @@ -66,6 +67,12 @@ bool JogdialControllerGUI::deserialize(const QByteArray& data) } } +void JogdialControllerGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool JogdialControllerGUI::handleMessage(const Message& message) { if (JogdialController::MsgConfigureJogdialController::match(message)) @@ -146,6 +153,7 @@ JogdialControllerGUI::JogdialControllerGUI(PluginAPI* pluginAPI, FeatureUISet *f m_selectedChannel(nullptr) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/jogdialcontroller/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.h b/plugins/feature/jogdialcontroller/jogdialcontrollergui.h index 932b5592d..72f2bf90a 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.h +++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.h @@ -55,6 +55,7 @@ public: protected: void focusInEvent(QFocusEvent* e); void focusOutEvent(QFocusEvent *e); + void resizeEvent(QResizeEvent* size); private: Ui::JogdialControllerGUI* ui; diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.ui b/plugins/feature/jogdialcontroller/jogdialcontrollergui.ui index 142ba45fc..26ed65d0f 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.ui +++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.ui @@ -6,12 +6,12 @@ 0 0 - 365 - 105 + 340 + 50 - + 0 0 @@ -19,7 +19,13 @@ 340 - 100 + 50 + + + + + 340 + 50 @@ -37,7 +43,7 @@ 0 0 360 - 81 + 51 @@ -172,23 +178,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - diff --git a/plugins/feature/pertester/pertestergui.cpp b/plugins/feature/pertester/pertestergui.cpp index 55e9be8d6..156ecd659 100644 --- a/plugins/feature/pertester/pertestergui.cpp +++ b/plugins/feature/pertester/pertestergui.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include "feature/featureuiset.h" #include "gui/basicfeaturesettingsdialog.h" @@ -68,6 +69,12 @@ bool PERTesterGUI::deserialize(const QByteArray& data) } } +void PERTesterGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool PERTesterGUI::handleMessage(const Message& message) { if (PERTester::MsgConfigurePERTester::match(message)) @@ -127,6 +134,7 @@ PERTesterGUI::PERTesterGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Fea m_lastFeatureState(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/pertester/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/pertester/pertestergui.h b/plugins/feature/pertester/pertestergui.h index 2306bf792..9a6ce6ecf 100644 --- a/plugins/feature/pertester/pertestergui.h +++ b/plugins/feature/pertester/pertestergui.h @@ -50,6 +50,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::PERTesterGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/pertester/pertestergui.ui b/plugins/feature/pertester/pertestergui.ui index adc0d8da9..aa295bd45 100644 --- a/plugins/feature/pertester/pertestergui.ui +++ b/plugins/feature/pertester/pertestergui.ui @@ -6,26 +6,26 @@ 0 0 - 350 - 430 + 335 + 472 - + 0 0 - 320 - 100 + 335 + 472 - 350 - 16777215 + 335 + 472 @@ -40,10 +40,10 @@ - 10 - 10 + 2 + 2 331 - 291 + 341 @@ -157,6 +157,12 @@ + + + 0 + 0 + + Packets @@ -456,10 +462,10 @@ Substitutions: - 10 - 310 + 2 + 352 331 - 91 + 117 diff --git a/plugins/feature/rigctlserver/rigctlservergui.cpp b/plugins/feature/rigctlserver/rigctlservergui.cpp index 352a36076..2894d6b0a 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.cpp +++ b/plugins/feature/rigctlserver/rigctlservergui.cpp @@ -17,6 +17,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "feature/featureuiset.h" #include "gui/basicfeaturesettingsdialog.h" @@ -68,6 +69,12 @@ bool RigCtlServerGUI::deserialize(const QByteArray& data) } } +void RigCtlServerGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool RigCtlServerGUI::handleMessage(const Message& message) { if (RigCtlServer::MsgConfigureRigCtlServer::match(message)) @@ -127,6 +134,7 @@ RigCtlServerGUI::RigCtlServerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISe m_lastFeatureState(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/rigctlserver/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/rigctlserver/rigctlservergui.h b/plugins/feature/rigctlserver/rigctlservergui.h index 51f429a09..bd7c990cb 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.h +++ b/plugins/feature/rigctlserver/rigctlservergui.h @@ -50,6 +50,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::RigCtlServerGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/rigctlserver/rigctlservergui.ui b/plugins/feature/rigctlserver/rigctlservergui.ui index 6a5992d14..1d896fa27 100644 --- a/plugins/feature/rigctlserver/rigctlservergui.ui +++ b/plugins/feature/rigctlserver/rigctlservergui.ui @@ -6,26 +6,26 @@ 0 0 - 320 - 189 + 304 + 173 - + 0 0 - 320 - 100 + 304 + 173 - 320 - 16777215 + 304 + 173 @@ -40,9 +40,9 @@ - 10 - 10 - 301 + 2 + 2 + 300 171 diff --git a/plugins/feature/simpleptt/simplepttgui.cpp b/plugins/feature/simpleptt/simplepttgui.cpp index 163094290..20705415e 100644 --- a/plugins/feature/simpleptt/simplepttgui.cpp +++ b/plugins/feature/simpleptt/simplepttgui.cpp @@ -16,6 +16,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "feature/featureuiset.h" #include "gui/basicfeaturesettingsdialog.h" @@ -69,6 +70,12 @@ bool SimplePTTGUI::deserialize(const QByteArray& data) } } +void SimplePTTGUI::resizeEvent(QResizeEvent* size) +{ + adjustSize(); + size->accept(); +} + bool SimplePTTGUI::handleMessage(const Message& message) { if (SimplePTT::MsgConfigureSimplePTT::match(message)) @@ -151,6 +158,7 @@ SimplePTTGUI::SimplePTTGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Fea m_lastFeatureState(0) { ui->setupUi(getRollupContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); getRollupContents()->arrangeRollups(); m_helpURL = "plugins/feature/simpleptt/readme.md"; setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/plugins/feature/simpleptt/simplepttgui.h b/plugins/feature/simpleptt/simplepttgui.h index bee5244d8..c04046e4a 100644 --- a/plugins/feature/simpleptt/simplepttgui.h +++ b/plugins/feature/simpleptt/simplepttgui.h @@ -49,6 +49,9 @@ public: virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } +protected: + void resizeEvent(QResizeEvent* size); + private: Ui::SimplePTTGUI* ui; PluginAPI* m_pluginAPI; diff --git a/plugins/feature/simpleptt/simplepttgui.ui b/plugins/feature/simpleptt/simplepttgui.ui index 0293fff1a..51e2fccd6 100644 --- a/plugins/feature/simpleptt/simplepttgui.ui +++ b/plugins/feature/simpleptt/simplepttgui.ui @@ -6,26 +6,26 @@ 0 0 - 320 - 181 + 304 + 155 - + 0 0 - 320 - 100 + 304 + 155 - 320 - 16777215 + 304 + 155 @@ -40,9 +40,9 @@ - 10 - 10 - 301 + 2 + 2 + 300 151