VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-04 16:01:14 -05:00
Code Issues Projects Releases Wiki Activity

Massive UI revamping (v7): unify top bar size to 22px and correct the getAdditionaHeight methods. Part of #1209

Browse Source
This commit is contained in:
f4exb 2022-04-26 19:44:14 +02:00
parent 0387467380
commit 9be0776d32
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrgui/channel/channelgui.h
View File

@ -95,7 +95,7 @@ protected:
void mouseMoveEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; } void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
void updateIndexLabel(); void updateIndexLabel();
int getAdditionalHeight() const { return 25 + 22; } int getAdditionalHeight() const { return 22 + 22; }
void setHighlighted(bool highlighted); void setHighlighted(bool highlighted);
DeviceType m_deviceType; DeviceType m_deviceType;

1
sdrgui/device/devicegui.cpp
View File

@ -54,6 +54,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) :
m_indexLabel->setToolTip("Device type and set index"); m_indexLabel->setToolTip("Device type and set index");
m_settingsButton = new QPushButton(); m_settingsButton = new QPushButton();
m_settingsButton->setFixedSize(20, 20);
QIcon settingsIcon(":/gear.png"); QIcon settingsIcon(":/gear.png");
m_settingsButton->setIcon(settingsIcon); m_settingsButton->setIcon(settingsIcon);
m_settingsButton->setToolTip("Common settings"); m_settingsButton->setToolTip("Common settings");

2
sdrgui/device/devicegui.h
View File

@ -83,7 +83,7 @@ protected:
void mouseReleaseEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; } void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
int getAdditionalHeight() const { return 25 + 22; } int getAdditionalHeight() const { return 22 + 22; }
DeviceType m_deviceType; DeviceType m_deviceType;
int m_deviceSetIndex; int m_deviceSetIndex;

2
sdrgui/feature/featuregui.h
View File

@ -72,7 +72,7 @@ protected:
void mouseReleaseEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override;
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; } void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
int getAdditionalHeight() const { return 25 + 22; } int getAdditionalHeight() const { return 22 + 22; }
int m_featureIndex; int m_featureIndex;
QString m_helpURL; QString m_helpURL;

2
sdrgui/mainspectrum/mainspectrumgui.cpp
View File

@ -97,7 +97,7 @@ MainSpectrumGUI::MainSpectrumGUI(GLSpectrum *spectrum, GLSpectrumGUI *spectrumGU
// m_statusLabel->setToolTip("Spectrum status"); // m_statusLabel->setToolTip("Spectrum status");
m_layouts = new QVBoxLayout(); 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_layouts->setSpacing(0);
m_topLayout = new QHBoxLayout(); m_topLayout = new QHBoxLayout();