Skip to content

Commit

Permalink
plugins / swiot: fix faults buttons
Browse files Browse the repository at this point in the history
- remove m2k.qss comments

Signed-off-by: Andrei Popa <[email protected]>
  • Loading branch information
andrei47w committed Nov 25, 2024
1 parent 1094454 commit 49e699d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 36 deletions.
35 changes: 3 additions & 32 deletions gui/style/qss/generic/m2k.qss
Original file line number Diff line number Diff line change
Expand Up @@ -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&;
}
Expand All @@ -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&;
Expand All @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions plugins/swiot/src/faults/faultsdevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 49e699d

Please sign in to comment.