diff --git a/plugins/samplemimo/metismiso/metismisogui.ui b/plugins/samplemimo/metismiso/metismisogui.ui index dd5259f47..15158d88d 100644 --- a/plugins/samplemimo/metismiso/metismisogui.ui +++ b/plugins/samplemimo/metismiso/metismisogui.ui @@ -11,7 +11,7 @@ - + 0 0 diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index 1d4ece70a..99752212a 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -55,6 +55,11 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : { qDebug("TestMIGui::TestMIGui"); setAttribute(Qt::WA_DeleteOnClose, true); + m_helpURL = "plugins/samplemimo/testmi/readme.md"; + ui->setupUi(getContents()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + getContents()->setStyleSheet("#TestMIGui { background-color: rgb(64, 64, 64); }"); + m_sampleMIMO = m_deviceUISet->m_deviceAPI->getSampleMIMO(); m_streamIndex = 0; m_deviceCenterFrequencies.push_back(m_settings.m_streams[0].m_centerFrequency); @@ -62,10 +67,6 @@ TestMIGui::TestMIGui(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceSampleRates.push_back(m_settings.m_streams[0].m_sampleRate / (1<setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - getContents()->setStyleSheet("#TestMIGui { background-color: rgb(64, 64, 64); }"); - m_helpURL = "plugins/samplemimo/testmi/readme.md"; ui->spectrumSource->addItem("0"); ui->spectrumSource->addItem("1"); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index abd91236b..764414e2d 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -51,10 +51,12 @@ TestMOSyncGui::TestMOSyncGui(DeviceUISet *deviceUISet, QWidget* parent) : m_lastEngineState(DeviceAPI::StNotStarted) { setAttribute(Qt::WA_DeleteOnClose, true); - ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - getContents()->setStyleSheet("#TestMOSyncGui { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplemimo/testmosync/readme.md"; + QWidget *contents = getContents(); + ui->setupUi(contents); + setSizePolicy(contents->sizePolicy()); + + getContents()->setStyleSheet("#TestMOSyncGui { background-color: rgb(64, 64, 64); }"); m_sampleMIMO = (TestMOSync*) m_deviceUISet->m_deviceAPI->getSampleMIMO(); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.ui b/plugins/samplemimo/testmosync/testmosyncgui.ui index f1313b9b6..ce43ea830 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.ui +++ b/plugins/samplemimo/testmosync/testmosyncgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 320 + 420 - + 0 0 @@ -19,7 +19,7 @@ 360 - 0 + 420 @@ -335,33 +335,41 @@ - - - - - - 0 - 0 - - - - - 200 - 200 - - - - - Liberation Mono - 8 - - - - - - - - + + + + 0 + 0 + + + + + + + + 0 + 0 + + + + + 200 + 200 + + + + + Liberation Mono + 8 + + + + + + + + + diff --git a/plugins/samplesink/audiooutput/audiooutputgui.ui b/plugins/samplesink/audiooutput/audiooutputgui.ui index bdbe5c47a..07a82a594 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.ui +++ b/plugins/samplesink/audiooutput/audiooutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 106 + 124 - + 0 0 @@ -19,13 +19,13 @@ 360 - 106 + 124 360 - 106 + 143 diff --git a/plugins/samplesink/fileoutput/fileoutputgui.ui b/plugins/samplesink/fileoutput/fileoutputgui.ui index f089af530..b525560bf 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.ui +++ b/plugins/samplesink/fileoutput/fileoutputgui.ui @@ -7,11 +7,11 @@ 0 0 360 - 106 + 126 - + 0 0 @@ -19,13 +19,13 @@ 360 - 106 + 126 360 - 106 + 144 diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui b/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui index bb34250dc..a0a70366e 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.ui @@ -7,7 +7,7 @@ 0 0 360 - 151 + 174 @@ -19,13 +19,13 @@ 360 - 151 + 174 360 - 151 + 207 @@ -39,7 +39,7 @@ - 3 + 2 2 diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 471f6561d..ecccbf97c 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -50,11 +50,12 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_lastEngineState(DeviceAPI::StNotStarted) { setAttribute(Qt::WA_DeleteOnClose, true); - ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + m_helpURL = "plugins/samplesink/testsink/readme.md"; + QWidget *contents = getContents(); + ui->setupUi(contents); + setSizePolicy(contents->sizePolicy()); setMinimumSize(m_MinimumWidth, m_MinimumHeight); getContents()->setStyleSheet("#TestSinkGui { background-color: rgb(64, 64, 64); }"); - m_helpURL = "plugins/samplesink/testsink/readme.md"; m_sampleSink = (TestSinkOutput*) m_deviceUISet->m_deviceAPI->getSampleSink(); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesink/testsink/testsinkgui.ui b/plugins/samplesink/testsink/testsinkgui.ui index c525546f6..37ecfb351 100644 --- a/plugins/samplesink/testsink/testsinkgui.ui +++ b/plugins/samplesink/testsink/testsinkgui.ui @@ -11,7 +11,7 @@ - + 0 0 @@ -290,46 +290,54 @@ - - - - - - 0 - 0 - - - - - 354 - 200 - - - - - Liberation Mono - 8 - - - - - - - - - 0 - 0 - - - - - 354 - 30 - - - - - + + + + 0 + 0 + + + + + + + + 0 + 0 + + + + + 354 + 200 + + + + + Liberation Mono + 8 + + + + + + + + + 0 + 0 + + + + + 354 + 30 + + + + + + diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index 07e165b06..343585106 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -62,10 +62,11 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_lastEngineState(DeviceAPI::StNotStarted) { setAttribute(Qt::WA_DeleteOnClose, true); - ui->setupUi(getContents()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); - getContents()->setStyleSheet("#SigMFFileInputGUI { background-color: rgb(64, 64, 64); }"); m_helpURL = "plugins/samplesource/sigmffileinput/readme.md"; + QWidget *contents = getContents(); + ui->setupUi(contents); + setSizePolicy(contents->sizePolicy()); + contents->setStyleSheet("#SigMFFileInputGUI { background-color: rgb(64, 64, 64); }"); ui->fileNameText->setText(m_metaFileName); ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); @@ -130,12 +131,6 @@ 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 30f3cf9a3..381ad5ea9 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h @@ -47,9 +47,6 @@ 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 8ef55dd12..35307e9bc 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui @@ -6,7 +6,7 @@ 0 0 - 436 + 450 436 @@ -18,13 +18,13 @@ - 436 + 450 436 - 436 + 450 16777215 diff --git a/sdrgui/channel/channelgui.cpp b/sdrgui/channel/channelgui.cpp index 106df5191..4772363e9 100644 --- a/sdrgui/channel/channelgui.cpp +++ b/sdrgui/channel/channelgui.cpp @@ -56,6 +56,7 @@ ChannelGUI::ChannelGUI(QWidget *parent) : m_indexLabel->setToolTip("Channel index"); m_settingsButton = new QPushButton(); + m_settingsButton->setFixedSize(20, 20); QIcon settingsIcon(":/gear.png"); m_settingsButton->setIcon(settingsIcon); m_settingsButton->setToolTip("Common settings"); diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp index 2b5d2cc5f..a782cdff5 100644 --- a/sdrgui/device/devicegui.cpp +++ b/sdrgui/device/devicegui.cpp @@ -163,7 +163,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) : m_bottomLayout->addWidget(m_statusLabel); m_sizeGripBottomRight = new QSizeGrip(this); m_sizeGripBottomRight->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - m_sizeGripBottomRight->setFixedHeight(20); + // m_bottomLayout->addStretch(1); m_bottomLayout->addWidget(m_sizeGripBottomRight, 0, Qt::AlignBottom | Qt::AlignRight); diff --git a/sdrgui/feature/featuregui.cpp b/sdrgui/feature/featuregui.cpp index 7b732652f..c7d1f6481 100644 --- a/sdrgui/feature/featuregui.cpp +++ b/sdrgui/feature/featuregui.cpp @@ -51,6 +51,7 @@ FeatureGUI::FeatureGUI(QWidget *parent) : m_indexLabel->setToolTip("Feature index"); m_settingsButton = new QPushButton(); + m_settingsButton->setFixedSize(20, 20); QIcon settingsIcon(":/gear.png"); m_settingsButton->setIcon(settingsIcon); m_settingsButton->setToolTip("Common settings");