mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Massive UI revamping (v7): Fixed sizing of some device windows. Part of #1209

pull/1215/head
f4exb 2022-04-25 00:15:46 +02:00
rodzic f77e38eb3f
commit 5f9d14a56e
15 zmienionych plików z 124 dodań i 110 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
plugins/samplemimo/metismiso/metismisogui.ui
Wyświetl plik

@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

9
plugins/samplemimo/testmi/testmigui.cpp
Wyświetl plik

@ -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<<m_settings.m_streams[0].m_log2Decim));
m_deviceSampleRates.push_back(m_settings.m_streams[1].m_sampleRate / (1<<m_settings.m_streams[1].m_log2Decim));
ui->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));

8
plugins/samplemimo/testmosync/testmosyncgui.cpp
Wyświetl plik

@ -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));

68
plugins/samplemimo/testmosync/testmosyncgui.ui
Wyświetl plik

@ -7,11 +7,11 @@
<x>0</x>
<y>0</y>
<width>360</width>
<height>320</height>
<height>420</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -19,7 +19,7 @@
<property name="minimumSize">
<size>
<width>360</width>
<height>0</height>
<height>420</height>
</size>
</property>
<property name="font">
@ -335,33 +335,41 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="spectrumLayout">
<item>
<widget class="GLSpectrum" name="glSpectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>8</pointsize>
</font>
</property>
</widget>
</item>
<item>
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true"/>
</item>
</layout>
<widget class="QWidget" name="spectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="spectrumLayout">
<item>
<widget class="GLSpectrum" name="glSpectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>8</pointsize>
</font>
</property>
</widget>
</item>
<item>
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>

8
plugins/samplesink/audiooutput/audiooutputgui.ui
Wyświetl plik

@ -7,11 +7,11 @@
<x>0</x>
<y>0</y>
<width>360</width>
<height>106</height>
<height>124</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -19,13 +19,13 @@
<property name="minimumSize">
<size>
<width>360</width>
<height>106</height>
<height>124</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>106</height>
<height>143</height>
</size>
</property>
<property name="font">

8
plugins/samplesink/fileoutput/fileoutputgui.ui
Wyświetl plik

@ -7,11 +7,11 @@
<x>0</x>
<y>0</y>
<width>360</width>
<height>106</height>
<height>126</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -19,13 +19,13 @@
<property name="minimumSize">
<size>
<width>360</width>
<height>106</height>
<height>126</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>106</height>
<height>144</height>
</size>
</property>
<property name="font">

8
plugins/samplesink/hackrfoutput/hackrfoutputgui.ui
Wyświetl plik

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>360</width>
<height>151</height>
<height>174</height>
</rect>
</property>
<property name="sizePolicy">
@ -19,13 +19,13 @@
<property name="minimumSize">
<size>
<width>360</width>
<height>151</height>
<height>174</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>151</height>
<height>207</height>
</size>
</property>
<property name="font">
@ -39,7 +39,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>3</number>
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>

7
plugins/samplesink/testsink/testsinkgui.cpp
Wyświetl plik

@ -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));

90
plugins/samplesink/testsink/testsinkgui.ui
Wyświetl plik

@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -290,46 +290,54 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="spectrumLayout">
<item>
<widget class="GLSpectrum" name="glSpectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>354</width>
<height>200</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>8</pointsize>
</font>
</property>
</widget>
</item>
<item>
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>354</width>
<height>30</height>
</size>
</property>
</widget>
</item>
</layout>
<widget class="QWidget" name="spec" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="spectrumLayout">
<item>
<widget class="GLSpectrum" name="glSpectrum" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>354</width>
<height>200</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>8</pointsize>
</font>
</property>
</widget>
</item>
<item>
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>354</width>
<height>30</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>

13
plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
Wyświetl plik

@ -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;

3
plugins/samplesource/sigmffileinput/sigmffileinputgui.h
Wyświetl plik

@ -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;

6
plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
Wyświetl plik

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>436</width>
<width>450</width>
<height>436</height>
</rect>
</property>
@ -18,13 +18,13 @@
</property>
<property name="minimumSize">
<size>
<width>436</width>
<width>450</width>
<height>436</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>436</width>
<width>450</width>
<height>16777215</height>
</size>
</property>

1
sdrgui/channel/channelgui.cpp
Wyświetl plik

@ -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");

2
sdrgui/device/devicegui.cpp
Wyświetl plik

@ -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);

1
sdrgui/feature/featuregui.cpp
Wyświetl plik

@ -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");