VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 05:02:25 -04:00
Code Issues Projects Releases Wiki Activity

Merge back to v7

Browse Source
This commit is contained in:
f4exb 2022-04-26 20:47:53 +02:00
commit 78674ead2e
8 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdrbase/settings/configuration.cpp
View File

@ -107,11 +107,6 @@ bool Configuration::deserialize(const QByteArray& data)
}
}
int Configuration::getNumberOfWorkspaces() const
{
return m_workspaceGeometries.size();
}
void Configuration::clearData()
{
m_deviceSetPresets.clear();

2
sdrbase/settings/configuration.h
View File

@ -47,7 +47,7 @@ public:
void setDescription(const QString& description) { m_description = description; }
const QString& getDescription() const { return m_description; }
int getNumberOfWorkspaces() const;
int getNumberOfWorkspaceGeometries() const { return m_workspaceGeometries.size(); }
QList<QByteArray>& getWorkspaceGeometries() { return m_workspaceGeometries; }
const QList<QByteArray>& getWorkspaceGeometries() const { return m_workspaceGeometries; }
FeatureSetPreset& getFeatureSetPreset() { return m_featureSetPreset; }

1
sdrgui/device/devicegui.cpp
View File

@ -54,6 +54,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) :
m_indexLabel->setToolTip("Device type and set 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.h
View File

@ -83,7 +83,7 @@ protected:
void mouseReleaseEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
int getAdditionalHeight() const { return 26 + 22; } // height of top and bottom bars
int getAdditionalHeight() const { return 22 + 22; }
DeviceType m_deviceType;
int m_deviceSetIndex;

20
sdrgui/gui/workspace.cpp
View File

@ -685,3 +685,23 @@ void Workspace::restoreMdiGeometry(const QByteArray& blob)
{
m_mdi->restoreGeometry(qUncompress(blob));
}
void Workspace::adjustSubWindowsAfterRestore()
{
QList<QMdiSubWindow *> subWindowList = m_mdi->subWindowList();
for (auto& subWindow : subWindowList)
{
if ((subWindow->y() >= 20) && (subWindow->y() < 40)) {
subWindow->move(subWindow->x(), subWindow->y() - 20);
}
if (qobject_cast<ChannelGUI*>(subWindow)) {
subWindow->resize(subWindow->width(), subWindow->height() - 22);
}
if (qobject_cast<FeatureGUI*>(subWindow)) {
subWindow->resize(subWindow->width(), subWindow->height() - 8);
}
}
}

1
sdrgui/gui/workspace.h
View File

@ -57,6 +57,7 @@ public:
void orderByIndex(QList<FeatureGUI *> &list);
void orderByIndex(QList<DeviceGUI *> &list);
void orderByIndex(QList<MainSpectrumGUI *> &list);
void adjustSubWindowsAfterRestore();
private:
int m_index;

2
sdrgui/mainspectrum/mainspectrumgui.cpp
View File

@ -97,7 +97,7 @@ MainSpectrumGUI::MainSpectrumGUI(GLSpectrum *spectrum, GLSpectrumGUI *spectrumGU
// m_statusLabel->setToolTip("Spectrum status");
m_layouts = new QVBoxLayout();
m_layouts->setContentsMargins(m_resizer.m_gripSize, 4, m_resizer.m_gripSize, 4);
m_layouts->setContentsMargins(m_resizer.m_gripSize, m_resizer.m_gripSize, m_resizer.m_gripSize, m_resizer.m_gripSize);
m_layouts->setSpacing(0);
m_topLayout = new QHBoxLayout();

8
sdrgui/mainwindow.cpp
View File

@ -1173,7 +1173,7 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from
qDebug("MainWindow::loadConfiguration: configuration [%s | %s] %d workspace(s) - %d device set(s) - %d feature(s)",
qPrintable(configuration->getGroup()),
qPrintable(configuration->getDescription()),
configuration->getNumberOfWorkspaces(),
configuration->getNumberOfWorkspaceGeometries(),
configuration->getDeviceSetPresets().size(),
configuration->getFeatureSetPreset().getFeatureCount()
);
@ -1210,7 +1210,7 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from
// Reconstruct
// Workspaces
for (int i = 0; i < configuration->getNumberOfWorkspaces(); i++) {
for (int i = 0; i < configuration->getNumberOfWorkspaceGeometries(); i++) {
addWorkspace();
}
@ -1321,8 +1321,10 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from
waitBox->setInformativeText("Finalizing...");
}
for (int i = 0; i < configuration->getNumberOfWorkspaces(); i++) {
for (int i = 0; i < configuration->getNumberOfWorkspaceGeometries(); i++)
{
m_workspaces[i]->restoreGeometry(configuration->getWorkspaceGeometries()[i]);
m_workspaces[i]->adjustSubWindowsAfterRestore();
}
if (waitBox)