VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-14 06:45:21 -04:00
Code Issues Projects Releases Wiki Activity

Arrange rollups after restore geometry to mitigate issue #1474

Browse Source
This commit is contained in:
f4exb 2022-11-03 19:00:13 +01:00
parent 301ab136f2
commit 3ab767a426
13 changed files with 107 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/channelrx/filesink/filesinkgui.ui
View File

@ -43,7 +43,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>550</width> <width>550</width>
<height>100</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -562,12 +562,23 @@
</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>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>GLSpectrum</class> <class>GLSpectrum</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -580,17 +591,6 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.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>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"/>

28
plugins/channelrx/noisefigure/noisefiguregui.ui
View File

@ -710,6 +710,12 @@
</property> </property>
<item> <item>
<widget class="QTableWidget" name="results"> <widget class="QTableWidget" name="results">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Received packets</string> <string>Received packets</string>
</property> </property>
@ -786,7 +792,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>200</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -889,12 +895,22 @@
</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>QChartView</class>
<extends>QGraphicsView</extends>
<header>QtCharts</header>
</customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -907,16 +923,6 @@
<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>
<class>QChartView</class>
<extends>QGraphicsView</extends>
<header>QtCharts</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>deltaFrequency</tabstop> <tabstop>deltaFrequency</tabstop>

16
plugins/channelrx/radioastronomy/radioastronomygui.ui
View File

@ -1743,7 +1743,7 @@ This should be 2.73K when pointing at the sky</string>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>320</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -3419,7 +3419,7 @@ This should be close to the expected difference in power between hot and cold ca
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>230</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -5156,12 +5156,6 @@ This should be close to the expected difference in power between hot and cold ca
<header>gui/rollupcontents.h</header> <header>gui/rollupcontents.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>QChartView</class> <class>QChartView</class>
<extends>QGraphicsView</extends> <extends>QGraphicsView</extends>
@ -5173,6 +5167,12 @@ This should be close to the expected difference in power between hot and cold ca
<header>gui/wrappingdatetimeedit.h</header> <header>gui/wrappingdatetimeedit.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>powerMean</tabstop> <tabstop>powerMean</tabstop>

4
plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui
View File

@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>552</width> <width>552</width>
<height>102</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -43,7 +43,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>550</width> <width>550</width>
<height>100</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

28
plugins/channeltx/modais/aismodgui.ui
View File

@ -1022,7 +1022,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>200</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -1177,6 +1177,11 @@
</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>
@ -1184,15 +1189,9 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>GLSpectrum</class> <class>ValueDialZ</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/glspectrum.h</header> <header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>GLSpectrumGUI</class>
<extends>QWidget</extends>
<header>gui/glspectrumgui.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
@ -1208,15 +1207,16 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ValueDialZ</class> <class>GLSpectrum</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/valuedialz.h</header> <header>gui/glspectrum.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>GLSpectrumGUI</class>
<extends>QToolButton</extends> <extends>QWidget</extends>
<header>gui/buttonswitch.h</header> <header>gui/glspectrumgui.h</header>
<container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>LevelMeterVU</class> <class>LevelMeterVU</class>

24
plugins/channeltx/modfreedv/freedvmodgui.ui
View File

@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>390</width> <width>390</width>
<height>0</height> <height>643</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -729,12 +729,23 @@
</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>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>GLSpectrum</class> <class>GLSpectrum</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -747,17 +758,6 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.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>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterVU</class> <class>LevelMeterVU</class>
<extends>QWidget</extends> <extends>QWidget</extends>

26
plugins/channeltx/modssb/ssbmodgui.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>414</width> <width>414</width>
<height>331</height> <height>627</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>414</width> <width>414</width>
<height>0</height> <height>627</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -1262,12 +1262,23 @@
</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>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>GLSpectrum</class> <class>GLSpectrum</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -1280,17 +1291,6 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.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>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterVU</class> <class>LevelMeterVU</class>
<extends>QWidget</extends> <extends>QWidget</extends>

26
plugins/channeltx/udpsource/udpsourcegui.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>400</height> <height>393</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,7 +19,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>420</width> <width>420</width>
<height>0</height> <height>393</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -1079,12 +1079,23 @@
</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>ValueDialZ</class>
<extends>QWidget</extends>
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>GLSpectrum</class> <class>GLSpectrum</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -1097,17 +1108,6 @@
<header>gui/glspectrumgui.h</header> <header>gui/glspectrumgui.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>ButtonSwitch</class>
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget> <customwidget>
<class>LevelMeterVU</class> <class>LevelMeterVU</class>
<extends>QWidget</extends> <extends>QWidget</extends>

