Skip to content

Commit 35d2380

Browse files
andrei47wRainDalena
authored andcommitted
plugins / swiot: fix faults buttons
- remove m2k.qss comments Signed-off-by: Andrei Popa <[email protected]> Signed-off-by: JDalenaJ <[email protected]>
1 parent 32064d9 commit 35d2380

File tree

2 files changed

+5
-36
lines changed

2 files changed

+5
-36
lines changed

gui/style/qss/generic/m2k.qss

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ scopy--m2k--DMM #widget_2,
7575
QMainWindow > .QWidget > .scopy--MenuHAnim {
7676
background-color: none;
7777
}
78-
/*
79-
QwtPlot,
80-
QwtPolarPlot,
81-
pv--view--Viewport,
82-
*/
8378
QWidget[plot_container="true"] {
8479
background-color: &background_subtle&;
8580
}
@@ -102,15 +97,6 @@ QwtThermo {
10297
color: &content_subtle&;
10398
font-size: 26px;
10499
}
105-
/*
106-
scopy--BufferPreviewer {
107-
border: 1px solid &interactive_primary_idle&;
108-
alternate-background-color: &interactive_primary_disabled&;
109-
selection-background-color: &background_subtle&;
110-
selection-color: &interactive_accent_idle&;
111-
color: &content_default&;
112-
}
113-
*/
114100
QDial {
115101
background-color: &background_subtle&;
116102
color: &interactive_primary_idle&;
@@ -121,26 +107,11 @@ QTabWidget::tab-bar {
121107
QTabWidget::pane {
122108
border-top: 0px;
123109
}
124-
/*
125-
QTabBar { qproperty-drawBase: 0; }
110+
126111
QTabBar::tab {
127-
min-width: 100px;
128-
min-height: 32px;
129-
padding-bottom: 5px;
130-
font: normal;
131-
}
132-
QTabBar::tab:selected {
133-
color: &content_default&;
134-
border-bottom: 2px solid &interactive_accent_idle&;
135-
margin-top: 0px;
136-
}
137-
QTabBar::tab:!selected {
138-
border-bottom: 2px solid &interactive_subtle_disabled&;
139-
}
140-
QTabBar::scroller {
141-
width: 25px;
112+
min-width: &unit_5&;
142113
}
143-
*/
114+
144115
QRadioButton {
145116
color: &content_default&;
146117
spacing: 12px;

plugins/swiot/src/faults/faultsdevice.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,13 @@ QWidget *FaultsDevice::createTopWidget(QWidget *parent)
296296

297297
m_resetBtn = new QPushButton(w);
298298
StyleHelper::BasicButton(m_resetBtn);
299-
m_resetBtn->setFixedWidth(110);
300299
m_resetBtn->setCheckable(false);
301-
m_resetBtn->setText("RESET\nSTORED");
300+
m_resetBtn->setText("Reset stored");
302301

303302
m_clearBtn = new QPushButton(w);
304303
StyleHelper::BasicButton(m_clearBtn);
305-
m_clearBtn->setFixedWidth(110);
306304
m_clearBtn->setCheckable(false);
307-
m_clearBtn->setText("CLEAR\nSELECTION");
305+
m_clearBtn->setText("Clear selection");
308306

309307
layout->addWidget(deviceNameLabel);
310308
layout->addWidget(m_registerNoLineEdit);

0 commit comments

Comments
 (0)