1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 07:07:48 -04:00

Massive UI revamping (v7): fixed widget size handling: MIMO and Rx channels. Part of #1209

This commit is contained in:
f4exb 2022-04-22 14:08:10 +02:00
parent 90386842ca
commit 3b35e22328
38 changed files with 503 additions and 203 deletions

View File

@ -16,6 +16,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QLocale> #include <QLocale>
#include <QResizeEvent>
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.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) bool BeamSteeringCWModGUI::handleMessage(const Message& message)
{ {
if (BeamSteeringCWMod::MsgBasebandNotification::match(message)) if (BeamSteeringCWMod::MsgBasebandNotification::match(message))
@ -97,6 +104,7 @@ BeamSteeringCWModGUI::BeamSteeringCWModGUI(PluginAPI* pluginAPI, DeviceUISet *de
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -60,6 +60,9 @@ public:
virtual int getStreamIndex() const { return -1; } virtual int getStreamIndex() const { return -1; }
virtual void setStreamIndex(int streamIndex) { (void) streamIndex; } virtual void setStreamIndex(int streamIndex) { (void) streamIndex; }
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::BeamSteeringCWModGUI* ui; Ui::BeamSteeringCWModGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -6,20 +6,26 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>362</width>
<height>100</height> <height>95</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>360</width> <width>362</width>
<height>100</height> <height>95</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>362</width>
<height>95</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -34,8 +40,8 @@
<widget class="QWidget" name="settingsContainer" native="true"> <widget class="QWidget" name="settingsContainer" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>2</x>
<y>0</y> <y>2</y>
<width>358</width> <width>358</width>
<height>91</height> <height>91</height>
</rect> </rect>

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>388</width> <width>382</width>
<height>446</height> <height>500</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -18,8 +18,8 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>352</width> <width>382</width>
<height>0</height> <height>500</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -39,7 +39,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>390</width> <width>380</width>
<height>151</height> <height>151</height>
</rect> </rect>
</property> </property>
@ -634,7 +634,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>210</y> <y>210</y>
<width>391</width> <width>380</width>
<height>171</height> <height>171</height>
</rect> </rect>
</property> </property>
@ -719,9 +719,9 @@
<widget class="QWidget" name="scopeContainer" native="true"> <widget class="QWidget" name="scopeContainer" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>0</x>
<y>400</y> <y>400</y>
<width>351</width> <width>380</width>
<height>341</height> <height>341</height>
</rect> </rect>
</property> </property>
@ -916,18 +916,18 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/buttonswitch.h</header> <header>gui/buttonswitch.h</header>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -18,6 +18,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QDebug> #include <QDebug>
#include <QResizeEvent>
#include "amdemodgui.h" #include "amdemodgui.h"
#include "amdemodssbdialog.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) bool AMDemodGUI::handleMessage(const Message& message)
{ {
if (AMDemod::MsgConfigureAMDemod::match(message)) if (AMDemod::MsgConfigureAMDemod::match(message))
@ -260,6 +267,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demodam/readme.md"; m_helpURL = "plugins/channelrx/demodam/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -47,6 +47,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::AMDemodGUI* ui; Ui::AMDemodGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>360</width> <width>360</width>
<height>0</height> <height>153</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>153</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -432,18 +438,18 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/buttonswitch.h</header> <header>gui/buttonswitch.h</header>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -18,6 +18,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QResizeEvent>
#include "atvdemodgui.h" #include "atvdemodgui.h"
@ -76,6 +77,12 @@ bool ATVDemodGUI::deserialize(const QByteArray& data)
} }
} }
void ATVDemodGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
void ATVDemodGUI::displaySettings() void ATVDemodGUI::displaySettings()
{ {
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
@ -269,6 +276,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
m_basebandSampleRate(48000) m_basebandSampleRate(48000)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demodatv/readme.md"; m_helpURL = "plugins/channelrx/demodatv/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -66,6 +66,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::ATVDemodGUI* ui; Ui::ATVDemodGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -7,11 +7,11 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>700</width> <width>700</width>
<height>699</height> <height>675</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>700</width> <width>700</width>
<height>500</height> <height>675</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>700</width>
<height>675</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -37,7 +43,7 @@
<widget class="QWidget" name="layoutWidget 1"> <widget class="QWidget" name="layoutWidget 1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>0</x>
<y>10</y> <y>10</y>
<width>681</width> <width>681</width>
<height>83</height> <height>83</height>
@ -572,7 +578,7 @@
<widget class="QWidget" name="layoutWidget_3"> <widget class="QWidget" name="layoutWidget_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>0</x>
<y>570</y> <y>570</y>
<width>681</width> <width>681</width>
<height>104</height> <height>104</height>
@ -1020,7 +1026,7 @@
<widget class="QTabWidget" name="screenTabWidget"> <widget class="QTabWidget" name="screenTabWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>2</x>
<y>100</y> <y>100</y>
<width>680</width> <width>680</width>
<height>461</height> <height>461</height>
@ -1154,17 +1160,23 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>RollupContents</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/rollupcontents.h</header> <header>gui/rollupcontents.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>GLScope</class> <class>GLScope</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -1177,12 +1189,6 @@
<header>gui/glscopegui.h</header> <header>gui/glscopegui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>TVScreenAnalog</class> <class>TVScreenAnalog</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>642</width> <width>642</width>
<height>0</height> <height>670</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -508,6 +508,12 @@
<height>151</height> <height>151</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Baseband Spectrum</string> <string>Baseband Spectrum</string>
</property> </property>
@ -529,6 +535,12 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
@ -538,7 +550,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true"/> <widget class="GLSpectrumGUI" name="spectrumGUI" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -1883,21 +1902,15 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/buttonswitch.h</header> <header>gui/buttonswitch.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/levelmeter.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
@ -1913,9 +1926,15 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>LevelMeterSignalDB</class>
<extends>QWidget</extends>
<header>gui/levelmeter.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -10,6 +10,12 @@
<height>680</height> <height>680</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>532</width> <width>532</width>
@ -1180,6 +1186,12 @@
<height>260</height> <height>260</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>373</width> <width>373</width>
@ -1207,6 +1219,12 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1223,9 +1241,9 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>RollupContents</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/rollupcontents.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
@ -1241,9 +1259,9 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/rollupcontents.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -20,6 +20,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QMediaMetaData> #include <QMediaMetaData>
#include <QResizeEvent>
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "dsp/dspengine.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) bool DATVDemodGUI::handleMessage(const Message& message)
{ {
if (DATVDemodReport::MsgReportModcodCstlnChange::match(message)) if (DATVDemodReport::MsgReportModcodCstlnChange::match(message))
@ -214,6 +221,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
m_cstlnSetByModcod(false) m_cstlnSetByModcod(false)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demoddatv/readme.md"; m_helpURL = "plugins/channelrx/demoddatv/readme.md";
ui->screenTV->setColor(true); ui->screenTV->setColor(true);

View File

@ -65,6 +65,9 @@ public:
static const char* const m_strChannelID; static const char* const m_strChannelID;
protected:
void resizeEvent(QResizeEvent* size);
private slots: private slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>530</width> <width>530</width>
<height>442</height> <height>476</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
@ -1394,10 +1394,9 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>RollupContents</class> <class>ButtonSwitch</class>
<extends>QWidget</extends> <extends>QToolButton</extends>
<header>gui/rollupcontents.h</header> <header>gui/buttonswitch.h</header>
<container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
@ -1405,17 +1404,18 @@
<header>gui/valuedialz.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/levelmeter.h</header> <header>gui/levelmeter.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>DATVideoRender</class> <class>DATVideoRender</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -39,6 +39,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QDebug> #include <QDebug>
#include <QResizeEvent>
#include <complex> #include <complex>
@ -82,6 +83,12 @@ bool DSDDemodGUI::deserialize(const QByteArray& data)
} }
} }
void DSDDemodGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool DSDDemodGUI::handleMessage(const Message& message) bool DSDDemodGUI::handleMessage(const Message& message)
{ {
if (DSDDemod::MsgConfigureDSDDemod::match(message)) if (DSDDemod::MsgConfigureDSDDemod::match(message))
@ -337,6 +344,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_dsdStatusTextDialog(0) m_dsdStatusTextDialog(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demoddsd/readme.md"; m_helpURL = "plugins/channelrx/demoddsd/readme.md";
ui->screenTV->setColor(true); ui->screenTV->setColor(true);

View File

@ -68,6 +68,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
// typedef enum // typedef enum
// { // {

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>650</width> <width>650</width>
<height>0</height> <height>392</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>650</width>
<height>392</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -1231,29 +1237,29 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>RollupContents</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/rollupcontents.h</header> <header>gui/rollupcontents.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/levelmeter.h</header> <header>gui/levelmeter.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>TVScreen</class> <class>TVScreen</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -2,6 +2,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QDebug> #include <QDebug>
#include <QResizeEvent>
#include "ui_nfmdemodgui.h" #include "ui_nfmdemodgui.h"
#include "plugin/pluginapi.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) bool NFMDemodGUI::handleMessage(const Message& message)
{ {
if (NFMDemodReport::MsgReportCTCSSFreq::match(message)) if (NFMDemodReport::MsgReportCTCSSFreq::match(message))
@ -360,6 +367,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demodnfm/readme.md"; m_helpURL = "plugins/channelrx/demodnfm/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -46,6 +46,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::NFMDemodGUI* ui; Ui::NFMDemodGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>360</width> <width>360</width>
<height>0</height> <height>197</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>360</width>
<height>197</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -783,18 +789,18 @@
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/buttonswitch.h</header> <header>gui/buttonswitch.h</header>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -19,6 +19,7 @@
#include <limits> #include <limits>
#include <QDebug> #include <QDebug>
#include <QResizeEvent>
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "dsp/dspengine.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) bool VORDemodSCGUI::handleMessage(const Message& message)
{ {
if (VORDemodSC::MsgConfigureVORDemod::match(message)) if (VORDemodSC::MsgConfigureVORDemod::match(message))
@ -291,6 +298,7 @@ VORDemodSCGUI::VORDemodSCGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demodvorsc/readme.md"; m_helpURL = "plugins/channelrx/demodvorsc/readme.md";

View File

@ -64,6 +64,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::VORDemodSCGUI* ui; Ui::VORDemodSCGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>402</width> <width>352</width>
<height>189</height> <height>110</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -22,6 +22,12 @@
<height>110</height> <height>110</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>352</width>
<height>110</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
@ -613,6 +619,12 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>RollupContents</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -625,19 +637,13 @@
<header>gui/levelmeter.h</header> <header>gui/levelmeter.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>audioMute</tabstop> <tabstop>audioMute</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="icons.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -55,6 +55,12 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
} }
} }
void WFMDemodGUI::resizeEvent(QResizeEvent* size)
{
adjustSize();
size->accept();
}
bool WFMDemodGUI::handleMessage(const Message& message) bool WFMDemodGUI::handleMessage(const Message& message)
{ {
if (WFMDemod::MsgConfigureWFMDemod::match(message)) if (WFMDemod::MsgConfigureWFMDemod::match(message))
@ -219,6 +225,7 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_audioSampleRate(-1) m_audioSampleRate(-1)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/demodwfm/readme.md"; m_helpURL = "plugins/channelrx/demodwfm/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -44,6 +44,9 @@ public slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::WFMDemodGUI* ui; Ui::WFMDemodGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -10,16 +10,22 @@
<height>170</height> <height>170</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>302</width> <width>302</width>
<height>0</height> <height>170</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>302</width> <width>302</width>
<height>16777215</height> <height>170</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -435,6 +441,18 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>RollupContents</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -447,18 +465,6 @@
<header>gui/levelmeter.h</header> <header>gui/levelmeter.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>

View File

@ -10,6 +10,12 @@
<height>458</height> <height>458</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>552</width> <width>552</width>
@ -508,7 +514,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="verticalLayoutWidget"> <widget class="QWidget" name="verticalWidget" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -517,8 +523,11 @@
<height>351</height> <height>351</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="sizePolicy">
<string>Channel Spectrum</string> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="SpectrumLayout"> <layout class="QVBoxLayout" name="SpectrumLayout">
<property name="spacing"> <property name="spacing">
@ -526,6 +535,12 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -547,12 +562,6 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
@ -576,6 +585,12 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>

View File

@ -7,11 +7,11 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>327</height> <height>360</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>400</width> <width>400</width>
<height>100</height> <height>360</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -754,6 +754,12 @@
<height>161</height> <height>161</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Channel Spectrum</string> <string>Channel Spectrum</string>
</property> </property>
@ -775,6 +781,18 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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>390</width>
<height>200</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
@ -790,23 +808,11 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/buttonswitch.h</header> <header>gui/buttonswitch.h</header>
</customwidget> </customwidget>
<customwidget>
<class>LevelMeterSignalDB</class>
<extends>QWidget</extends>
<header>gui/levelmeter.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -825,6 +831,18 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>LevelMeterSignalDB</class>
<extends>QWidget</extends>
<header>gui/levelmeter.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>

View File

@ -16,6 +16,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QLocale> #include <QLocale>
#include <QResizeEvent>
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.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) bool LocalSinkGUI::handleMessage(const Message& message)
{ {
if (DSPSignalNotification::match(message)) if (DSPSignalNotification::match(message))
@ -106,6 +113,7 @@ LocalSinkGUI::LocalSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/localsink/readme.md"; m_helpURL = "plugins/channelrx/localsink/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -60,6 +60,9 @@ public:
virtual int getStreamIndex() const { return m_settings.m_streamIndex; } virtual int getStreamIndex() const { return m_settings.m_streamIndex; }
virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; } virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; }
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::LocalSinkGUI* ui; Ui::LocalSinkGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -6,26 +6,26 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>320</width> <width>303</width>
<height>110</height> <height>100</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>320</width> <width>303</width>
<height>100</height> <height>100</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>320</width> <width>303</width>
<height>16777215</height> <height>100</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -40,8 +40,8 @@
<widget class="QWidget" name="settingsContainer" native="true"> <widget class="QWidget" name="settingsContainer" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>2</x>
<y>10</y> <y>2</y>
<width>301</width> <width>301</width>
<height>91</height> <height>91</height>
</rect> </rect>
@ -329,17 +329,17 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>RollupContents</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/rollupcontents.h</header> <header>gui/rollupcontents.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -595,6 +595,12 @@
<height>341</height> <height>341</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Waveforms</string> <string>Waveforms</string>
</property> </property>
@ -616,6 +622,12 @@
</property> </property>
<item> <item>
<widget class="GLScope" name="glScope" native="true"> <widget class="GLScope" name="glScope" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
@ -637,18 +649,18 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterSignalDB</class> <class>LevelMeterSignalDB</class>
<extends>QWidget</extends> <extends>QWidget</extends>

View File

@ -16,6 +16,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QLocale> #include <QLocale>
#include <QResizeEvent>
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.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) bool RemoteSinkGUI::handleMessage(const Message& message)
{ {
if (RemoteSink::MsgConfigureRemoteSink::match(message)) if (RemoteSink::MsgConfigureRemoteSink::match(message))
@ -102,6 +109,7 @@ RemoteSinkGUI::RemoteSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas
m_tickCount(0) m_tickCount(0)
{ {
ui->setupUi(getRollupContents()); ui->setupUi(getRollupContents());
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
getRollupContents()->arrangeRollups(); getRollupContents()->arrangeRollups();
m_helpURL = "plugins/channelrx/remotesink/readme.md"; m_helpURL = "plugins/channelrx/remotesink/readme.md";
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);

View File

@ -60,6 +60,9 @@ public:
virtual int getStreamIndex() const { return m_settings.m_streamIndex; } virtual int getStreamIndex() const { return m_settings.m_streamIndex; }
virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; } virtual void setStreamIndex(int streamIndex) { m_settings.m_streamIndex = streamIndex; }
protected:
void resizeEvent(QResizeEvent* size);
private: private:
Ui::RemoteSinkGUI* ui; Ui::RemoteSinkGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;

View File

@ -6,26 +6,26 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>320</width> <width>304</width>
<height>157</height> <height>143</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>320</width> <width>304</width>
<height>100</height> <height>143</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>320</width> <width>304</width>
<height>16777215</height> <height>143</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -40,8 +40,8 @@
<widget class="QWidget" name="settingsContainer" native="true"> <widget class="QWidget" name="settingsContainer" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>2</x>
<y>10</y> <y>2</y>
<width>301</width> <width>301</width>
<height>141</height> <height>141</height>
</rect> </rect>

View File

@ -10,6 +10,12 @@
<height>458</height> <height>458</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>552</width> <width>552</width>
@ -34,6 +40,12 @@
<height>100</height> <height>100</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>550</width> <width>550</width>
@ -505,7 +517,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="verticalLayoutWidget"> <widget class="QWidget" name="verticalWidget" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -514,8 +526,11 @@
<height>351</height> <height>351</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="sizePolicy">
<string>Channel Spectrum</string> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="SpectrumLayout"> <layout class="QVBoxLayout" name="SpectrumLayout">
<property name="spacing"> <property name="spacing">
@ -523,6 +538,12 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -544,12 +565,6 @@
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>
@ -573,6 +588,12 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RollupContents</class>
<extends>QWidget</extends>
<header>gui/rollupcontents.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>

View File

@ -6,22 +6,22 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>383</width> <width>360</width>
<height>355</height> <height>355</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>342</width> <width>360</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
@ -34,15 +34,15 @@
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>2</x> <x>0</x>
<y>2</y> <y>2</y>
<width>380</width> <width>356</width>
<height>142</height> <height>142</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>380</width> <width>356</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -183,6 +183,15 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>26</red>
<green>26</green>
<blue>26</blue>
</color>
</brush>
</colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="Text"> <colorrole role="Text">
@ -203,6 +212,15 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>26</red>
<green>26</green>
<blue>26</blue>
</color>
</brush>
</colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="Text"> <colorrole role="Text">
@ -223,11 +241,21 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>26</red>
<green>26</green>
<blue>26</blue>
</color>
</brush>
</colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
</font> </font>
</property> </property>
@ -819,12 +847,24 @@
<widget class="QWidget" name="spectrumBox" native="true"> <widget class="QWidget" name="spectrumBox" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>15</x> <x>0</x>
<y>160</y> <y>160</y>
<width>231</width> <width>356</width>
<height>156</height> <height>156</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>356</width>
<height>0</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Channel Spectrum</string> <string>Channel Spectrum</string>
</property> </property>
@ -846,6 +886,12 @@
</property> </property>
<item> <item>
<widget class="GLSpectrum" name="glSpectrum" native="true"> <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="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
@ -862,9 +908,14 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>RollupContents</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/rollupcontents.h</header> <header>gui/valuedialz.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
@ -880,16 +931,11 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>RollupContents</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/rollupcontents.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>