10
plugins/feature/satellitetracker/satellitetrackergui.ui
View File

@ -41,10 +41,16 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>301</width> <width>320</width>
<height>141</height> <height>141</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>320</width>
<height>0</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
@ -407,7 +413,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>200</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

2
plugins/feature/startracker/startrackergui.ui
View File

@ -629,7 +629,7 @@ This can be specified as a decimal (E.g. 34.23) or in degrees, minutes and secon
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>200</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

2
plugins/feature/vorlocalizer/vorlocalizergui.ui
View File

@ -327,7 +327,7 @@ QToolTip{background-color: white; color: black;}</string>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>145</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

4
sdrgui/device/deviceuiset.cpp
View File

@ -27,6 +27,7 @@
#include "gui/glspectrumgui.h" #include "gui/glspectrumgui.h"
// #include "gui/channelwindow.h" // #include "gui/channelwindow.h"
#include "gui/workspace.h" #include "gui/workspace.h"
#include "gui/rollupcontents.h"
#include "device/devicegui.h" #include "device/devicegui.h"
#include "device/deviceset.h" #include "device/deviceset.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
@ -337,6 +338,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
} }
rxChannelGUI->restoreGeometry(rxChannelGUI->getGeometryBytes()); rxChannelGUI->restoreGeometry(rxChannelGUI->getGeometryBytes());
rxChannelGUI->getRollupContents()->arrangeRollups();
rxChannelGUI->setDeviceType(ChannelGUI::DeviceRx); rxChannelGUI->setDeviceType(ChannelGUI::DeviceRx);
rxChannelGUI->setDeviceSetIndex(m_deviceSetIndex); rxChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
rxChannelGUI->setIndex(channelAPI->getIndexInDeviceSet()); rxChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
@ -465,6 +467,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
} }
txChannelGUI->restoreGeometry(txChannelGUI->getGeometryBytes()); txChannelGUI->restoreGeometry(txChannelGUI->getGeometryBytes());
txChannelGUI->getRollupContents()->arrangeRollups();
txChannelGUI->setDeviceType(ChannelGUI::DeviceTx); txChannelGUI->setDeviceType(ChannelGUI::DeviceTx);
txChannelGUI->setDeviceSetIndex(m_deviceSetIndex); txChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
txChannelGUI->setIndex(channelAPI->getIndexInDeviceSet()); txChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
@ -638,6 +641,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
} }
channelGUI->restoreGeometry(channelGUI->getGeometryBytes()); channelGUI->restoreGeometry(channelGUI->getGeometryBytes());
channelGUI->getRollupContents()->arrangeRollups();
channelGUI->setDeviceType(ChannelGUI::DeviceMIMO); channelGUI->setDeviceType(ChannelGUI::DeviceMIMO);
channelGUI->setDeviceSetIndex(m_deviceSetIndex); channelGUI->setDeviceSetIndex(m_deviceSetIndex);
channelGUI->setIndex(channelAPI->getIndexInDeviceSet()); channelGUI->setIndex(channelAPI->getIndexInDeviceSet());

2
sdrgui/feature/featureuiset.cpp
View File

@ -199,12 +199,14 @@ void FeatureUISet::loadFeatureSetSettings(
{ {
(*workspaces)[originalWorkspaceIndex]->addToMdiArea((QMdiSubWindow*) featureGUI); (*workspaces)[originalWorkspaceIndex]->addToMdiArea((QMdiSubWindow*) featureGUI);
featureGUI->restoreGeometry(featureGUI->getGeometryBytes()); featureGUI->restoreGeometry(featureGUI->getGeometryBytes());
featureGUI->getRollupContents()->arrangeRollups();
} }
else if (currentWorkspace) // restore in current workspace else if (currentWorkspace) // restore in current workspace
{ {
featureGUI->setWorkspaceIndex(currentWorkspace->getIndex()); featureGUI->setWorkspaceIndex(currentWorkspace->getIndex());
currentWorkspace->addToMdiArea((QMdiSubWindow*) featureGUI); currentWorkspace->addToMdiArea((QMdiSubWindow*) featureGUI);
featureGUI->restoreGeometry(featureGUI->getGeometryBytes()); featureGUI->restoreGeometry(featureGUI->getGeometryBytes());
featureGUI->getRollupContents()->arrangeRollups();
} }
} }
} }