From 49e699dfd5c422c87cf6139a0fe799d95afe59d2 Mon Sep 17 00:00:00 2001 From: Andrei Popa Date: Mon, 25 Nov 2024 12:18:52 +0200 Subject: [PATCH] plugins / swiot: fix faults buttons - remove m2k.qss comments Signed-off-by: Andrei Popa --- gui/style/qss/generic/m2k.qss | 35 ++--------------------- plugins/swiot/src/faults/faultsdevice.cpp | 6 ++-- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/gui/style/qss/generic/m2k.qss b/gui/style/qss/generic/m2k.qss index b4f54e68ad..f8951a40ac 100644 --- a/gui/style/qss/generic/m2k.qss +++ b/gui/style/qss/generic/m2k.qss @@ -84,11 +84,6 @@ scopy--m2k--DMM #widget_2, QMainWindow > .QWidget > .scopy--MenuHAnim { background-color: none; } -/* -QwtPlot, -QwtPolarPlot, -pv--view--Viewport, -*/ QWidget[plot_container="true"] { background-color: &background_subtle&; } @@ -111,15 +106,6 @@ QwtThermo { color: &content_subtle&; font-size: 26px; } -/* -scopy--BufferPreviewer { - border: 1px solid &interactive_primary_idle&; - alternate-background-color: &interactive_primary_disabled&; - selection-background-color: &background_subtle&; - selection-color: &interactive_accent_idle&; - color: &content_default&; -} -*/ QDial { background-color: &background_subtle&; color: &interactive_primary_idle&; @@ -130,26 +116,11 @@ QTabWidget::tab-bar { QTabWidget::pane { border-top: 0px; } -/* -QTabBar { qproperty-drawBase: 0; } + QTabBar::tab { - min-width: 100px; - min-height: 32px; - padding-bottom: 5px; - font: normal; -} -QTabBar::tab:selected { - color: &content_default&; - border-bottom: 2px solid &interactive_accent_idle&; - margin-top: 0px; -} -QTabBar::tab:!selected { - border-bottom: 2px solid &interactive_subtle_disabled&; -} -QTabBar::scroller { - width: 25px; + min-width: &unit_5&; } -*/ + QRadioButton { color: &content_default&; spacing: 12px; diff --git a/plugins/swiot/src/faults/faultsdevice.cpp b/plugins/swiot/src/faults/faultsdevice.cpp index be849d0259..78cf615160 100644 --- a/plugins/swiot/src/faults/faultsdevice.cpp +++ b/plugins/swiot/src/faults/faultsdevice.cpp @@ -296,15 +296,13 @@ QWidget *FaultsDevice::createTopWidget(QWidget *parent) m_resetBtn = new QPushButton(w); StyleHelper::BasicButton(m_resetBtn); - m_resetBtn->setFixedWidth(110); m_resetBtn->setCheckable(false); - m_resetBtn->setText("RESET\nSTORED"); + m_resetBtn->setText("Reset stored"); m_clearBtn = new QPushButton(w); StyleHelper::BasicButton(m_clearBtn); - m_clearBtn->setFixedWidth(110); m_clearBtn->setCheckable(false); - m_clearBtn->setText("CLEAR\nSELECTION"); + m_clearBtn->setText("Clear selection"); layout->addWidget(deviceNameLabel); layout->addWidget(m_registerNoLineEdit);