VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-26 13:26:24 -04:00
Code Issues Projects Releases Wiki Activity

Device GUIs: Constain window size via minimumSize/maximumSize, rather than handling resizeEvent. Add maximum button. Hide size buttons when window size is fixed

Browse Source
This commit is contained in:
Jon Beniston
2022-11-09 15:53:44 +00:00
parent b551a20302
commit ee8b8ade88
88 changed files with 102 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/audiooutput/audiooutputgui.cpp
+1 -8
View File
@@ -17,7 +17,6 @@
#include <QMessageBox>
#include <QFileDialog>
#include <QResizeEvent>
#include "ui_audiooutputgui.h"
#include "gui/colormapper.h"
@@ -44,7 +43,7 @@ AudioOutputGui::AudioOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_audioOutput = (AudioOutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#AudioOutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/audiooutput/readme.md";
@@ -103,12 +102,6 @@ bool AudioOutputGui::deserialize(const QByteArray& data)
}
}
void AudioOutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool AudioOutputGui::handleMessage(const Message& message)
{
if (AudioOutput::MsgConfigureAudioOutput::match(message))
plugins/samplesink/audiooutput/audiooutputgui.h
-3
View File
@@ -46,9 +46,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::AudioOutputGui* ui;
plugins/samplesink/bladerf1output/bladerf1outputgui.cpp
+1 -8
View File
@@ -17,7 +17,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include <libbladeRF.h>
@@ -47,7 +46,7 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent)
m_deviceSampleSink = (Bladerf1Output*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#Bladerf1OutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "/plugins/samplesink/bladerf1output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->centerFrequency->setValueRange(7, BLADERF_FREQUENCY_MIN_XB200/1000, BLADERF_FREQUENCY_MAX/1000);
@@ -115,12 +114,6 @@ bool Bladerf1OutputGui::deserialize(const QByteArray& data)
}
}
void Bladerf1OutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool Bladerf1OutputGui::handleMessage(const Message& message)
{
if (Bladerf1Output::MsgConfigureBladerf1::match(message))
plugins/samplesink/bladerf1output/bladerf1outputgui.h
-3
View File
@@ -46,9 +46,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::Bladerf1OutputGui* ui;
plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
+1 -8
View File
@@ -17,7 +17,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include <libbladeRF.h>
@@ -50,7 +49,7 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent)
uint64_t f_min, f_max;
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#BladeRF2OutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/bladerf2output/readme.md"; ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -127,12 +126,6 @@ bool BladeRF2OutputGui::deserialize(const QByteArray& data)
}
}
void BladeRF2OutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void BladeRF2OutputGui::updateFrequencyLimits()
{
// values in kHz
plugins/samplesink/bladerf2output/bladerf2outputgui.h
-3
View File
@@ -47,9 +47,6 @@ public:
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::BladeRF2OutputGui* ui;
plugins/samplesink/fileoutput/fileoutputgui.cpp
+1 -8
View File
@@ -22,7 +22,6 @@
#include <QString>
#include <QFileDialog>
#include <QMessageBox>
#include <QResizeEvent>
#include "ui_fileoutputgui.h"
#include "plugin/pluginapi.h"
@@ -55,7 +54,7 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_deviceUISet = deviceUISet;
setAttribute(Qt::WA_DeleteOnClose, true);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#FileOutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/fileoutput/readme.md";
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -119,12 +118,6 @@ bool FileOutputGui::deserialize(const QByteArray& data)
}
}
void FileOutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool FileOutputGui::handleMessage(const Message& message)
{
if (FileOutput::MsgConfigureFileOutput::match(message))
plugins/samplesink/fileoutput/fileoutputgui.h
-3
View File
@@ -48,9 +48,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::FileOutputGui* ui;
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
+1 -8
View File
@@ -17,7 +17,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include <libhackrf/hackrf.h>
@@ -49,7 +48,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#HackRFOutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/hackrfoutput/readme.md";
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -113,12 +112,6 @@ bool HackRFOutputGui::deserialize(const QByteArray& data)
}
}
void HackRFOutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void HackRFOutputGui::blockApplySettings(bool block)
{
m_doApplySettings = !block;
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
-3
View File
@@ -56,9 +56,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::HackRFOutputGui* ui;
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
+1 -8
View File
@@ -17,7 +17,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include "ui_limesdroutputgui.h"
#include "gui/colormapper.h"
@@ -46,7 +45,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#LimeSDROutputGUI { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/limesdroutput/readme.md";
@@ -140,12 +139,6 @@ bool LimeSDROutputGUI::deserialize(const QByteArray& data)
}
}
void LimeSDROutputGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void LimeSDROutputGUI::updateFrequencyLimits()
{
// values in kHz
plugins/samplesink/limesdroutput/limesdroutputgui.h
-3
View File
@@ -46,9 +46,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::LimeSDROutputGUI* ui;
plugins/samplesink/localoutput/localoutputgui.cpp
+1 -8
View File
@@ -28,7 +28,6 @@
#include <QNetworkReply>
#include <QJsonParseError>
#include <QJsonObject>
#include <QResizeEvent>
#include "ui_localoutputgui.h"
#include "gui/colormapper.h"
@@ -63,7 +62,7 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#LocalOutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/localoutput/readme.md";
@@ -133,12 +132,6 @@ bool LocalOutputGui::deserialize(const QByteArray& data)
}
}
void LocalOutputGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool LocalOutputGui::handleMessage(const Message& message)
{
if (LocalOutput::MsgConfigureLocalOutput::match(message))
plugins/samplesink/localoutput/localoutputgui.h
-3
View File
@@ -47,9 +47,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::LocalOutputGui* ui;
plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
+1 -8
View File
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@@ -49,7 +48,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent)
m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#PlutoSDROutputGUI { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/plutosdroutput/readme.md";
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -125,12 +124,6 @@ bool PlutoSDROutputGUI::deserialize(const QByteArray& data)
}
}
void PlutoSDROutputGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool PlutoSDROutputGUI::handleMessage(const Message& message)
{
(void) message;
plugins/samplesink/plutosdroutput/plutosdroutputgui.h
-3
View File
@@ -48,9 +48,6 @@ public:
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::PlutoSDROutputGUI* ui;
PlutoSDROutputSettings m_settings;
plugins/samplesink/remoteoutput/remoteoutputgui.cpp
+1 -8
View File
@@ -20,7 +20,6 @@
#include <QDateTime>
#include <QString>
#include <QMessageBox>
#include <QResizeEvent>
#include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp>
@@ -68,7 +67,7 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare
m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white);
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#RemoteOutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/remoteoutput/readme.md";
@@ -145,12 +144,6 @@ bool RemoteOutputSinkGui::deserialize(const QByteArray& data)
}
}
void RemoteOutputSinkGui::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool RemoteOutputSinkGui::handleMessage(const Message& message)
{
if (RemoteOutput::MsgConfigureRemoteOutput::match(message))
plugins/samplesink/remoteoutput/remoteoutputgui.h
-3
View File
@@ -78,9 +78,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::RemoteOutputGui* ui;
plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent)
setAttribute(Qt::WA_DeleteOnClose, true);
m_sampleSink = (SoapySDROutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
sizeToContents();
getContents()->setStyleSheet("#SoapySDROutputGui { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/soapysdroutput/readme.md";
plugins/samplesink/testsink/testsinkgui.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_helpURL = "plugins/samplesink/testsink/readme.md";
QWidget *contents = getContents();
ui->setupUi(contents);
setSizePolicy(contents->sizePolicy());
sizeToContents();
setMinimumSize(m_MinimumWidth, m_MinimumHeight);
getContents()->setStyleSheet("#TestSinkGui { background-color: rgb(64, 64, 64); }");
m_sampleSink = (TestSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
plugins/samplesink/usrpoutput/usrpoutputgui.cpp
+1 -8
View File
@@ -18,7 +18,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include "ui_usrpoutputgui.h"
#include "gui/colormapper.h"
@@ -47,7 +46,7 @@ USRPOutputGUI::USRPOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_usrpOutput = (USRPOutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#USRPOutputGUI { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/usrpoutput/readme.md";
@@ -154,12 +153,6 @@ bool USRPOutputGUI::deserialize(const QByteArray& data)
}
}
void USRPOutputGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void USRPOutputGUI::updateFrequencyLimits()
{
// values in kHz
plugins/samplesink/usrpoutput/usrpoutputgui.h
-3
View File
@@ -53,9 +53,6 @@ public:
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::USRPOutputGUI* ui;
plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp
+1 -8
View File
@@ -19,7 +19,6 @@
#include <QDebug>
#include <QMessageBox>
#include <QResizeEvent>
#include "ui_xtrxoutputgui.h"
#include "gui/colormapper.h"
@@ -48,7 +47,7 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_XTRXOutput = (XTRXOutput*) m_deviceUISet->m_deviceAPI->getSampleSink();
ui->setupUi(getContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizeToContents();
getContents()->setStyleSheet("#XTRXOutputGUI { background-color: rgb(64, 64, 64); }");
m_helpURL = "plugins/samplesink/xtrxoutput/readme.md";
@@ -123,12 +122,6 @@ bool XTRXOutputGUI::deserialize(const QByteArray& data)
}
}
void XTRXOutputGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool XTRXOutputGUI::handleMessage(const Message& message)
{
plugins/samplesink/xtrxoutput/xtrxoutputgui.h
-3
View File
@@ -45,9 +45,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
protected:
void resizeEvent(QResizeEvent* size);
private:
Ui::XTRXOutputGUI* ui;