From a04ee17fc47cd28d1097386bc908ce3d09c3be78 Mon Sep 17 00:00:00 2001
From: Akashdeep Dhar
Date: Dec 25 2021 17:30:42 +0000
Subject: Fix theming for the CPU times window
Signed-off-by: Akashdeep Dhar
---
diff --git a/obserware/assets/uifiles/cputwdgt.ui b/obserware/assets/uifiles/cputwdgt.ui
index 7196f44..9576187 100644
--- a/obserware/assets/uifiles/cputwdgt.ui
+++ b/obserware/assets/uifiles/cputwdgt.ui
@@ -31,6 +31,9 @@
Form
+
+ background: transparent;
+
@@ -59,8 +62,7 @@
- font: 15pt "JetBrains Mono";
-color: #008080;
+ font: 15pt "JetBrains Mono";
000%
@@ -135,8 +137,7 @@ color: #008080;
- font: 15pt "JetBrains Mono";
-color: #008080;
+ font: 15pt "JetBrains Mono";
QFrame::NoFrame
@@ -197,7 +198,7 @@ color: #008080;
65
5
- 3
+ 1
240
@@ -209,16 +210,19 @@ color: #008080;
- 3
+ 1
240
- 3
+ 1
240
+
+ border: 1px solid #808080;
+
Qt::Vertical
@@ -261,7 +265,7 @@ color: #008080;
font: 10pt "Inter";
- Executing normal processes in user mode: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Executing normal processes in user mode:</span> TTTTTs (XXX%)</p></body></html>
@@ -302,7 +306,7 @@ color: #008080;
font: 10pt "Inter";
- Executing prioritized processes in user mode: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Executing prioritized processes in user mode:</span> TTTTTs (XXX%)</p></body></html>
@@ -343,7 +347,7 @@ color: #008080;
font: 10pt "Inter";
- Executing processes in kernel mode: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Executing processes in kernel mode:</span> TTTTTs (XXX%)</p></body></html>
@@ -384,7 +388,7 @@ color: #008080;
font: 10pt "Inter";
- Doing absolutely nothing: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Doing absolutely nothing:</span> TTTTTs (XXX%)</p></body></html>
@@ -425,7 +429,7 @@ color: #008080;
font: 10pt "Inter";
- Waiting for I/O operations to complete: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Waiting for I/O operations to complete:</span> TTTTTs (XXX%)</p></body></html>
@@ -466,7 +470,7 @@ color: #008080;
font: 10pt "Inter";
- Servicing hardware interrupts: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Servicing hardware interrupts:</span> TTTTTs (XXX%)</p></body></html>
@@ -507,7 +511,7 @@ color: #008080;
font: 10pt "Inter";
- Servicing software interrupts: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Servicing software interrupts:</span> TTTTTs (XXX%)</p></body></html>
@@ -548,7 +552,7 @@ color: #008080;
font: 10pt "Inter";
- Running other OSes in a virtualized environment: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Running other OSes in a virtualized environment:</span> TTTTTs (XXX%)</p></body></html>
@@ -589,7 +593,7 @@ color: #008080;
font: 10pt "Inter";
- Running a normal virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Running a normal virtual CPU for guest OS on Linux kernel:</span> TTTTTs (XXX%)</p></body></html>
@@ -630,7 +634,7 @@ color: #008080;
font: 10pt "Inter";
- Running a prioritized virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)
+ <html><head/><body><p><span style=" font-weight:700;">Running a prioritized virtual CPU for guest OS on Linux kernel:</span> TTTTTs (XXX%)</p></body></html>
diff --git a/obserware/assets/uifiles/cputwind.ui b/obserware/assets/uifiles/cputwind.ui
index 940c548..387174c 100644
--- a/obserware/assets/uifiles/cputwind.ui
+++ b/obserware/assets/uifiles/cputwind.ui
@@ -59,8 +59,7 @@
- font: 15pt "JetBrains Mono";
-color: #008080;
+ font: 15pt "JetBrains Mono";
0 CPU(s)
@@ -97,8 +96,7 @@ color: #008080;
- font: 15pt "JetBrains Mono";
-color: #008080;
+ font: 15pt "JetBrains Mono";
CPU Times
@@ -110,7 +108,7 @@ color: #008080;
5
30
590
- 3
+ 1
@@ -122,15 +120,18 @@ color: #008080;
590
- 3
+ 1
590
- 3
+ 1
+
+ border: 1px solid #808080;
+
Qt::Horizontal
diff --git a/obserware/screens/cputwind/interface.py b/obserware/screens/cputwind/interface.py
index 79c6788..95ccdf7 100644
--- a/obserware/screens/cputwind/interface.py
+++ b/obserware/screens/cputwind/interface.py
@@ -35,7 +35,7 @@ class Ui_cputwind(object):
self.cputqant.setSizePolicy(sizePolicy)
self.cputqant.setMinimumSize(QtCore.QSize(200, 20))
self.cputqant.setMaximumSize(QtCore.QSize(200, 20))
- self.cputqant.setStyleSheet('font: 15pt "JetBrains Mono";\n' "color: #008080;")
+ self.cputqant.setStyleSheet('font: 15pt "JetBrains Mono";')
self.cputqant.setAlignment(
QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter
)
@@ -51,10 +51,10 @@ class Ui_cputwind(object):
self.cputlabl.setSizePolicy(sizePolicy)
self.cputlabl.setMinimumSize(QtCore.QSize(200, 20))
self.cputlabl.setMaximumSize(QtCore.QSize(200, 20))
- self.cputlabl.setStyleSheet('font: 15pt "JetBrains Mono";\n' "color: #008080;")
+ self.cputlabl.setStyleSheet('font: 15pt "JetBrains Mono";')
self.cputlabl.setObjectName("cputlabl")
self.cputline = QtWidgets.QFrame(cputwind)
- self.cputline.setGeometry(QtCore.QRect(5, 30, 590, 3))
+ self.cputline.setGeometry(QtCore.QRect(5, 30, 590, 1))
sizePolicy = QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
)
@@ -62,8 +62,9 @@ class Ui_cputwind(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.cputline.sizePolicy().hasHeightForWidth())
self.cputline.setSizePolicy(sizePolicy)
- self.cputline.setMinimumSize(QtCore.QSize(590, 3))
- self.cputline.setMaximumSize(QtCore.QSize(590, 3))
+ self.cputline.setMinimumSize(QtCore.QSize(590, 1))
+ self.cputline.setMaximumSize(QtCore.QSize(590, 1))
+ self.cputline.setStyleSheet("border: 1px solid #808080;")
self.cputline.setFrameShape(QtWidgets.QFrame.HLine)
self.cputline.setFrameShadow(QtWidgets.QFrame.Sunken)
self.cputline.setObjectName("cputline")
diff --git a/obserware/widgets/cputwdgt/interface.py b/obserware/widgets/cputwdgt/interface.py
index 0be1cbe..54a1ece 100644
--- a/obserware/widgets/cputwdgt/interface.py
+++ b/obserware/widgets/cputwdgt/interface.py
@@ -24,6 +24,7 @@ class Ui_cputwdgt(object):
cputwdgt.setSizePolicy(sizePolicy)
cputwdgt.setMinimumSize(QtCore.QSize(590, 250))
cputwdgt.setMaximumSize(QtCore.QSize(590, 250))
+ cputwdgt.setStyleSheet("background: transparent;")
self.cputperc = QtWidgets.QLabel(cputwdgt)
self.cputperc.setGeometry(QtCore.QRect(70, 5, 515, 20))
sizePolicy = QtWidgets.QSizePolicy(
@@ -35,7 +36,7 @@ class Ui_cputwdgt(object):
self.cputperc.setSizePolicy(sizePolicy)
self.cputperc.setMinimumSize(QtCore.QSize(515, 20))
self.cputperc.setMaximumSize(QtCore.QSize(515, 20))
- self.cputperc.setStyleSheet('font: 15pt "JetBrains Mono";\n' "color: #008080;")
+ self.cputperc.setStyleSheet('font: 15pt "JetBrains Mono";')
self.cputperc.setObjectName("cputperc")
self.cputxtra = QtWidgets.QLabel(cputwdgt)
self.cputxtra.setGeometry(QtCore.QRect(70, 30, 515, 15))
@@ -66,7 +67,7 @@ class Ui_cputwdgt(object):
self.cputnumb.setSizePolicy(sizePolicy)
self.cputnumb.setMinimumSize(QtCore.QSize(55, 20))
self.cputnumb.setMaximumSize(QtCore.QSize(55, 20))
- self.cputnumb.setStyleSheet('font: 15pt "JetBrains Mono";\n' "color: #008080;")
+ self.cputnumb.setStyleSheet('font: 15pt "JetBrains Mono";')
self.cputnumb.setFrameShape(QtWidgets.QFrame.NoFrame)
self.cputnumb.setAlignment(
QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter
@@ -94,7 +95,7 @@ class Ui_cputwdgt(object):
)
self.cputlabl.setObjectName("cputlabl")
self.cputline = QtWidgets.QFrame(cputwdgt)
- self.cputline.setGeometry(QtCore.QRect(65, 5, 3, 240))
+ self.cputline.setGeometry(QtCore.QRect(65, 5, 1, 240))
sizePolicy = QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed
)
@@ -102,8 +103,9 @@ class Ui_cputwdgt(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.cputline.sizePolicy().hasHeightForWidth())
self.cputline.setSizePolicy(sizePolicy)
- self.cputline.setMinimumSize(QtCore.QSize(3, 240))
- self.cputline.setMaximumSize(QtCore.QSize(3, 240))
+ self.cputline.setMinimumSize(QtCore.QSize(1, 240))
+ self.cputline.setMaximumSize(QtCore.QSize(1, 240))
+ self.cputline.setStyleSheet("border: 1px solid #808080;")
self.cputline.setFrameShape(QtWidgets.QFrame.VLine)
self.cputline.setFrameShadow(QtWidgets.QFrame.Sunken)
self.cputline.setObjectName("cputline")
@@ -300,47 +302,61 @@ class Ui_cputwdgt(object):
self.cputlabl.setText(_translate("cputwdgt", "#CPU"))
self.cputusnm.setText(
_translate(
- "cputwdgt", "Executing normal processes in user mode: TTTTTs (XXX%)"
+ "cputwdgt",
+ 'Executing normal processes in user mode: TTTTTs (XXX%)
',
)
)
self.cputuspr.setText(
_translate(
"cputwdgt",
- "Executing prioritized processes in user mode: TTTTTs (XXX%)",
+ 'Executing prioritized processes in user mode: TTTTTs (XXX%)
',
)
)
self.cputkrnm.setText(
- _translate("cputwdgt", "Executing processes in kernel mode: TTTTTs (XXX%)")
+ _translate(
+ "cputwdgt",
+ '
Executing processes in kernel mode: TTTTTs (XXX%)
',
+ )
)
self.cputnull.setText(
- _translate("cputwdgt", "Doing absolutely nothing: TTTTTs (XXX%)")
+ _translate(
+ "cputwdgt",
+ 'Doing absolutely nothing: TTTTTs (XXX%)
',
+ )
)
self.cputiowt.setText(
_translate(
- "cputwdgt", "Waiting for I/O operations to complete: TTTTTs (XXX%)"
+ "cputwdgt",
+ 'Waiting for I/O operations to complete: TTTTTs (XXX%)
',
)
)
self.cputhirq.setText(
- _translate("cputwdgt", "Servicing hardware interrupts: TTTTTs (XXX%)")
+ _translate(
+ "cputwdgt",
+ 'Servicing hardware interrupts: TTTTTs (XXX%)
',
+ )
)
self.cputsirq.setText(
- _translate("cputwdgt", "Servicing software interrupts: TTTTTs (XXX%)")
+ _translate(
+ "cputwdgt",
+ 'Servicing software interrupts: TTTTTs (XXX%)
',
+ )
)
self.cputvirt.setText(
_translate(
"cputwdgt",
- "Running other OSes in a virtualized environment: TTTTTs (XXX%)",
+ 'Running other OSes in a virtualized environment: TTTTTs (XXX%)
',
)
)
self.cputgest.setText(
_translate(
"cputwdgt",
- "Running a normal virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)",
+ 'Running a normal virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)
',
)
)
self.cputgtnc.setText(
_translate(
"cputwdgt",
- "Running a prioritized virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)",
+ 'Running a prioritized virtual CPU for guest OS on Linux kernel: TTTTTs (XXX%)
',
)
)