From 6d1bfa11be8440a3f72e4a76453f116c4a7bf1ad Mon Sep 17 00:00:00 2001 From: Akashdeep Dhar Date: Jan 08 2022 16:27:44 +0000 Subject: Rework interface modules for the updated font Iconify NIC activity in the network statistics tabscreen Signed-off-by: Akashdeep Dhar --- diff --git a/obserware/sources/screens/cputwind/interface.py b/obserware/sources/screens/cputwind/interface.py index 95ccdf7..a5eb502 100644 --- a/obserware/sources/screens/cputwind/interface.py +++ b/obserware/sources/screens/cputwind/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/cputwind.ui' +# Form implementation generated from reading ui file 'assets/uifiles/cputwind.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_cputwind(object): def setupUi(self, cputwind): cputwind.setObjectName("cputwind") - cputwind.resize(600, 480) + cputwind.resize(590, 480) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_cputwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(cputwind.sizePolicy().hasHeightForWidth()) cputwind.setSizePolicy(sizePolicy) - cputwind.setMinimumSize(QtCore.QSize(600, 480)) - cputwind.setMaximumSize(QtCore.QSize(600, 480)) + cputwind.setMinimumSize(QtCore.QSize(590, 480)) + cputwind.setMaximumSize(QtCore.QSize(590, 480)) self.cputqant = QtWidgets.QLabel(cputwind) - self.cputqant.setGeometry(QtCore.QRect(395, 5, 200, 20)) + self.cputqant.setGeometry(QtCore.QRect(385, 5, 200, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -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";') + self.cputqant.setStyleSheet('font: 13pt "Barlow";') 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";') + self.cputlabl.setStyleSheet('font: 13pt "Barlow";') self.cputlabl.setObjectName("cputlabl") self.cputline = QtWidgets.QFrame(cputwind) - self.cputline.setGeometry(QtCore.QRect(5, 30, 590, 1)) + self.cputline.setGeometry(QtCore.QRect(5, 30, 580, 1)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -62,15 +62,15 @@ class Ui_cputwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputline.sizePolicy().hasHeightForWidth()) self.cputline.setSizePolicy(sizePolicy) - self.cputline.setMinimumSize(QtCore.QSize(590, 1)) - self.cputline.setMaximumSize(QtCore.QSize(590, 1)) + self.cputline.setMinimumSize(QtCore.QSize(580, 1)) + self.cputline.setMaximumSize(QtCore.QSize(580, 1)) self.cputline.setStyleSheet("border: 1px solid #808080;") self.cputline.setFrameShape(QtWidgets.QFrame.HLine) self.cputline.setFrameShadow(QtWidgets.QFrame.Sunken) self.cputline.setObjectName("cputline") self.cputlist = QtWidgets.QListWidget(cputwind) self.cputlist.setEnabled(True) - self.cputlist.setGeometry(QtCore.QRect(5, 35, 590, 440)) + self.cputlist.setGeometry(QtCore.QRect(5, 35, 580, 440)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -78,8 +78,8 @@ class Ui_cputwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputlist.sizePolicy().hasHeightForWidth()) self.cputlist.setSizePolicy(sizePolicy) - self.cputlist.setMinimumSize(QtCore.QSize(590, 440)) - self.cputlist.setMaximumSize(QtCore.QSize(590, 440)) + self.cputlist.setMinimumSize(QtCore.QSize(580, 440)) + self.cputlist.setMaximumSize(QtCore.QSize(580, 440)) self.cputlist.setFocusPolicy(QtCore.Qt.NoFocus) self.cputlist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.cputlist.setAlternatingRowColors(False) diff --git a/obserware/sources/screens/cyclwind/interface.py b/obserware/sources/screens/cyclwind/interface.py index d615d92..82d009f 100644 --- a/obserware/sources/screens/cyclwind/interface.py +++ b/obserware/sources/screens/cyclwind/interface.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_cyclwind(object): def setupUi(self, cyclwind): cyclwind.setObjectName("cyclwind") - cyclwind.resize(480, 400) + cyclwind.resize(380, 400) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(cyclwind.sizePolicy().hasHeightForWidth()) cyclwind.setSizePolicy(sizePolicy) - cyclwind.setMinimumSize(QtCore.QSize(480, 400)) - cyclwind.setMaximumSize(QtCore.QSize(480, 400)) + cyclwind.setMinimumSize(QtCore.QSize(380, 400)) + cyclwind.setMaximumSize(QtCore.QSize(380, 400)) self.cyclqant = QtWidgets.QLabel(cyclwind) - self.cyclqant.setGeometry(QtCore.QRect(275, 5, 200, 20)) + self.cyclqant.setGeometry(QtCore.QRect(200, 5, 175, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -33,15 +33,15 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cyclqant.sizePolicy().hasHeightForWidth()) self.cyclqant.setSizePolicy(sizePolicy) - self.cyclqant.setMinimumSize(QtCore.QSize(200, 20)) - self.cyclqant.setMaximumSize(QtCore.QSize(200, 20)) - self.cyclqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cyclqant.setMinimumSize(QtCore.QSize(175, 20)) + self.cyclqant.setMaximumSize(QtCore.QSize(175, 20)) + self.cyclqant.setStyleSheet('font: 13pt "Barlow";') self.cyclqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) self.cyclqant.setObjectName("cyclqant") self.cycllabl = QtWidgets.QLabel(cyclwind) - self.cycllabl.setGeometry(QtCore.QRect(5, 5, 200, 20)) + self.cycllabl.setGeometry(QtCore.QRect(5, 5, 175, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -49,12 +49,12 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycllabl.sizePolicy().hasHeightForWidth()) self.cycllabl.setSizePolicy(sizePolicy) - self.cycllabl.setMinimumSize(QtCore.QSize(200, 20)) - self.cycllabl.setMaximumSize(QtCore.QSize(200, 20)) - self.cycllabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cycllabl.setMinimumSize(QtCore.QSize(175, 20)) + self.cycllabl.setMaximumSize(QtCore.QSize(175, 20)) + self.cycllabl.setStyleSheet('font: 13pt "Barlow";') self.cycllabl.setObjectName("cycllabl") self.cycllin1 = QtWidgets.QFrame(cyclwind) - self.cycllin1.setGeometry(QtCore.QRect(5, 30, 470, 1)) + self.cycllin1.setGeometry(QtCore.QRect(5, 30, 370, 1)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -62,15 +62,15 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycllin1.sizePolicy().hasHeightForWidth()) self.cycllin1.setSizePolicy(sizePolicy) - self.cycllin1.setMinimumSize(QtCore.QSize(470, 1)) - self.cycllin1.setMaximumSize(QtCore.QSize(470, 1)) + self.cycllin1.setMinimumSize(QtCore.QSize(370, 1)) + self.cycllin1.setMaximumSize(QtCore.QSize(370, 1)) self.cycllin1.setStyleSheet("border: 1px solid #808080;") self.cycllin1.setFrameShape(QtWidgets.QFrame.HLine) self.cycllin1.setFrameShadow(QtWidgets.QFrame.Sunken) self.cycllin1.setObjectName("cycllin1") self.cycllist = QtWidgets.QListWidget(cyclwind) self.cycllist.setEnabled(True) - self.cycllist.setGeometry(QtCore.QRect(5, 65, 470, 330)) + self.cycllist.setGeometry(QtCore.QRect(5, 65, 370, 330)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -78,15 +78,15 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycllist.sizePolicy().hasHeightForWidth()) self.cycllist.setSizePolicy(sizePolicy) - self.cycllist.setMinimumSize(QtCore.QSize(470, 330)) - self.cycllist.setMaximumSize(QtCore.QSize(470, 330)) + self.cycllist.setMinimumSize(QtCore.QSize(370, 330)) + self.cycllist.setMaximumSize(QtCore.QSize(370, 330)) self.cycllist.setFocusPolicy(QtCore.Qt.NoFocus) self.cycllist.setStyleSheet("") self.cycllist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.cycllist.setAlternatingRowColors(False) self.cycllist.setObjectName("cycllist") self.cycsecbt = QtWidgets.QPushButton(cyclwind) - self.cycsecbt.setGeometry(QtCore.QRect(5, 35, 470, 20)) + self.cycsecbt.setGeometry(QtCore.QRect(5, 35, 370, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -94,8 +94,8 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycsecbt.sizePolicy().hasHeightForWidth()) self.cycsecbt.setSizePolicy(sizePolicy) - self.cycsecbt.setMinimumSize(QtCore.QSize(470, 20)) - self.cycsecbt.setMaximumSize(QtCore.QSize(470, 20)) + self.cycsecbt.setMinimumSize(QtCore.QSize(370, 20)) + self.cycsecbt.setMaximumSize(QtCore.QSize(370, 20)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -104,7 +104,7 @@ class Ui_cyclwind(object): self.cycsecbt.setStyleSheet('font: 10pt "Inter";') self.cycsecbt.setObjectName("cycsecbt") self.cycllin2 = QtWidgets.QFrame(cyclwind) - self.cycllin2.setGeometry(QtCore.QRect(5, 60, 470, 1)) + self.cycllin2.setGeometry(QtCore.QRect(5, 60, 370, 1)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -112,8 +112,8 @@ class Ui_cyclwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycllin2.sizePolicy().hasHeightForWidth()) self.cycllin2.setSizePolicy(sizePolicy) - self.cycllin2.setMinimumSize(QtCore.QSize(470, 1)) - self.cycllin2.setMaximumSize(QtCore.QSize(470, 1)) + self.cycllin2.setMinimumSize(QtCore.QSize(370, 1)) + self.cycllin2.setMaximumSize(QtCore.QSize(370, 1)) self.cycllin2.setStyleSheet("border: 1px solid #808080;") self.cycllin2.setFrameShape(QtWidgets.QFrame.HLine) self.cycllin2.setFrameShadow(QtWidgets.QFrame.Sunken) diff --git a/obserware/sources/screens/lgptwind/interface.py b/obserware/sources/screens/lgptwind/interface.py index 692a84f..ca70f54 100644 --- a/obserware/sources/screens/lgptwind/interface.py +++ b/obserware/sources/screens/lgptwind/interface.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_lgptwind(object): def setupUi(self, lgptwind): lgptwind.setObjectName("lgptwind") - lgptwind.resize(480, 400) + lgptwind.resize(450, 400) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_lgptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(lgptwind.sizePolicy().hasHeightForWidth()) lgptwind.setSizePolicy(sizePolicy) - lgptwind.setMinimumSize(QtCore.QSize(480, 400)) - lgptwind.setMaximumSize(QtCore.QSize(480, 400)) + lgptwind.setMinimumSize(QtCore.QSize(450, 400)) + lgptwind.setMaximumSize(QtCore.QSize(450, 400)) self.lgptqant = QtWidgets.QLabel(lgptwind) - self.lgptqant.setGeometry(QtCore.QRect(245, 5, 230, 20)) + self.lgptqant.setGeometry(QtCore.QRect(230, 5, 215, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -33,15 +33,15 @@ class Ui_lgptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptqant.sizePolicy().hasHeightForWidth()) self.lgptqant.setSizePolicy(sizePolicy) - self.lgptqant.setMinimumSize(QtCore.QSize(230, 20)) - self.lgptqant.setMaximumSize(QtCore.QSize(230, 20)) - self.lgptqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.lgptqant.setMinimumSize(QtCore.QSize(215, 20)) + self.lgptqant.setMaximumSize(QtCore.QSize(215, 20)) + self.lgptqant.setStyleSheet('font: 13pt "Barlow";') self.lgptqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) self.lgptqant.setObjectName("lgptqant") self.lgptlabl = QtWidgets.QLabel(lgptwind) - self.lgptlabl.setGeometry(QtCore.QRect(5, 5, 230, 20)) + self.lgptlabl.setGeometry(QtCore.QRect(5, 5, 215, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -49,12 +49,12 @@ class Ui_lgptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptlabl.sizePolicy().hasHeightForWidth()) self.lgptlabl.setSizePolicy(sizePolicy) - self.lgptlabl.setMinimumSize(QtCore.QSize(230, 20)) - self.lgptlabl.setMaximumSize(QtCore.QSize(230, 20)) - self.lgptlabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.lgptlabl.setMinimumSize(QtCore.QSize(215, 20)) + self.lgptlabl.setMaximumSize(QtCore.QSize(215, 20)) + self.lgptlabl.setStyleSheet('font: 13pt "Barlow";') self.lgptlabl.setObjectName("lgptlabl") self.lgptline = QtWidgets.QFrame(lgptwind) - self.lgptline.setGeometry(QtCore.QRect(5, 30, 470, 1)) + self.lgptline.setGeometry(QtCore.QRect(5, 30, 440, 1)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -62,15 +62,15 @@ class Ui_lgptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptline.sizePolicy().hasHeightForWidth()) self.lgptline.setSizePolicy(sizePolicy) - self.lgptline.setMinimumSize(QtCore.QSize(470, 1)) - self.lgptline.setMaximumSize(QtCore.QSize(470, 1)) + self.lgptline.setMinimumSize(QtCore.QSize(440, 1)) + self.lgptline.setMaximumSize(QtCore.QSize(440, 1)) self.lgptline.setStyleSheet("border: 1px solid #808080;") self.lgptline.setFrameShape(QtWidgets.QFrame.HLine) self.lgptline.setFrameShadow(QtWidgets.QFrame.Sunken) self.lgptline.setObjectName("lgptline") self.lgptlist = QtWidgets.QListWidget(lgptwind) self.lgptlist.setEnabled(True) - self.lgptlist.setGeometry(QtCore.QRect(5, 35, 470, 360)) + self.lgptlist.setGeometry(QtCore.QRect(5, 35, 440, 360)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -78,8 +78,8 @@ class Ui_lgptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptlist.sizePolicy().hasHeightForWidth()) self.lgptlist.setSizePolicy(sizePolicy) - self.lgptlist.setMinimumSize(QtCore.QSize(470, 360)) - self.lgptlist.setMaximumSize(QtCore.QSize(470, 360)) + self.lgptlist.setMinimumSize(QtCore.QSize(440, 360)) + self.lgptlist.setMaximumSize(QtCore.QSize(440, 360)) self.lgptlist.setFocusPolicy(QtCore.Qt.NoFocus) self.lgptlist.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.lgptlist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) diff --git a/obserware/sources/screens/mainwind/interface.py b/obserware/sources/screens/mainwind/interface.py index 1d00085..e4bc96b 100644 --- a/obserware/sources/screens/mainwind/interface.py +++ b/obserware/sources/screens/mainwind/interface.py @@ -145,7 +145,7 @@ class Ui_mainwind(object): self.memouspc.setSizePolicy(sizePolicy) self.memouspc.setMinimumSize(QtCore.QSize(150, 20)) self.memouspc.setMaximumSize(QtCore.QSize(150, 20)) - self.memouspc.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memouspc.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memouspc.setObjectName("memouspc") self.memoccpc = QtWidgets.QLabel(self.memofmgf) self.memoccpc.setGeometry(QtCore.QRect(205, 65, 150, 20)) @@ -158,7 +158,7 @@ class Ui_mainwind(object): self.memoccpc.setSizePolicy(sizePolicy) self.memoccpc.setMinimumSize(QtCore.QSize(150, 20)) self.memoccpc.setMaximumSize(QtCore.QSize(150, 20)) - self.memoccpc.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memoccpc.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memoccpc.setObjectName("memoccpc") self.memocplb = QtWidgets.QLabel(self.memofmgf) self.memocplb.setGeometry(QtCore.QRect(205, 50, 150, 15)) @@ -228,7 +228,7 @@ class Ui_mainwind(object): self.memofrpc.setSizePolicy(sizePolicy) self.memofrpc.setMinimumSize(QtCore.QSize(150, 20)) self.memofrpc.setMaximumSize(QtCore.QSize(150, 20)) - self.memofrpc.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memofrpc.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memofrpc.setObjectName("memofrpc") self.memofplb = QtWidgets.QLabel(self.memofmgf) self.memofplb.setGeometry(QtCore.QRect(205, 95, 150, 15)) @@ -284,7 +284,7 @@ class Ui_mainwind(object): self.swapuspc.setSizePolicy(sizePolicy) self.swapuspc.setMinimumSize(QtCore.QSize(150, 20)) self.swapuspc.setMaximumSize(QtCore.QSize(150, 20)) - self.swapuspc.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapuspc.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapuspc.setObjectName("swapuspc") self.swapuplb = QtWidgets.QLabel(self.swapfmgf) self.swapuplb.setGeometry(QtCore.QRect(205, 5, 150, 15)) @@ -310,7 +310,7 @@ class Ui_mainwind(object): self.swapfrpc.setSizePolicy(sizePolicy) self.swapfrpc.setMinimumSize(QtCore.QSize(150, 20)) self.swapfrpc.setMaximumSize(QtCore.QSize(150, 20)) - self.swapfrpc.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapfrpc.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapfrpc.setObjectName("swapfrpc") self.swapfplb = QtWidgets.QLabel(self.swapfmgf) self.swapfplb.setGeometry(QtCore.QRect(205, 50, 150, 15)) @@ -365,7 +365,7 @@ class Ui_mainwind(object): self.cpudlabl.setSizePolicy(sizePolicy) self.cpudlabl.setMinimumSize(QtCore.QSize(205, 20)) self.cpudlabl.setMaximumSize(QtCore.QSize(205, 20)) - self.cpudlabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cpudlabl.setStyleSheet('font: 13pt "Barlow";') self.cpudlabl.setObjectName("cpudlabl") self.memolabl = QtWidgets.QLabel(self.perftabp) self.memolabl.setGeometry(QtCore.QRect(215, 5, 360, 20)) @@ -378,7 +378,7 @@ class Ui_mainwind(object): self.memolabl.setSizePolicy(sizePolicy) self.memolabl.setMinimumSize(QtCore.QSize(360, 20)) self.memolabl.setMaximumSize(QtCore.QSize(360, 20)) - self.memolabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.memolabl.setStyleSheet('font: 13pt "Barlow";') self.memolabl.setObjectName("memolabl") self.swaplabl = QtWidgets.QLabel(self.perftabp) self.swaplabl.setGeometry(QtCore.QRect(580, 5, 360, 20)) @@ -391,7 +391,7 @@ class Ui_mainwind(object): self.swaplabl.setSizePolicy(sizePolicy) self.swaplabl.setMinimumSize(QtCore.QSize(360, 20)) self.swaplabl.setMaximumSize(QtCore.QSize(360, 20)) - self.swaplabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.swaplabl.setStyleSheet('font: 13pt "Barlow";') self.swaplabl.setObjectName("swaplabl") self.cpudexdt = QtWidgets.QFrame(self.perftabp) self.cpudexdt.setGeometry(QtCore.QRect(5, 240, 205, 185)) @@ -421,7 +421,7 @@ class Ui_mainwind(object): self.cpudcsnm.setSizePolicy(sizePolicy) self.cpudcsnm.setMinimumSize(QtCore.QSize(195, 20)) self.cpudcsnm.setMaximumSize(QtCore.QSize(195, 20)) - self.cpudcsnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpudcsnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpudcsnm.setObjectName("cpudcsnm") self.cpudcslb = QtWidgets.QLabel(self.cpudexdt) self.cpudcslb.setGeometry(QtCore.QRect(5, 5, 195, 15)) @@ -461,7 +461,7 @@ class Ui_mainwind(object): self.cpudinnm.setSizePolicy(sizePolicy) self.cpudinnm.setMinimumSize(QtCore.QSize(195, 20)) self.cpudinnm.setMaximumSize(QtCore.QSize(195, 20)) - self.cpudinnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpudinnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpudinnm.setObjectName("cpudinnm") self.cpudlin2 = QtWidgets.QFrame(self.cpudexdt) self.cpudlin2.setGeometry(QtCore.QRect(5, 90, 195, 1)) @@ -515,7 +515,7 @@ class Ui_mainwind(object): self.cpudsinm.setSizePolicy(sizePolicy) self.cpudsinm.setMinimumSize(QtCore.QSize(195, 20)) self.cpudsinm.setMaximumSize(QtCore.QSize(195, 20)) - self.cpudsinm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpudsinm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpudsinm.setObjectName("cpudsinm") self.cpudsilb = QtWidgets.QLabel(self.cpudexdt) self.cpudsilb.setGeometry(QtCore.QRect(5, 95, 195, 15)) @@ -541,7 +541,7 @@ class Ui_mainwind(object): self.cpudscnm.setSizePolicy(sizePolicy) self.cpudscnm.setMinimumSize(QtCore.QSize(195, 20)) self.cpudscnm.setMaximumSize(QtCore.QSize(195, 20)) - self.cpudscnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpudscnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpudscnm.setObjectName("cpudscnm") self.cpudsclb = QtWidgets.QLabel(self.cpudexdt) self.cpudsclb.setGeometry(QtCore.QRect(5, 140, 195, 15)) @@ -584,7 +584,7 @@ class Ui_mainwind(object): self.memoshnm.setSizePolicy(sizePolicy) self.memoshnm.setMinimumSize(QtCore.QSize(195, 20)) self.memoshnm.setMaximumSize(QtCore.QSize(195, 20)) - self.memoshnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memoshnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memoshnm.setObjectName("memoshnm") self.memobfnm = QtWidgets.QLabel(self.memoexdt) self.memobfnm.setGeometry(QtCore.QRect(5, 65, 195, 20)) @@ -597,7 +597,7 @@ class Ui_mainwind(object): self.memobfnm.setSizePolicy(sizePolicy) self.memobfnm.setMinimumSize(QtCore.QSize(195, 20)) self.memobfnm.setMaximumSize(QtCore.QSize(195, 20)) - self.memobfnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memobfnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memobfnm.setObjectName("memobfnm") self.memosblb = QtWidgets.QLabel(self.memoexdt) self.memosblb.setGeometry(QtCore.QRect(5, 140, 195, 15)) @@ -651,7 +651,7 @@ class Ui_mainwind(object): self.memoacnm.setSizePolicy(sizePolicy) self.memoacnm.setMinimumSize(QtCore.QSize(195, 20)) self.memoacnm.setMaximumSize(QtCore.QSize(195, 20)) - self.memoacnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memoacnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memoacnm.setObjectName("memoacnm") self.memoexl1 = QtWidgets.QFrame(self.memoexdt) self.memoexl1.setGeometry(QtCore.QRect(5, 45, 195, 1)) @@ -717,7 +717,7 @@ class Ui_mainwind(object): self.memosbnm.setSizePolicy(sizePolicy) self.memosbnm.setMinimumSize(QtCore.QSize(195, 20)) self.memosbnm.setMaximumSize(QtCore.QSize(195, 20)) - self.memosbnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memosbnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memosbnm.setObjectName("memosbnm") self.memofrlb = QtWidgets.QLabel(self.memoexdt) self.memofrlb.setGeometry(QtCore.QRect(205, 95, 150, 15)) @@ -757,7 +757,7 @@ class Ui_mainwind(object): self.memottnm.setSizePolicy(sizePolicy) self.memottnm.setMinimumSize(QtCore.QSize(150, 20)) self.memottnm.setMaximumSize(QtCore.QSize(150, 20)) - self.memottnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memottnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memottnm.setObjectName("memottnm") self.memocclb = QtWidgets.QLabel(self.memoexdt) self.memocclb.setGeometry(QtCore.QRect(205, 50, 150, 15)) @@ -810,7 +810,7 @@ class Ui_mainwind(object): self.memofrnm.setSizePolicy(sizePolicy) self.memofrnm.setMinimumSize(QtCore.QSize(150, 20)) self.memofrnm.setMaximumSize(QtCore.QSize(150, 20)) - self.memofrnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memofrnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memofrnm.setObjectName("memofrnm") self.memousnm = QtWidgets.QLabel(self.memoexdt) self.memousnm.setGeometry(QtCore.QRect(205, 20, 150, 20)) @@ -823,7 +823,7 @@ class Ui_mainwind(object): self.memousnm.setSizePolicy(sizePolicy) self.memousnm.setMinimumSize(QtCore.QSize(150, 20)) self.memousnm.setMaximumSize(QtCore.QSize(150, 20)) - self.memousnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memousnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memousnm.setObjectName("memousnm") self.memouslb = QtWidgets.QLabel(self.memoexdt) self.memouslb.setGeometry(QtCore.QRect(205, 5, 150, 15)) @@ -849,7 +849,7 @@ class Ui_mainwind(object): self.memoccnm.setSizePolicy(sizePolicy) self.memoccnm.setMinimumSize(QtCore.QSize(150, 20)) self.memoccnm.setMaximumSize(QtCore.QSize(150, 20)) - self.memoccnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.memoccnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.memoccnm.setObjectName("memoccnm") self.memoexl4 = QtWidgets.QFrame(self.memoexdt) self.memoexl4.setGeometry(QtCore.QRect(205, 45, 150, 1)) @@ -893,7 +893,7 @@ class Ui_mainwind(object): self.swapsonm.setSizePolicy(sizePolicy) self.swapsonm.setMinimumSize(QtCore.QSize(195, 20)) self.swapsonm.setMaximumSize(QtCore.QSize(195, 20)) - self.swapsonm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapsonm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapsonm.setObjectName("swapsonm") self.swapexl2 = QtWidgets.QFrame(self.swapexdt) self.swapexl2.setGeometry(QtCore.QRect(5, 90, 195, 1)) @@ -920,7 +920,7 @@ class Ui_mainwind(object): self.swapsinm.setSizePolicy(sizePolicy) self.swapsinm.setMinimumSize(QtCore.QSize(195, 20)) self.swapsinm.setMaximumSize(QtCore.QSize(195, 20)) - self.swapsinm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapsinm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapsinm.setObjectName("swapsinm") self.swapexl1 = QtWidgets.QFrame(self.swapexdt) self.swapexl1.setGeometry(QtCore.QRect(5, 45, 195, 1)) @@ -1027,7 +1027,7 @@ class Ui_mainwind(object): self.swapttnm.setSizePolicy(sizePolicy) self.swapttnm.setMinimumSize(QtCore.QSize(150, 20)) self.swapttnm.setMaximumSize(QtCore.QSize(150, 20)) - self.swapttnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapttnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapttnm.setObjectName("swapttnm") self.swapusnm = QtWidgets.QLabel(self.swapexdt) self.swapusnm.setGeometry(QtCore.QRect(205, 20, 150, 20)) @@ -1040,7 +1040,7 @@ class Ui_mainwind(object): self.swapusnm.setSizePolicy(sizePolicy) self.swapusnm.setMinimumSize(QtCore.QSize(150, 20)) self.swapusnm.setMaximumSize(QtCore.QSize(150, 20)) - self.swapusnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapusnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapusnm.setObjectName("swapusnm") self.swapuslb = QtWidgets.QLabel(self.swapexdt) self.swapuslb.setGeometry(QtCore.QRect(205, 5, 150, 15)) @@ -1066,7 +1066,7 @@ class Ui_mainwind(object): self.swapfrnm.setSizePolicy(sizePolicy) self.swapfrnm.setMinimumSize(QtCore.QSize(150, 20)) self.swapfrnm.setMaximumSize(QtCore.QSize(150, 20)) - self.swapfrnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.swapfrnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.swapfrnm.setObjectName("swapfrnm") self.swapexl3 = QtWidgets.QFrame(self.swapexdt) self.swapexl3.setGeometry(QtCore.QRect(205, 45, 150, 1)) @@ -1172,9 +1172,7 @@ class Ui_mainwind(object): self.proctree.setSizePolicy(sizePolicy) self.proctree.setMinimumSize(QtCore.QSize(935, 420)) self.proctree.setMaximumSize(QtCore.QSize(935, 420)) - self.proctree.setStyleSheet( - 'QTableWidget::item{font: 10pt "Inter";} QTableWidget::item:selected{background-color: rgba(0, 128, 128, 1);}' - ) + self.proctree.setStyleSheet('font: 10pt "Inter";') self.proctree.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.proctree.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) self.proctree.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) @@ -1209,7 +1207,7 @@ class Ui_mainwind(object): self.proclabl.setSizePolicy(sizePolicy) self.proclabl.setMinimumSize(QtCore.QSize(205, 20)) self.proclabl.setMaximumSize(QtCore.QSize(205, 20)) - self.proclabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.proclabl.setStyleSheet('font: 13pt "Barlow";') self.proclabl.setObjectName("proclabl") self.procqant = QtWidgets.QLabel(self.proctabp) self.procqant.setGeometry(QtCore.QRect(735, 5, 205, 20)) @@ -1222,7 +1220,7 @@ class Ui_mainwind(object): self.procqant.setSizePolicy(sizePolicy) self.procqant.setMinimumSize(QtCore.QSize(205, 20)) self.procqant.setMaximumSize(QtCore.QSize(205, 20)) - self.procqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.procqant.setStyleSheet('font: 13pt "Barlow";') self.procqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) @@ -1320,7 +1318,7 @@ class Ui_mainwind(object): self.ntwkbrrt.setSizePolicy(sizePolicy) self.ntwkbrrt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkbrrt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkbrrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbrrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbrrt.setObjectName("ntwkbrrt") self.ntwkbrdt = QtWidgets.QLabel(self.ntwkbtbx) self.ntwkbrdt.setGeometry(QtCore.QRect(25, 90, 175, 20)) @@ -1333,7 +1331,7 @@ class Ui_mainwind(object): self.ntwkbrdt.setSizePolicy(sizePolicy) self.ntwkbrdt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkbrdt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkbrdt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbrdt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbrdt.setObjectName("ntwkbrdt") self.ntwkln04 = QtWidgets.QFrame(self.ntwkbtbx) self.ntwkln04.setGeometry(QtCore.QRect(5, 115, 195, 1)) @@ -1374,7 +1372,7 @@ class Ui_mainwind(object): self.ntwkbtrt.setSizePolicy(sizePolicy) self.ntwkbtrt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkbtrt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkbtrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbtrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbtrt.setObjectName("ntwkbtrt") self.ntwkln05 = QtWidgets.QFrame(self.ntwkbtbx) self.ntwkln05.setGeometry(QtCore.QRect(5, 160, 195, 1)) @@ -1415,7 +1413,7 @@ class Ui_mainwind(object): self.ntwkbtdt.setSizePolicy(sizePolicy) self.ntwkbtdt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkbtdt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkbtdt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbtdt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbtdt.setObjectName("ntwkbtdt") self.ntwkbtdl = QtWidgets.QLabel(self.ntwkbtbx) self.ntwkbtdl.setGeometry(QtCore.QRect(25, 165, 175, 15)) @@ -1573,7 +1571,7 @@ class Ui_mainwind(object): self.ntwkprrt.setSizePolicy(sizePolicy) self.ntwkprrt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkprrt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkprrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkprrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkprrt.setObjectName("ntwkprrt") self.ntwkprdt = QtWidgets.QLabel(self.ntwpktbx) self.ntwkprdt.setGeometry(QtCore.QRect(25, 90, 175, 20)) @@ -1586,7 +1584,7 @@ class Ui_mainwind(object): self.ntwkprdt.setSizePolicy(sizePolicy) self.ntwkprdt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkprdt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkprdt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkprdt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkprdt.setObjectName("ntwkprdt") self.ntwkln07 = QtWidgets.QFrame(self.ntwpktbx) self.ntwkln07.setGeometry(QtCore.QRect(5, 70, 195, 1)) @@ -1640,7 +1638,7 @@ class Ui_mainwind(object): self.ntwkptrt.setSizePolicy(sizePolicy) self.ntwkptrt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkptrt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkptrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkptrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkptrt.setObjectName("ntwkptrt") self.ntwkptdt = QtWidgets.QLabel(self.ntwpktbx) self.ntwkptdt.setGeometry(QtCore.QRect(25, 180, 175, 20)) @@ -1653,7 +1651,7 @@ class Ui_mainwind(object): self.ntwkptdt.setSizePolicy(sizePolicy) self.ntwkptdt.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkptdt.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkptdt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkptdt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkptdt.setObjectName("ntwkptdt") self.ntwkln08 = QtWidgets.QFrame(self.ntwpktbx) self.ntwkln08.setGeometry(QtCore.QRect(5, 160, 195, 1)) @@ -1775,7 +1773,7 @@ class Ui_mainwind(object): self.ntwklabl.setSizePolicy(sizePolicy) self.ntwklabl.setMinimumSize(QtCore.QSize(205, 20)) self.ntwklabl.setMaximumSize(QtCore.QSize(205, 20)) - self.ntwklabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.ntwklabl.setStyleSheet('font: 13pt "Barlow";') self.ntwklabl.setObjectName("ntwklabl") self.ntwkqant = QtWidgets.QLabel(self.ntwktabp) self.ntwkqant.setGeometry(QtCore.QRect(735, 5, 205, 20)) @@ -1788,7 +1786,7 @@ class Ui_mainwind(object): self.ntwkqant.setSizePolicy(sizePolicy) self.ntwkqant.setMinimumSize(QtCore.QSize(205, 20)) self.ntwkqant.setMaximumSize(QtCore.QSize(205, 20)) - self.ntwkqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.ntwkqant.setStyleSheet('font: 13pt "Barlow";') self.ntwkqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) @@ -1880,7 +1878,7 @@ class Ui_mainwind(object): self.ntwkertx.setSizePolicy(sizePolicy) self.ntwkertx.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkertx.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkertx.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkertx.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkertx.setObjectName("ntwkertx") self.ntwkerlb = QtWidgets.QLabel(self.ntwkncbx) self.ntwkerlb.setGeometry(QtCore.QRect(5, 30, 175, 15)) @@ -1906,7 +1904,7 @@ class Ui_mainwind(object): self.ntwkettx.setSizePolicy(sizePolicy) self.ntwkettx.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkettx.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkettx.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkettx.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkettx.setObjectName("ntwkettx") self.ntwketlb = QtWidgets.QLabel(self.ntwkncbx) self.ntwketlb.setGeometry(QtCore.QRect(185, 30, 175, 15)) @@ -1932,7 +1930,7 @@ class Ui_mainwind(object): self.ntwkdttx.setSizePolicy(sizePolicy) self.ntwkdttx.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkdttx.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkdttx.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkdttx.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkdttx.setObjectName("ntwkdttx") self.ntwkdrtx = QtWidgets.QLabel(self.ntwkncbx) self.ntwkdrtx.setGeometry(QtCore.QRect(365, 45, 175, 20)) @@ -1945,7 +1943,7 @@ class Ui_mainwind(object): self.ntwkdrtx.setSizePolicy(sizePolicy) self.ntwkdrtx.setMinimumSize(QtCore.QSize(175, 20)) self.ntwkdrtx.setMaximumSize(QtCore.QSize(175, 20)) - self.ntwkdrtx.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkdrtx.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkdrtx.setObjectName("ntwkdrtx") self.ntwkdtlb = QtWidgets.QLabel(self.ntwkncbx) self.ntwkdtlb.setGeometry(QtCore.QRect(545, 30, 175, 15)) @@ -1994,7 +1992,7 @@ class Ui_mainwind(object): self.softlabl.setSizePolicy(sizePolicy) self.softlabl.setMinimumSize(QtCore.QSize(570, 20)) self.softlabl.setMaximumSize(QtCore.QSize(570, 20)) - self.softlabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.softlabl.setStyleSheet('font: 13pt "Barlow";') self.softlabl.setObjectName("softlabl") self.speclabl = QtWidgets.QLabel(self.infotabp) self.speclabl.setGeometry(QtCore.QRect(580, 5, 360, 20)) @@ -2007,7 +2005,7 @@ class Ui_mainwind(object): self.speclabl.setSizePolicy(sizePolicy) self.speclabl.setMinimumSize(QtCore.QSize(360, 20)) self.speclabl.setMaximumSize(QtCore.QSize(360, 20)) - self.speclabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.speclabl.setStyleSheet('font: 13pt "Barlow";') self.speclabl.setObjectName("speclabl") self.softfrme = QtWidgets.QFrame(self.infotabp) self.softfrme.setGeometry(QtCore.QRect(5, 30, 570, 210)) @@ -2050,7 +2048,7 @@ class Ui_mainwind(object): self.softname.setSizePolicy(sizePolicy) self.softname.setMinimumSize(QtCore.QSize(275, 20)) self.softname.setMaximumSize(QtCore.QSize(275, 20)) - self.softname.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softname.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softname.setObjectName("softname") self.softln02 = QtWidgets.QFrame(self.softfrme) self.softln02.setGeometry(QtCore.QRect(5, 70, 275, 1)) @@ -2104,7 +2102,7 @@ class Ui_mainwind(object): self.softvers.setSizePolicy(sizePolicy) self.softvers.setMinimumSize(QtCore.QSize(275, 20)) self.softvers.setMaximumSize(QtCore.QSize(275, 20)) - self.softvers.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softvers.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softvers.setObjectName("softvers") self.softlb07 = QtWidgets.QLabel(self.softfrme) self.softlb07.setGeometry(QtCore.QRect(5, 165, 560, 15)) @@ -2130,7 +2128,7 @@ class Ui_mainwind(object): self.softboot.setSizePolicy(sizePolicy) self.softboot.setMinimumSize(QtCore.QSize(560, 20)) self.softboot.setMaximumSize(QtCore.QSize(560, 20)) - self.softboot.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softboot.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softboot.setObjectName("softboot") self.softrlse = QtWidgets.QLabel(self.softfrme) self.softrlse.setGeometry(QtCore.QRect(290, 90, 275, 20)) @@ -2143,7 +2141,7 @@ class Ui_mainwind(object): self.softrlse.setSizePolicy(sizePolicy) self.softrlse.setMinimumSize(QtCore.QSize(275, 20)) self.softrlse.setMaximumSize(QtCore.QSize(275, 20)) - self.softrlse.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softrlse.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softrlse.setObjectName("softrlse") self.softln05 = QtWidgets.QFrame(self.softfrme) self.softln05.setGeometry(QtCore.QRect(290, 115, 275, 1)) @@ -2210,7 +2208,7 @@ class Ui_mainwind(object): self.softhost.setSizePolicy(sizePolicy) self.softhost.setMinimumSize(QtCore.QSize(275, 20)) self.softhost.setMaximumSize(QtCore.QSize(275, 20)) - self.softhost.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softhost.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softhost.setObjectName("softhost") self.softlb06 = QtWidgets.QLabel(self.softfrme) self.softlb06.setGeometry(QtCore.QRect(5, 120, 560, 15)) @@ -2250,7 +2248,7 @@ class Ui_mainwind(object): self.softrend.setSizePolicy(sizePolicy) self.softrend.setMinimumSize(QtCore.QSize(560, 20)) self.softrend.setMaximumSize(QtCore.QSize(560, 20)) - self.softrend.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.softrend.setStyleSheet('font: 13pt "Barlow"; border: none;') self.softrend.setObjectName("softrend") self.softln01 = QtWidgets.QFrame(self.softfrme) self.softln01.setGeometry(QtCore.QRect(5, 25, 560, 1)) @@ -2307,7 +2305,7 @@ class Ui_mainwind(object): self.cpuiname.setSizePolicy(sizePolicy) self.cpuiname.setMinimumSize(QtCore.QSize(350, 20)) self.cpuiname.setMaximumSize(QtCore.QSize(350, 20)) - self.cpuiname.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuiname.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuiname.setObjectName("cpuiname") self.cpuilb02 = QtWidgets.QLabel(self.cpuifrme) self.cpuilb02.setGeometry(QtCore.QRect(5, 30, 350, 15)) @@ -2360,7 +2358,7 @@ class Ui_mainwind(object): self.cpuivend.setSizePolicy(sizePolicy) self.cpuivend.setMinimumSize(QtCore.QSize(170, 20)) self.cpuivend.setMaximumSize(QtCore.QSize(170, 20)) - self.cpuivend.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuivend.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuivend.setObjectName("cpuivend") self.cpuiln03 = QtWidgets.QFrame(self.cpuifrme) self.cpuiln03.setGeometry(QtCore.QRect(5, 115, 170, 1)) @@ -2387,7 +2385,7 @@ class Ui_mainwind(object): self.cpuibits.setSizePolicy(sizePolicy) self.cpuibits.setMinimumSize(QtCore.QSize(110, 20)) self.cpuibits.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuibits.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuibits.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuibits.setObjectName("cpuibits") self.cpuiln06 = QtWidgets.QFrame(self.cpuifrme) self.cpuiln06.setGeometry(QtCore.QRect(125, 160, 110, 1)) @@ -2427,7 +2425,7 @@ class Ui_mainwind(object): self.cpuiarch.setSizePolicy(sizePolicy) self.cpuiarch.setMinimumSize(QtCore.QSize(110, 20)) self.cpuiarch.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuiarch.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuiarch.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuiarch.setObjectName("cpuiarch") self.cpuilb07 = QtWidgets.QLabel(self.cpuifrme) self.cpuilb07.setGeometry(QtCore.QRect(245, 120, 110, 15)) @@ -2467,7 +2465,7 @@ class Ui_mainwind(object): self.cpuiqant.setSizePolicy(sizePolicy) self.cpuiqant.setMinimumSize(QtCore.QSize(110, 20)) self.cpuiqant.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuiqant.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuiqant.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuiqant.setObjectName("cpuiqant") self.cpuiln05 = QtWidgets.QFrame(self.cpuifrme) self.cpuiln05.setGeometry(QtCore.QRect(5, 161, 110, 1)) @@ -2533,7 +2531,7 @@ class Ui_mainwind(object): self.cpuifmly.setSizePolicy(sizePolicy) self.cpuifmly.setMinimumSize(QtCore.QSize(110, 20)) self.cpuifmly.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuifmly.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuifmly.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuifmly.setObjectName("cpuifmly") self.cpuistep = QtWidgets.QLabel(self.cpuifrme) self.cpuistep.setGeometry(QtCore.QRect(5, 180, 110, 20)) @@ -2546,7 +2544,7 @@ class Ui_mainwind(object): self.cpuistep.setSizePolicy(sizePolicy) self.cpuistep.setMinimumSize(QtCore.QSize(110, 20)) self.cpuistep.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuistep.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuistep.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuistep.setObjectName("cpuistep") self.cpuilb08 = QtWidgets.QLabel(self.cpuifrme) self.cpuilb08.setGeometry(QtCore.QRect(5, 165, 110, 15)) @@ -2572,7 +2570,7 @@ class Ui_mainwind(object): self.cpuimodl.setSizePolicy(sizePolicy) self.cpuimodl.setMinimumSize(QtCore.QSize(110, 20)) self.cpuimodl.setMaximumSize(QtCore.QSize(110, 20)) - self.cpuimodl.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuimodl.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuimodl.setObjectName("cpuimodl") self.cpuifreq = QtWidgets.QLabel(self.cpuifrme) self.cpuifreq.setGeometry(QtCore.QRect(185, 90, 170, 20)) @@ -2585,7 +2583,7 @@ class Ui_mainwind(object): self.cpuifreq.setSizePolicy(sizePolicy) self.cpuifreq.setMinimumSize(QtCore.QSize(170, 20)) self.cpuifreq.setMaximumSize(QtCore.QSize(170, 20)) - self.cpuifreq.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cpuifreq.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cpuifreq.setObjectName("cpuifreq") self.cpuiln04 = QtWidgets.QFrame(self.cpuifrme) self.cpuiln04.setGeometry(QtCore.QRect(185, 115, 170, 1)) @@ -2669,7 +2667,7 @@ class Ui_mainwind(object): self.obsrpsut.setSizePolicy(sizePolicy) self.obsrpsut.setMinimumSize(QtCore.QSize(275, 20)) self.obsrpsut.setMaximumSize(QtCore.QSize(275, 20)) - self.obsrpsut.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrpsut.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrpsut.setObjectName("obsrpsut") self.obsrln05 = QtWidgets.QFrame(self.obsrfrme) self.obsrln05.setGeometry(QtCore.QRect(290, 160, 275, 1)) @@ -2723,7 +2721,7 @@ class Ui_mainwind(object): self.obsrpyqt.setSizePolicy(sizePolicy) self.obsrpyqt.setMinimumSize(QtCore.QSize(275, 20)) self.obsrpyqt.setMaximumSize(QtCore.QSize(275, 20)) - self.obsrpyqt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrpyqt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrpyqt.setObjectName("obsrpyqt") self.obsrlb07 = QtWidgets.QLabel(self.obsrfrme) self.obsrlb07.setGeometry(QtCore.QRect(290, 165, 275, 15)) @@ -2775,7 +2773,7 @@ class Ui_mainwind(object): self.obsrcpui.setSizePolicy(sizePolicy) self.obsrcpui.setMinimumSize(QtCore.QSize(275, 20)) self.obsrcpui.setMaximumSize(QtCore.QSize(275, 20)) - self.obsrcpui.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrcpui.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrcpui.setObjectName("obsrcpui") self.obsrdist = QtWidgets.QLabel(self.obsrfrme) self.obsrdist.setGeometry(QtCore.QRect(290, 180, 275, 20)) @@ -2788,7 +2786,7 @@ class Ui_mainwind(object): self.obsrdist.setSizePolicy(sizePolicy) self.obsrdist.setMinimumSize(QtCore.QSize(275, 20)) self.obsrdist.setMaximumSize(QtCore.QSize(275, 20)) - self.obsrdist.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrdist.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrdist.setObjectName("obsrdist") self.obsrpyth = QtWidgets.QLabel(self.obsrfrme) self.obsrpyth.setGeometry(QtCore.QRect(5, 90, 560, 20)) @@ -2801,7 +2799,7 @@ class Ui_mainwind(object): self.obsrpyth.setSizePolicy(sizePolicy) self.obsrpyth.setMinimumSize(QtCore.QSize(560, 20)) self.obsrpyth.setMaximumSize(QtCore.QSize(560, 20)) - self.obsrpyth.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrpyth.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrpyth.setObjectName("obsrpyth") self.obsrln03 = QtWidgets.QFrame(self.obsrfrme) self.obsrln03.setGeometry(QtCore.QRect(5, 115, 560, 1)) @@ -2868,7 +2866,7 @@ class Ui_mainwind(object): self.obsrvers.setSizePolicy(sizePolicy) self.obsrvers.setMinimumSize(QtCore.QSize(560, 20)) self.obsrvers.setMaximumSize(QtCore.QSize(560, 20)) - self.obsrvers.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.obsrvers.setStyleSheet('font: 13pt "Barlow"; border: none;') self.obsrvers.setObjectName("obsrvers") self.obsrln02 = QtWidgets.QFrame(self.obsrfrme) self.obsrln02.setGeometry(QtCore.QRect(5, 70, 560, 1)) @@ -2925,9 +2923,7 @@ class Ui_mainwind(object): self.fefllist.setSizePolicy(sizePolicy) self.fefllist.setMinimumSize(QtCore.QSize(350, 170)) self.fefllist.setMaximumSize(QtCore.QSize(350, 170)) - self.fefllist.setStyleSheet( - 'QListWidget::item{font: 10pt "Inter"; border-radius: 0px;} QListWidget::item:selected{background-color: rgba(0, 128, 128, 1);}' - ) + self.fefllist.setStyleSheet('font: 10pt "Inter"; border-radius: 0px;') self.fefllist.setObjectName("fefllist") self.fefllb01 = QtWidgets.QLabel(self.feflfrme) self.fefllb01.setGeometry(QtCore.QRect(5, 5, 350, 15)) @@ -2995,7 +2991,7 @@ class Ui_mainwind(object): self.cntbicon.setMinimumSize(QtCore.QSize(55, 55)) self.cntbicon.setMaximumSize(QtCore.QSize(55, 55)) self.cntbicon.setStyleSheet( - 'color: #008080; font: 900 35pt "Font Awesome 5 Free"; border: none;' + 'color: rgba(128, 128, 128, 1); font: 900 35pt "Font Awesome 5 Free"; border: none;' ) self.cntbicon.setScaledContents(False) self.cntbicon.setAlignment(QtCore.Qt.AlignCenter) @@ -3011,7 +3007,7 @@ class Ui_mainwind(object): self.cntbhead.setSizePolicy(sizePolicy) self.cntbhead.setMinimumSize(QtCore.QSize(925, 20)) self.cntbhead.setMaximumSize(QtCore.QSize(925, 20)) - self.cntbhead.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.cntbhead.setStyleSheet('font: 13pt "Barlow"; border: none;') self.cntbhead.setAlignment(QtCore.Qt.AlignCenter) self.cntbhead.setObjectName("cntbhead") self.cntbvers = QtWidgets.QLabel(self.cntbfrme) @@ -3068,7 +3064,7 @@ class Ui_mainwind(object): self.cntblabl.setSizePolicy(sizePolicy) self.cntblabl.setMinimumSize(QtCore.QSize(935, 20)) self.cntblabl.setMaximumSize(QtCore.QSize(935, 20)) - self.cntblabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cntblabl.setStyleSheet('font: 13pt "Barlow";') self.cntblabl.setObjectName("cntblabl") self.maintabw.addTab(self.cntbtabp, "") self.bottomfm = QtWidgets.QFrame(self.mainwdgt) @@ -3122,7 +3118,7 @@ class Ui_mainwind(object): self.compbutn.setMaximumSize(QtCore.QSize(30, 30)) self.compbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.compbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.compbutn.setDefault(False) self.compbutn.setFlat(False) @@ -3148,7 +3144,7 @@ class Ui_mainwind(object): ) self.kernvers.setObjectName("kernvers") self.swapfrme = QtWidgets.QFrame(self.bottomfm) - self.swapfrme.setGeometry(QtCore.QRect(740, 5, 100, 30)) + self.swapfrme.setGeometry(QtCore.QRect(770, 5, 85, 30)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3156,8 +3152,8 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.swapfrme.sizePolicy().hasHeightForWidth()) self.swapfrme.setSizePolicy(sizePolicy) - self.swapfrme.setMinimumSize(QtCore.QSize(100, 30)) - self.swapfrme.setMaximumSize(QtCore.QSize(100, 30)) + self.swapfrme.setMinimumSize(QtCore.QSize(85, 30)) + self.swapfrme.setMaximumSize(QtCore.QSize(85, 30)) self.swapfrme.setStyleSheet( "background-color: rgba(160, 160, 160, 0.5); border: none;" ) @@ -3178,13 +3174,13 @@ class Ui_mainwind(object): self.swapbutn.setMaximumSize(QtCore.QSize(30, 30)) self.swapbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.swapbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.swapbutn.setDefault(False) self.swapbutn.setFlat(False) self.swapbutn.setObjectName("swapbutn") self.swapperc = QtWidgets.QLabel(self.swapfrme) - self.swapperc.setGeometry(QtCore.QRect(35, 5, 60, 20)) + self.swapperc.setGeometry(QtCore.QRect(35, 5, 45, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3192,16 +3188,16 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.swapperc.sizePolicy().hasHeightForWidth()) self.swapperc.setSizePolicy(sizePolicy) - self.swapperc.setMinimumSize(QtCore.QSize(60, 20)) - self.swapperc.setMaximumSize(QtCore.QSize(60, 20)) + self.swapperc.setMinimumSize(QtCore.QSize(45, 20)) + self.swapperc.setMaximumSize(QtCore.QSize(45, 20)) font = QtGui.QFont() - font.setPointSize(15) + font.setPointSize(13) font.setBold(False) font.setItalic(False) self.swapperc.setFont(font) self.swapperc.setLayoutDirection(QtCore.Qt.LeftToRight) self.swapperc.setStyleSheet( - 'background-color: rgba(0, 0, 0, 0); border: none; font: 15pt "JetBrains Mono";' + 'background-color: rgba(0, 0, 0, 0); border: none; font: 13pt "Barlow";' ) self.swapperc.setTextFormat(QtCore.Qt.AutoText) self.swapperc.setAlignment( @@ -3209,7 +3205,7 @@ class Ui_mainwind(object): ) self.swapperc.setObjectName("swapperc") self.diskfrme = QtWidgets.QFrame(self.bottomfm) - self.diskfrme.setGeometry(QtCore.QRect(845, 5, 100, 30)) + self.diskfrme.setGeometry(QtCore.QRect(860, 5, 85, 30)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3217,8 +3213,8 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.diskfrme.sizePolicy().hasHeightForWidth()) self.diskfrme.setSizePolicy(sizePolicy) - self.diskfrme.setMinimumSize(QtCore.QSize(100, 30)) - self.diskfrme.setMaximumSize(QtCore.QSize(100, 30)) + self.diskfrme.setMinimumSize(QtCore.QSize(85, 30)) + self.diskfrme.setMaximumSize(QtCore.QSize(85, 30)) self.diskfrme.setStyleSheet( "background-color: rgba(160, 160, 160, 0.5); border: none;" ) @@ -3239,13 +3235,13 @@ class Ui_mainwind(object): self.diskbutn.setMaximumSize(QtCore.QSize(30, 30)) self.diskbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.diskbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.diskbutn.setDefault(False) self.diskbutn.setFlat(False) self.diskbutn.setObjectName("diskbutn") self.diskperc = QtWidgets.QLabel(self.diskfrme) - self.diskperc.setGeometry(QtCore.QRect(35, 5, 60, 20)) + self.diskperc.setGeometry(QtCore.QRect(35, 5, 45, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3253,16 +3249,16 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.diskperc.sizePolicy().hasHeightForWidth()) self.diskperc.setSizePolicy(sizePolicy) - self.diskperc.setMinimumSize(QtCore.QSize(60, 20)) - self.diskperc.setMaximumSize(QtCore.QSize(60, 20)) + self.diskperc.setMinimumSize(QtCore.QSize(45, 20)) + self.diskperc.setMaximumSize(QtCore.QSize(45, 20)) font = QtGui.QFont() - font.setPointSize(15) + font.setPointSize(13) font.setBold(False) font.setItalic(False) self.diskperc.setFont(font) self.diskperc.setLayoutDirection(QtCore.Qt.LeftToRight) self.diskperc.setStyleSheet( - 'background-color: rgba(0, 0, 0, 0); border: none; font: 15pt "JetBrains Mono";' + 'background-color: rgba(0, 0, 0, 0); border: none; font: 13pt "Barlow";' ) self.diskperc.setTextFormat(QtCore.Qt.AutoText) self.diskperc.setAlignment( @@ -3270,7 +3266,7 @@ class Ui_mainwind(object): ) self.diskperc.setObjectName("diskperc") self.memofrme = QtWidgets.QFrame(self.bottomfm) - self.memofrme.setGeometry(QtCore.QRect(635, 5, 100, 30)) + self.memofrme.setGeometry(QtCore.QRect(680, 5, 85, 30)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3278,8 +3274,8 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.memofrme.sizePolicy().hasHeightForWidth()) self.memofrme.setSizePolicy(sizePolicy) - self.memofrme.setMinimumSize(QtCore.QSize(100, 30)) - self.memofrme.setMaximumSize(QtCore.QSize(100, 30)) + self.memofrme.setMinimumSize(QtCore.QSize(85, 30)) + self.memofrme.setMaximumSize(QtCore.QSize(85, 30)) self.memofrme.setStyleSheet( "background-color: rgba(160, 160, 160, 0.5); border: none;" ) @@ -3300,13 +3296,13 @@ class Ui_mainwind(object): self.memobutn.setMaximumSize(QtCore.QSize(30, 30)) self.memobutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.memobutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.memobutn.setDefault(False) self.memobutn.setFlat(False) self.memobutn.setObjectName("memobutn") self.memoperc = QtWidgets.QLabel(self.memofrme) - self.memoperc.setGeometry(QtCore.QRect(35, 5, 60, 20)) + self.memoperc.setGeometry(QtCore.QRect(35, 5, 45, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3314,16 +3310,16 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.memoperc.sizePolicy().hasHeightForWidth()) self.memoperc.setSizePolicy(sizePolicy) - self.memoperc.setMinimumSize(QtCore.QSize(60, 20)) - self.memoperc.setMaximumSize(QtCore.QSize(60, 20)) + self.memoperc.setMinimumSize(QtCore.QSize(45, 20)) + self.memoperc.setMaximumSize(QtCore.QSize(45, 20)) font = QtGui.QFont() - font.setPointSize(15) + font.setPointSize(13) font.setBold(False) font.setItalic(False) self.memoperc.setFont(font) self.memoperc.setLayoutDirection(QtCore.Qt.LeftToRight) self.memoperc.setStyleSheet( - 'background-color: rgba(0, 0, 0, 0); border: none; font: 15pt "JetBrains Mono";' + 'background-color: rgba(0, 0, 0, 0); border: none; font: 13pt "Barlow";' ) self.memoperc.setTextFormat(QtCore.Qt.AutoText) self.memoperc.setAlignment( @@ -3331,7 +3327,7 @@ class Ui_mainwind(object): ) self.memoperc.setObjectName("memoperc") self.cpudfrme = QtWidgets.QFrame(self.bottomfm) - self.cpudfrme.setGeometry(QtCore.QRect(530, 5, 100, 30)) + self.cpudfrme.setGeometry(QtCore.QRect(590, 5, 85, 30)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3339,8 +3335,8 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cpudfrme.sizePolicy().hasHeightForWidth()) self.cpudfrme.setSizePolicy(sizePolicy) - self.cpudfrme.setMinimumSize(QtCore.QSize(100, 30)) - self.cpudfrme.setMaximumSize(QtCore.QSize(100, 30)) + self.cpudfrme.setMinimumSize(QtCore.QSize(85, 30)) + self.cpudfrme.setMaximumSize(QtCore.QSize(85, 30)) self.cpudfrme.setStyleSheet( "background-color: rgba(160, 160, 160, 0.5); border: none;" ) @@ -3361,13 +3357,13 @@ class Ui_mainwind(object): self.cpudbutn.setMaximumSize(QtCore.QSize(30, 30)) self.cpudbutn.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) self.cpudbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.cpudbutn.setDefault(False) self.cpudbutn.setFlat(False) self.cpudbutn.setObjectName("cpudbutn") self.cpudperc = QtWidgets.QLabel(self.cpudfrme) - self.cpudperc.setGeometry(QtCore.QRect(35, 5, 60, 20)) + self.cpudperc.setGeometry(QtCore.QRect(35, 5, 45, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -3375,16 +3371,16 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cpudperc.sizePolicy().hasHeightForWidth()) self.cpudperc.setSizePolicy(sizePolicy) - self.cpudperc.setMinimumSize(QtCore.QSize(60, 20)) - self.cpudperc.setMaximumSize(QtCore.QSize(50, 20)) + self.cpudperc.setMinimumSize(QtCore.QSize(45, 20)) + self.cpudperc.setMaximumSize(QtCore.QSize(45, 20)) font = QtGui.QFont() - font.setPointSize(15) + font.setPointSize(13) font.setBold(False) font.setItalic(False) self.cpudperc.setFont(font) self.cpudperc.setLayoutDirection(QtCore.Qt.LeftToRight) self.cpudperc.setStyleSheet( - 'background-color: rgba(0, 0, 0, 0); border: none; font: 15pt "JetBrains Mono";' + 'background-color: rgba(0, 0, 0, 0); border: none; font: 13pt "Barlow";' ) self.cpudperc.setTextFormat(QtCore.Qt.AutoText) self.cpudperc.setAlignment( diff --git a/obserware/sources/screens/phptwind/interface.py b/obserware/sources/screens/phptwind/interface.py index ded6737..db61280 100644 --- a/obserware/sources/screens/phptwind/interface.py +++ b/obserware/sources/screens/phptwind/interface.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_phptwind(object): def setupUi(self, phptwind): phptwind.setObjectName("phptwind") - phptwind.resize(480, 400) + phptwind.resize(450, 400) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_phptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(phptwind.sizePolicy().hasHeightForWidth()) phptwind.setSizePolicy(sizePolicy) - phptwind.setMinimumSize(QtCore.QSize(480, 400)) - phptwind.setMaximumSize(QtCore.QSize(480, 400)) + phptwind.setMinimumSize(QtCore.QSize(450, 400)) + phptwind.setMaximumSize(QtCore.QSize(450, 400)) self.phptqant = QtWidgets.QLabel(phptwind) - self.phptqant.setGeometry(QtCore.QRect(245, 5, 230, 20)) + self.phptqant.setGeometry(QtCore.QRect(230, 5, 215, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -33,15 +33,15 @@ class Ui_phptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptqant.sizePolicy().hasHeightForWidth()) self.phptqant.setSizePolicy(sizePolicy) - self.phptqant.setMinimumSize(QtCore.QSize(230, 20)) - self.phptqant.setMaximumSize(QtCore.QSize(230, 20)) - self.phptqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.phptqant.setMinimumSize(QtCore.QSize(215, 20)) + self.phptqant.setMaximumSize(QtCore.QSize(215, 20)) + self.phptqant.setStyleSheet('font: 13pt "Barlow";') self.phptqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) self.phptqant.setObjectName("phptqant") self.phptlabl = QtWidgets.QLabel(phptwind) - self.phptlabl.setGeometry(QtCore.QRect(5, 5, 230, 20)) + self.phptlabl.setGeometry(QtCore.QRect(5, 5, 215, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -49,12 +49,12 @@ class Ui_phptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptlabl.sizePolicy().hasHeightForWidth()) self.phptlabl.setSizePolicy(sizePolicy) - self.phptlabl.setMinimumSize(QtCore.QSize(230, 20)) - self.phptlabl.setMaximumSize(QtCore.QSize(230, 20)) - self.phptlabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.phptlabl.setMinimumSize(QtCore.QSize(215, 20)) + self.phptlabl.setMaximumSize(QtCore.QSize(215, 20)) + self.phptlabl.setStyleSheet('font: 13pt "Barlow";') self.phptlabl.setObjectName("phptlabl") self.phptline = QtWidgets.QFrame(phptwind) - self.phptline.setGeometry(QtCore.QRect(5, 30, 470, 1)) + self.phptline.setGeometry(QtCore.QRect(5, 30, 440, 1)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -62,15 +62,15 @@ class Ui_phptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptline.sizePolicy().hasHeightForWidth()) self.phptline.setSizePolicy(sizePolicy) - self.phptline.setMinimumSize(QtCore.QSize(470, 1)) - self.phptline.setMaximumSize(QtCore.QSize(470, 1)) + self.phptline.setMinimumSize(QtCore.QSize(440, 1)) + self.phptline.setMaximumSize(QtCore.QSize(440, 1)) self.phptline.setStyleSheet("border: 1px solid #808080;") self.phptline.setFrameShape(QtWidgets.QFrame.HLine) self.phptline.setFrameShadow(QtWidgets.QFrame.Sunken) self.phptline.setObjectName("phptline") self.phptlist = QtWidgets.QListWidget(phptwind) self.phptlist.setEnabled(True) - self.phptlist.setGeometry(QtCore.QRect(5, 35, 470, 360)) + self.phptlist.setGeometry(QtCore.QRect(5, 35, 440, 360)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -78,8 +78,8 @@ class Ui_phptwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptlist.sizePolicy().hasHeightForWidth()) self.phptlist.setSizePolicy(sizePolicy) - self.phptlist.setMinimumSize(QtCore.QSize(470, 360)) - self.phptlist.setMaximumSize(QtCore.QSize(470, 360)) + self.phptlist.setMinimumSize(QtCore.QSize(440, 360)) + self.phptlist.setMaximumSize(QtCore.QSize(440, 360)) self.phptlist.setFocusPolicy(QtCore.Qt.NoFocus) self.phptlist.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.phptlist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) diff --git a/obserware/sources/screens/procwind/interface.py b/obserware/sources/screens/procwind/interface.py index 688d5da..7bc2d3c 100644 --- a/obserware/sources/screens/procwind/interface.py +++ b/obserware/sources/screens/procwind/interface.py @@ -49,7 +49,7 @@ class Ui_procwind(object): self.procname.setSizePolicy(sizePolicy) self.procname.setMinimumSize(QtCore.QSize(310, 20)) self.procname.setMaximumSize(QtCore.QSize(310, 20)) - self.procname.setStyleSheet('font: 15pt "JetBrains Mono";') + self.procname.setStyleSheet('font: 13pt "Barlow";') self.procname.setObjectName("procname") self.pcidfrme = QtWidgets.QFrame(self.procwdgt) self.pcidfrme.setGeometry(QtCore.QRect(5, 35, 310, 30)) @@ -81,7 +81,7 @@ class Ui_procwind(object): self.pcidbutn.setMinimumSize(QtCore.QSize(30, 30)) self.pcidbutn.setMaximumSize(QtCore.QSize(30, 30)) self.pcidbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.pcidbutn.setObjectName("pcidbutn") self.pcidtext = QtWidgets.QLabel(self.pcidfrme) @@ -96,7 +96,7 @@ class Ui_procwind(object): self.pcidtext.setMinimumSize(QtCore.QSize(270, 20)) self.pcidtext.setMaximumSize(QtCore.QSize(27, 20)) self.pcidtext.setStyleSheet( - 'font: 15pt "JetBrains Mono"; background-color: rgba(0, 0, 0, 0);' + 'font: 13pt "Barlow"; background-color: rgba(0, 0, 0, 0);' ) self.pcidtext.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter @@ -147,7 +147,7 @@ class Ui_procwind(object): self.cpudbutn.setMinimumSize(QtCore.QSize(30, 30)) self.cpudbutn.setMaximumSize(QtCore.QSize(30, 30)) self.cpudbutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.cpudbutn.setObjectName("cpudbutn") self.cpudtext = QtWidgets.QLabel(self.cpudfrme) @@ -162,7 +162,7 @@ class Ui_procwind(object): self.cpudtext.setMinimumSize(QtCore.QSize(110, 20)) self.cpudtext.setMaximumSize(QtCore.QSize(110, 20)) self.cpudtext.setStyleSheet( - 'font: 15pt "JetBrains Mono"; background-color: rgba(0, 0, 0, 0);' + 'font: 13pt "Barlow"; background-color: rgba(0, 0, 0, 0);' ) self.cpudtext.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter @@ -198,7 +198,7 @@ class Ui_procwind(object): self.memobutn.setMinimumSize(QtCore.QSize(30, 30)) self.memobutn.setMaximumSize(QtCore.QSize(30, 30)) self.memobutn.setStyleSheet( - 'background-color: #008080; color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' + 'background-color: rgba(128, 128, 128, 1); color: #ffffff; font: 900 15pt "Font Awesome 5 Free"; border: none;' ) self.memobutn.setObjectName("memobutn") self.memotext = QtWidgets.QLabel(self.memofrme) @@ -213,7 +213,7 @@ class Ui_procwind(object): self.memotext.setMinimumSize(QtCore.QSize(110, 20)) self.memotext.setMaximumSize(QtCore.QSize(110, 20)) self.memotext.setStyleSheet( - 'font: 15pt "JetBrains Mono"; background-color: rgba(0, 0, 0, 0);' + 'font: 13pt "Barlow"; background-color: rgba(0, 0, 0, 0);' ) self.memotext.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter @@ -262,7 +262,7 @@ class Ui_procwind(object): self.procccnm.setSizePolicy(sizePolicy) self.procccnm.setMinimumSize(QtCore.QSize(145, 20)) self.procccnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procccnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procccnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procccnm.setObjectName("procccnm") self.proccclb = QtWidgets.QLabel(self.procmnfm) self.proccclb.setGeometry(QtCore.QRect(5, 5, 145, 15)) @@ -301,7 +301,7 @@ class Ui_procwind(object): self.proctcnm.setSizePolicy(sizePolicy) self.proctcnm.setMinimumSize(QtCore.QSize(145, 20)) self.proctcnm.setMaximumSize(QtCore.QSize(145, 20)) - self.proctcnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.proctcnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.proctcnm.setObjectName("proctcnm") self.procln03 = QtWidgets.QFrame(self.procmnfm) self.procln03.setGeometry(QtCore.QRect(5, 45, 145, 1)) @@ -369,7 +369,7 @@ class Ui_procwind(object): self.proccbnm.setSizePolicy(sizePolicy) self.proccbnm.setMinimumSize(QtCore.QSize(145, 20)) self.proccbnm.setMaximumSize(QtCore.QSize(145, 20)) - self.proccbnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.proccbnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.proccbnm.setObjectName("proccbnm") self.procln06 = QtWidgets.QFrame(self.procmnfm) self.procln06.setGeometry(QtCore.QRect(160, 90, 145, 1)) @@ -409,7 +409,7 @@ class Ui_procwind(object): self.proctmnm.setSizePolicy(sizePolicy) self.proctmnm.setMinimumSize(QtCore.QSize(145, 20)) self.proctmnm.setMaximumSize(QtCore.QSize(145, 20)) - self.proctmnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.proctmnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.proctmnm.setObjectName("proctmnm") self.procepnm = QtWidgets.QLabel(self.procmnfm) self.procepnm.setGeometry(QtCore.QRect(5, 110, 145, 20)) @@ -422,7 +422,7 @@ class Ui_procwind(object): self.procepnm.setSizePolicy(sizePolicy) self.procepnm.setMinimumSize(QtCore.QSize(145, 20)) self.procepnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procepnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procepnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procepnm.setObjectName("procepnm") self.proceplb = QtWidgets.QLabel(self.procmnfm) self.proceplb.setGeometry(QtCore.QRect(5, 95, 145, 15)) @@ -489,7 +489,7 @@ class Ui_procwind(object): self.procipnm.setSizePolicy(sizePolicy) self.procipnm.setMinimumSize(QtCore.QSize(145, 20)) self.procipnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procipnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procipnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procipnm.setObjectName("procipnm") self.procln10 = QtWidgets.QFrame(self.procmnfm) self.procln10.setGeometry(QtCore.QRect(160, 180, 145, 1)) @@ -542,7 +542,7 @@ class Ui_procwind(object): self.procicnm.setSizePolicy(sizePolicy) self.procicnm.setMinimumSize(QtCore.QSize(145, 20)) self.procicnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procicnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procicnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procicnm.setObjectName("procicnm") self.procln09 = QtWidgets.QFrame(self.procmnfm) self.procln09.setGeometry(QtCore.QRect(5, 180, 145, 1)) @@ -569,7 +569,7 @@ class Ui_procwind(object): self.procvcnm.setSizePolicy(sizePolicy) self.procvcnm.setMinimumSize(QtCore.QSize(145, 20)) self.procvcnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procvcnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procvcnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procvcnm.setObjectName("procvcnm") self.procppnm = QtWidgets.QLabel(self.procmnfm) self.procppnm.setGeometry(QtCore.QRect(5, 200, 145, 20)) @@ -582,7 +582,7 @@ class Ui_procwind(object): self.procppnm.setSizePolicy(sizePolicy) self.procppnm.setMinimumSize(QtCore.QSize(145, 20)) self.procppnm.setMaximumSize(QtCore.QSize(145, 20)) - self.procppnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procppnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procppnm.setObjectName("procppnm") self.procln11 = QtWidgets.QFrame(self.procmnfm) self.procln11.setGeometry(QtCore.QRect(5, 225, 145, 1)) @@ -649,7 +649,7 @@ class Ui_procwind(object): self.procsenm.setSizePolicy(sizePolicy) self.procsenm.setMinimumSize(QtCore.QSize(145, 20)) self.procsenm.setMaximumSize(QtCore.QSize(145, 20)) - self.procsenm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procsenm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procsenm.setObjectName("procsenm") self.procstlb = QtWidgets.QLabel(self.procmnfm) self.procstlb.setGeometry(QtCore.QRect(5, 230, 300, 15)) @@ -675,7 +675,7 @@ class Ui_procwind(object): self.procstnm.setSizePolicy(sizePolicy) self.procstnm.setMinimumSize(QtCore.QSize(300, 20)) self.procstnm.setMaximumSize(QtCore.QSize(300, 20)) - self.procstnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.procstnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.procstnm.setObjectName("procstnm") self.procln13 = QtWidgets.QFrame(self.procmnfm) self.procln13.setGeometry(QtCore.QRect(5, 270, 300, 1)) diff --git a/obserware/sources/screens/sostwind/interface.py b/obserware/sources/screens/sostwind/interface.py index 2e94d61..d1b8d06 100644 --- a/obserware/sources/screens/sostwind/interface.py +++ b/obserware/sources/screens/sostwind/interface.py @@ -64,7 +64,7 @@ class Ui_sostwind(object): self.sostlabl.setSizePolicy(sizePolicy) self.sostlabl.setMinimumSize(QtCore.QSize(205, 20)) self.sostlabl.setMaximumSize(QtCore.QSize(205, 20)) - self.sostlabl.setStyleSheet('font: 15pt "JetBrains Mono";') + self.sostlabl.setStyleSheet('font: 13pt "Barlow";') self.sostlabl.setObjectName("sostlabl") self.sostqant = QtWidgets.QLabel(self.sostwdgt) self.sostqant.setGeometry(QtCore.QRect(270, 5, 205, 20)) @@ -77,7 +77,7 @@ class Ui_sostwind(object): self.sostqant.setSizePolicy(sizePolicy) self.sostqant.setMinimumSize(QtCore.QSize(205, 20)) self.sostqant.setMaximumSize(QtCore.QSize(205, 20)) - self.sostqant.setStyleSheet('font: 15pt "JetBrains Mono";') + self.sostqant.setStyleSheet('font: 13pt "Barlow";') self.sostqant.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) @@ -121,7 +121,7 @@ class Ui_sostwind(object): self.soctwtnm.setSizePolicy(sizePolicy) self.soctwtnm.setMinimumSize(QtCore.QSize(150, 20)) self.soctwtnm.setMaximumSize(QtCore.QSize(150, 20)) - self.soctwtnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.soctwtnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.soctwtnm.setObjectName("soctwtnm") self.soctrdlb = QtWidgets.QLabel(self.frame) self.soctrdlb.setGeometry(QtCore.QRect(155, 5, 150, 15)) @@ -147,7 +147,7 @@ class Ui_sostwind(object): self.soctrdnm.setSizePolicy(sizePolicy) self.soctrdnm.setMinimumSize(QtCore.QSize(150, 20)) self.soctrdnm.setMaximumSize(QtCore.QSize(150, 20)) - self.soctrdnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.soctrdnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.soctrdnm.setObjectName("soctrdnm") self.sostln01 = QtWidgets.QFrame(self.frame) self.sostln01.setGeometry(QtCore.QRect(155, 45, 150, 1)) @@ -215,7 +215,7 @@ class Ui_sostwind(object): self.sobsrdnm.setSizePolicy(sizePolicy) self.sobsrdnm.setMinimumSize(QtCore.QSize(150, 20)) self.sobsrdnm.setMaximumSize(QtCore.QSize(150, 20)) - self.sobsrdnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.sobsrdnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.sobsrdnm.setObjectName("sobsrdnm") self.sostln05 = QtWidgets.QFrame(self.frame) self.sostln05.setGeometry(QtCore.QRect(315, 90, 150, 1)) @@ -255,7 +255,7 @@ class Ui_sostwind(object): self.sobswtnm.setSizePolicy(sizePolicy) self.sobswtnm.setMinimumSize(QtCore.QSize(150, 20)) self.sobswtnm.setMaximumSize(QtCore.QSize(150, 20)) - self.sobswtnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.sobswtnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.sobswtnm.setObjectName("sobswtnm") self.sostln08 = QtWidgets.QFrame(self.frame) self.sostln08.setGeometry(QtCore.QRect(315, 135, 150, 1)) @@ -296,7 +296,7 @@ class Ui_sostwind(object): self.sotmwtnm.setSizePolicy(sizePolicy) self.sotmwtnm.setMinimumSize(QtCore.QSize(150, 20)) self.sotmwtnm.setMaximumSize(QtCore.QSize(150, 20)) - self.sotmwtnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.sotmwtnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.sotmwtnm.setObjectName("sotmwtnm") self.somcrdnm = QtWidgets.QLabel(self.frame) self.somcrdnm.setGeometry(QtCore.QRect(155, 155, 150, 20)) @@ -309,7 +309,7 @@ class Ui_sostwind(object): self.somcrdnm.setSizePolicy(sizePolicy) self.somcrdnm.setMinimumSize(QtCore.QSize(150, 20)) self.somcrdnm.setMaximumSize(QtCore.QSize(150, 20)) - self.somcrdnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.somcrdnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.somcrdnm.setObjectName("somcrdnm") self.sostln07 = QtWidgets.QFrame(self.frame) self.sostln07.setGeometry(QtCore.QRect(155, 135, 150, 1)) @@ -389,7 +389,7 @@ class Ui_sostwind(object): self.sotmrdnm.setSizePolicy(sizePolicy) self.sotmrdnm.setMinimumSize(QtCore.QSize(150, 20)) self.sotmrdnm.setMaximumSize(QtCore.QSize(150, 20)) - self.sotmrdnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.sotmrdnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.sotmrdnm.setObjectName("sotmrdnm") self.somcwtnm = QtWidgets.QLabel(self.frame) self.somcwtnm.setGeometry(QtCore.QRect(315, 155, 150, 20)) @@ -402,7 +402,7 @@ class Ui_sostwind(object): self.somcwtnm.setSizePolicy(sizePolicy) self.somcwtnm.setMinimumSize(QtCore.QSize(150, 20)) self.somcwtnm.setMaximumSize(QtCore.QSize(150, 20)) - self.somcwtnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.somcwtnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.somcwtnm.setObjectName("somcwtnm") self.somcrdlb = QtWidgets.QLabel(self.frame) self.somcrdlb.setGeometry(QtCore.QRect(155, 140, 150, 15)) @@ -562,7 +562,7 @@ class Ui_sostwind(object): self.sostbtnm.setSizePolicy(sizePolicy) self.sostbtnm.setMinimumSize(QtCore.QSize(150, 20)) self.sostbtnm.setMaximumSize(QtCore.QSize(150, 20)) - self.sostbtnm.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.sostbtnm.setStyleSheet('font: 13pt "Barlow"; border: none;') self.sostbtnm.setObjectName("sostbtnm") self.retranslateUi(sostwind) diff --git a/obserware/sources/widgets/cputwdgt/interface.py b/obserware/sources/widgets/cputwdgt/interface.py index 54a1ece..fec7996 100644 --- a/obserware/sources/widgets/cputwdgt/interface.py +++ b/obserware/sources/widgets/cputwdgt/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/cputwdgt.ui' +# Form implementation generated from reading ui file 'assets/uifiles/cputwdgt.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_cputwdgt(object): def setupUi(self, cputwdgt): cputwdgt.setObjectName("cputwdgt") - cputwdgt.resize(590, 250) + cputwdgt.resize(560, 250) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,11 +22,11 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(cputwdgt.sizePolicy().hasHeightForWidth()) cputwdgt.setSizePolicy(sizePolicy) - cputwdgt.setMinimumSize(QtCore.QSize(590, 250)) - cputwdgt.setMaximumSize(QtCore.QSize(590, 250)) - cputwdgt.setStyleSheet("background: transparent;") + cputwdgt.setMinimumSize(QtCore.QSize(560, 250)) + cputwdgt.setMaximumSize(QtCore.QSize(560, 250)) + cputwdgt.setStyleSheet("") self.cputperc = QtWidgets.QLabel(cputwdgt) - self.cputperc.setGeometry(QtCore.QRect(70, 5, 515, 20)) + self.cputperc.setGeometry(QtCore.QRect(55, 5, 500, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -34,12 +34,12 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputperc.sizePolicy().hasHeightForWidth()) 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";') + self.cputperc.setMinimumSize(QtCore.QSize(500, 20)) + self.cputperc.setMaximumSize(QtCore.QSize(500, 20)) + self.cputperc.setStyleSheet('font: 13pt "Barlow";') self.cputperc.setObjectName("cputperc") self.cputxtra = QtWidgets.QLabel(cputwdgt) - self.cputxtra.setGeometry(QtCore.QRect(70, 30, 515, 15)) + self.cputxtra.setGeometry(QtCore.QRect(55, 30, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -47,8 +47,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputxtra.sizePolicy().hasHeightForWidth()) self.cputxtra.setSizePolicy(sizePolicy) - self.cputxtra.setMinimumSize(QtCore.QSize(515, 15)) - self.cputxtra.setMaximumSize(QtCore.QSize(515, 15)) + self.cputxtra.setMinimumSize(QtCore.QSize(500, 15)) + self.cputxtra.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -57,7 +57,7 @@ class Ui_cputwdgt(object): self.cputxtra.setStyleSheet('font: 10pt "Inter";') self.cputxtra.setObjectName("cputxtra") self.cputnumb = QtWidgets.QLabel(cputwdgt) - self.cputnumb.setGeometry(QtCore.QRect(5, 5, 55, 20)) + self.cputnumb.setGeometry(QtCore.QRect(5, 5, 40, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -65,16 +65,16 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputnumb.sizePolicy().hasHeightForWidth()) 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";') + self.cputnumb.setMinimumSize(QtCore.QSize(40, 20)) + self.cputnumb.setMaximumSize(QtCore.QSize(40, 20)) + self.cputnumb.setStyleSheet('font: 13pt "Barlow";') self.cputnumb.setFrameShape(QtWidgets.QFrame.NoFrame) self.cputnumb.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.cputnumb.setObjectName("cputnumb") self.cputlabl = QtWidgets.QLabel(cputwdgt) - self.cputlabl.setGeometry(QtCore.QRect(5, 30, 55, 15)) + self.cputlabl.setGeometry(QtCore.QRect(5, 30, 40, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -82,8 +82,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputlabl.sizePolicy().hasHeightForWidth()) self.cputlabl.setSizePolicy(sizePolicy) - self.cputlabl.setMinimumSize(QtCore.QSize(55, 15)) - self.cputlabl.setMaximumSize(QtCore.QSize(55, 15)) + self.cputlabl.setMinimumSize(QtCore.QSize(40, 15)) + self.cputlabl.setMaximumSize(QtCore.QSize(40, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -91,11 +91,11 @@ class Ui_cputwdgt(object): self.cputlabl.setFont(font) self.cputlabl.setStyleSheet('font: 10pt "Inter";') self.cputlabl.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.cputlabl.setObjectName("cputlabl") self.cputline = QtWidgets.QFrame(cputwdgt) - self.cputline.setGeometry(QtCore.QRect(65, 5, 1, 240)) + self.cputline.setGeometry(QtCore.QRect(50, 5, 1, 240)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -110,7 +110,7 @@ class Ui_cputwdgt(object): self.cputline.setFrameShadow(QtWidgets.QFrame.Sunken) self.cputline.setObjectName("cputline") self.cputusnm = QtWidgets.QLabel(cputwdgt) - self.cputusnm.setGeometry(QtCore.QRect(70, 50, 515, 15)) + self.cputusnm.setGeometry(QtCore.QRect(55, 50, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -118,8 +118,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputusnm.sizePolicy().hasHeightForWidth()) self.cputusnm.setSizePolicy(sizePolicy) - self.cputusnm.setMinimumSize(QtCore.QSize(515, 15)) - self.cputusnm.setMaximumSize(QtCore.QSize(515, 15)) + self.cputusnm.setMinimumSize(QtCore.QSize(500, 15)) + self.cputusnm.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -128,7 +128,7 @@ class Ui_cputwdgt(object): self.cputusnm.setStyleSheet('font: 10pt "Inter";') self.cputusnm.setObjectName("cputusnm") self.cputuspr = QtWidgets.QLabel(cputwdgt) - self.cputuspr.setGeometry(QtCore.QRect(70, 70, 515, 15)) + self.cputuspr.setGeometry(QtCore.QRect(55, 70, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -136,8 +136,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputuspr.sizePolicy().hasHeightForWidth()) self.cputuspr.setSizePolicy(sizePolicy) - self.cputuspr.setMinimumSize(QtCore.QSize(515, 15)) - self.cputuspr.setMaximumSize(QtCore.QSize(515, 15)) + self.cputuspr.setMinimumSize(QtCore.QSize(500, 15)) + self.cputuspr.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -146,7 +146,7 @@ class Ui_cputwdgt(object): self.cputuspr.setStyleSheet('font: 10pt "Inter";') self.cputuspr.setObjectName("cputuspr") self.cputkrnm = QtWidgets.QLabel(cputwdgt) - self.cputkrnm.setGeometry(QtCore.QRect(70, 90, 515, 15)) + self.cputkrnm.setGeometry(QtCore.QRect(55, 90, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -154,8 +154,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputkrnm.sizePolicy().hasHeightForWidth()) self.cputkrnm.setSizePolicy(sizePolicy) - self.cputkrnm.setMinimumSize(QtCore.QSize(515, 15)) - self.cputkrnm.setMaximumSize(QtCore.QSize(515, 15)) + self.cputkrnm.setMinimumSize(QtCore.QSize(500, 15)) + self.cputkrnm.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -164,7 +164,7 @@ class Ui_cputwdgt(object): self.cputkrnm.setStyleSheet('font: 10pt "Inter";') self.cputkrnm.setObjectName("cputkrnm") self.cputnull = QtWidgets.QLabel(cputwdgt) - self.cputnull.setGeometry(QtCore.QRect(70, 110, 515, 15)) + self.cputnull.setGeometry(QtCore.QRect(55, 110, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -172,8 +172,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputnull.sizePolicy().hasHeightForWidth()) self.cputnull.setSizePolicy(sizePolicy) - self.cputnull.setMinimumSize(QtCore.QSize(515, 15)) - self.cputnull.setMaximumSize(QtCore.QSize(515, 15)) + self.cputnull.setMinimumSize(QtCore.QSize(500, 15)) + self.cputnull.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -182,7 +182,7 @@ class Ui_cputwdgt(object): self.cputnull.setStyleSheet('font: 10pt "Inter";') self.cputnull.setObjectName("cputnull") self.cputiowt = QtWidgets.QLabel(cputwdgt) - self.cputiowt.setGeometry(QtCore.QRect(70, 130, 515, 15)) + self.cputiowt.setGeometry(QtCore.QRect(55, 130, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -190,8 +190,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputiowt.sizePolicy().hasHeightForWidth()) self.cputiowt.setSizePolicy(sizePolicy) - self.cputiowt.setMinimumSize(QtCore.QSize(515, 15)) - self.cputiowt.setMaximumSize(QtCore.QSize(515, 15)) + self.cputiowt.setMinimumSize(QtCore.QSize(500, 15)) + self.cputiowt.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -200,7 +200,7 @@ class Ui_cputwdgt(object): self.cputiowt.setStyleSheet('font: 10pt "Inter";') self.cputiowt.setObjectName("cputiowt") self.cputhirq = QtWidgets.QLabel(cputwdgt) - self.cputhirq.setGeometry(QtCore.QRect(70, 150, 515, 15)) + self.cputhirq.setGeometry(QtCore.QRect(55, 150, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -208,8 +208,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputhirq.sizePolicy().hasHeightForWidth()) self.cputhirq.setSizePolicy(sizePolicy) - self.cputhirq.setMinimumSize(QtCore.QSize(515, 15)) - self.cputhirq.setMaximumSize(QtCore.QSize(515, 15)) + self.cputhirq.setMinimumSize(QtCore.QSize(500, 15)) + self.cputhirq.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -218,7 +218,7 @@ class Ui_cputwdgt(object): self.cputhirq.setStyleSheet('font: 10pt "Inter";') self.cputhirq.setObjectName("cputhirq") self.cputsirq = QtWidgets.QLabel(cputwdgt) - self.cputsirq.setGeometry(QtCore.QRect(70, 170, 515, 15)) + self.cputsirq.setGeometry(QtCore.QRect(55, 170, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -226,8 +226,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputsirq.sizePolicy().hasHeightForWidth()) self.cputsirq.setSizePolicy(sizePolicy) - self.cputsirq.setMinimumSize(QtCore.QSize(515, 15)) - self.cputsirq.setMaximumSize(QtCore.QSize(515, 15)) + self.cputsirq.setMinimumSize(QtCore.QSize(500, 15)) + self.cputsirq.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -236,7 +236,7 @@ class Ui_cputwdgt(object): self.cputsirq.setStyleSheet('font: 10pt "Inter";') self.cputsirq.setObjectName("cputsirq") self.cputvirt = QtWidgets.QLabel(cputwdgt) - self.cputvirt.setGeometry(QtCore.QRect(70, 190, 515, 15)) + self.cputvirt.setGeometry(QtCore.QRect(55, 190, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -244,8 +244,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputvirt.sizePolicy().hasHeightForWidth()) self.cputvirt.setSizePolicy(sizePolicy) - self.cputvirt.setMinimumSize(QtCore.QSize(515, 15)) - self.cputvirt.setMaximumSize(QtCore.QSize(515, 15)) + self.cputvirt.setMinimumSize(QtCore.QSize(500, 15)) + self.cputvirt.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -254,7 +254,7 @@ class Ui_cputwdgt(object): self.cputvirt.setStyleSheet('font: 10pt "Inter";') self.cputvirt.setObjectName("cputvirt") self.cputgest = QtWidgets.QLabel(cputwdgt) - self.cputgest.setGeometry(QtCore.QRect(70, 210, 515, 15)) + self.cputgest.setGeometry(QtCore.QRect(55, 210, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -262,8 +262,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputgest.sizePolicy().hasHeightForWidth()) self.cputgest.setSizePolicy(sizePolicy) - self.cputgest.setMinimumSize(QtCore.QSize(515, 15)) - self.cputgest.setMaximumSize(QtCore.QSize(515, 15)) + self.cputgest.setMinimumSize(QtCore.QSize(500, 15)) + self.cputgest.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -272,7 +272,7 @@ class Ui_cputwdgt(object): self.cputgest.setStyleSheet('font: 10pt "Inter";') self.cputgest.setObjectName("cputgest") self.cputgtnc = QtWidgets.QLabel(cputwdgt) - self.cputgtnc.setGeometry(QtCore.QRect(70, 230, 515, 15)) + self.cputgtnc.setGeometry(QtCore.QRect(55, 230, 500, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -280,8 +280,8 @@ class Ui_cputwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cputgtnc.sizePolicy().hasHeightForWidth()) self.cputgtnc.setSizePolicy(sizePolicy) - self.cputgtnc.setMinimumSize(QtCore.QSize(515, 15)) - self.cputgtnc.setMaximumSize(QtCore.QSize(515, 15)) + self.cputgtnc.setMinimumSize(QtCore.QSize(500, 15)) + self.cputgtnc.setMaximumSize(QtCore.QSize(500, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -298,7 +298,7 @@ class Ui_cputwdgt(object): cputwdgt.setWindowTitle(_translate("cputwdgt", "Form")) self.cputperc.setText(_translate("cputwdgt", "000%")) self.cputxtra.setText(_translate("cputwdgt", "Time spent in")) - self.cputnumb.setText(_translate("cputwdgt", "0000")) + self.cputnumb.setText(_translate("cputwdgt", "0")) self.cputlabl.setText(_translate("cputwdgt", "#CPU")) self.cputusnm.setText( _translate( diff --git a/obserware/sources/widgets/cyclwdgt/interface.py b/obserware/sources/widgets/cyclwdgt/interface.py index d3c7a27..0548032 100644 --- a/obserware/sources/widgets/cyclwdgt/interface.py +++ b/obserware/sources/widgets/cyclwdgt/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/cyclwdgt.ui' +# Form implementation generated from reading ui file 'assets/uifiles/cyclwdgt.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_cyclwdgt(object): def setupUi(self, cyclwdgt): cyclwdgt.setObjectName("cyclwdgt") - cyclwdgt.resize(470, 50) + cyclwdgt.resize(350, 50) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,11 +22,11 @@ class Ui_cyclwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(cyclwdgt.sizePolicy().hasHeightForWidth()) cyclwdgt.setSizePolicy(sizePolicy) - cyclwdgt.setMinimumSize(QtCore.QSize(470, 50)) - cyclwdgt.setMaximumSize(QtCore.QSize(470, 50)) - cyclwdgt.setStyleSheet("background: transparent;") + cyclwdgt.setMinimumSize(QtCore.QSize(350, 50)) + cyclwdgt.setMaximumSize(QtCore.QSize(350, 50)) + cyclwdgt.setStyleSheet("") self.cyclcurt = QtWidgets.QLabel(cyclwdgt) - self.cyclcurt.setGeometry(QtCore.QRect(110, 5, 355, 20)) + self.cyclcurt.setGeometry(QtCore.QRect(110, 5, 235, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -34,12 +34,12 @@ class Ui_cyclwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cyclcurt.sizePolicy().hasHeightForWidth()) self.cyclcurt.setSizePolicy(sizePolicy) - self.cyclcurt.setMinimumSize(QtCore.QSize(355, 20)) - self.cyclcurt.setMaximumSize(QtCore.QSize(355, 20)) - self.cyclcurt.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cyclcurt.setMinimumSize(QtCore.QSize(235, 20)) + self.cyclcurt.setMaximumSize(QtCore.QSize(235, 20)) + self.cyclcurt.setStyleSheet('font: 13pt "Barlow";') self.cyclcurt.setObjectName("cyclcurt") self.cyclgraf = QChartView(cyclwdgt) - self.cyclgraf.setGeometry(QtCore.QRect(65, 5, 40, 40)) + self.cyclgraf.setGeometry(QtCore.QRect(55, 5, 40, 40)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -48,10 +48,10 @@ class Ui_cyclwdgt(object): sizePolicy.setHeightForWidth(self.cyclgraf.sizePolicy().hasHeightForWidth()) self.cyclgraf.setSizePolicy(sizePolicy) self.cyclgraf.setMaximumSize(QtCore.QSize(40, 40)) - self.cyclgraf.setStyleSheet("border: none;") + self.cyclgraf.setStyleSheet("background: transparent; border: none;") self.cyclgraf.setObjectName("cyclgraf") self.cyclxtra = QtWidgets.QLabel(cyclwdgt) - self.cyclxtra.setGeometry(QtCore.QRect(110, 30, 355, 15)) + self.cyclxtra.setGeometry(QtCore.QRect(110, 30, 235, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -59,8 +59,8 @@ class Ui_cyclwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cyclxtra.sizePolicy().hasHeightForWidth()) self.cyclxtra.setSizePolicy(sizePolicy) - self.cyclxtra.setMinimumSize(QtCore.QSize(355, 15)) - self.cyclxtra.setMaximumSize(QtCore.QSize(355, 15)) + self.cyclxtra.setMinimumSize(QtCore.QSize(235, 15)) + self.cyclxtra.setMaximumSize(QtCore.QSize(235, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -68,27 +68,8 @@ class Ui_cyclwdgt(object): self.cyclxtra.setFont(font) self.cyclxtra.setStyleSheet('font: 10pt "Inter";') self.cyclxtra.setObjectName("cyclxtra") - self.cyclperc = QtWidgets.QLabel(cyclwdgt) - self.cyclperc.setGeometry(QtCore.QRect(70, 10, 30, 30)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cyclperc.sizePolicy().hasHeightForWidth()) - self.cyclperc.setSizePolicy(sizePolicy) - self.cyclperc.setMinimumSize(QtCore.QSize(30, 30)) - self.cyclperc.setMaximumSize(QtCore.QSize(30, 30)) - font = QtGui.QFont() - font.setPointSize(10) - font.setBold(False) - font.setItalic(False) - self.cyclperc.setFont(font) - self.cyclperc.setStyleSheet('font: 10pt "JetBrains Mono";') - self.cyclperc.setAlignment(QtCore.Qt.AlignCenter) - self.cyclperc.setObjectName("cyclperc") self.cyclnumb = QtWidgets.QLabel(cyclwdgt) - self.cyclnumb.setGeometry(QtCore.QRect(5, 5, 55, 20)) + self.cyclnumb.setGeometry(QtCore.QRect(5, 5, 40, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -96,16 +77,16 @@ class Ui_cyclwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cyclnumb.sizePolicy().hasHeightForWidth()) self.cyclnumb.setSizePolicy(sizePolicy) - self.cyclnumb.setMinimumSize(QtCore.QSize(55, 20)) - self.cyclnumb.setMaximumSize(QtCore.QSize(55, 20)) - self.cyclnumb.setStyleSheet('font: 15pt "JetBrains Mono";') + self.cyclnumb.setMinimumSize(QtCore.QSize(40, 20)) + self.cyclnumb.setMaximumSize(QtCore.QSize(40, 20)) + self.cyclnumb.setStyleSheet('font: 13pt "Barlow";') self.cyclnumb.setFrameShape(QtWidgets.QFrame.NoFrame) self.cyclnumb.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.cyclnumb.setObjectName("cyclnumb") self.cycllabl = QtWidgets.QLabel(cyclwdgt) - self.cycllabl.setGeometry(QtCore.QRect(5, 30, 55, 15)) + self.cycllabl.setGeometry(QtCore.QRect(5, 30, 40, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -113,8 +94,8 @@ class Ui_cyclwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cycllabl.sizePolicy().hasHeightForWidth()) self.cycllabl.setSizePolicy(sizePolicy) - self.cycllabl.setMinimumSize(QtCore.QSize(55, 15)) - self.cycllabl.setMaximumSize(QtCore.QSize(55, 15)) + self.cycllabl.setMinimumSize(QtCore.QSize(40, 15)) + self.cycllabl.setMaximumSize(QtCore.QSize(40, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -122,9 +103,58 @@ class Ui_cyclwdgt(object): self.cycllabl.setFont(font) self.cycllabl.setStyleSheet('font: 10pt "Inter";') self.cycllabl.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.cycllabl.setObjectName("cycllabl") + self.cyclperc = QtWidgets.QLabel(cyclwdgt) + self.cyclperc.setGeometry(QtCore.QRect(60, 10, 30, 30)) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed + ) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cyclperc.sizePolicy().hasHeightForWidth()) + self.cyclperc.setSizePolicy(sizePolicy) + self.cyclperc.setMinimumSize(QtCore.QSize(30, 30)) + self.cyclperc.setMaximumSize(QtCore.QSize(30, 30)) + font = QtGui.QFont() + font.setPointSize(10) + font.setBold(False) + font.setItalic(False) + self.cyclperc.setFont(font) + self.cyclperc.setStyleSheet('font: 10pt "Barlow";') + self.cyclperc.setAlignment(QtCore.Qt.AlignCenter) + self.cyclperc.setObjectName("cyclperc") + self.cycllin1 = QtWidgets.QFrame(cyclwdgt) + self.cycllin1.setGeometry(QtCore.QRect(50, 5, 1, 40)) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed + ) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cycllin1.sizePolicy().hasHeightForWidth()) + self.cycllin1.setSizePolicy(sizePolicy) + self.cycllin1.setMinimumSize(QtCore.QSize(1, 40)) + self.cycllin1.setMaximumSize(QtCore.QSize(1, 40)) + self.cycllin1.setStyleSheet("border: 1px solid #808080;") + self.cycllin1.setFrameShape(QtWidgets.QFrame.VLine) + self.cycllin1.setFrameShadow(QtWidgets.QFrame.Sunken) + self.cycllin1.setObjectName("cycllin1") + self.cycllin2 = QtWidgets.QFrame(cyclwdgt) + self.cycllin2.setGeometry(QtCore.QRect(100, 5, 1, 40)) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed + ) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.cycllin2.sizePolicy().hasHeightForWidth()) + self.cycllin2.setSizePolicy(sizePolicy) + self.cycllin2.setMinimumSize(QtCore.QSize(1, 40)) + self.cycllin2.setMaximumSize(QtCore.QSize(1, 40)) + self.cycllin2.setStyleSheet("border: 1px solid #808080;") + self.cycllin2.setFrameShape(QtWidgets.QFrame.VLine) + self.cycllin2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.cycllin2.setObjectName("cycllin2") self.retranslateUi(cyclwdgt) QtCore.QMetaObject.connectSlotsByName(cyclwdgt) @@ -132,16 +162,16 @@ class Ui_cyclwdgt(object): def retranslateUi(self, cyclwdgt): _translate = QtCore.QCoreApplication.translate cyclwdgt.setWindowTitle(_translate("cyclwdgt", "Form")) - self.cyclcurt.setText(_translate("cyclwdgt", "CURRENT_FREQUENCY")) + self.cyclcurt.setText(_translate("cyclwdgt", "000.00XHz")) self.cyclxtra.setText( _translate( "cyclwdgt", - '

MIN: MIN_FREQUENCY, MAX: MAX_FREQUENCY

', + '

MIN: 0000.00XHz, MAX: 0000.00XHz

', ) ) - self.cyclperc.setText(_translate("cyclwdgt", "000")) - self.cyclnumb.setText(_translate("cyclwdgt", "0000")) + self.cyclnumb.setText(_translate("cyclwdgt", "0")) self.cycllabl.setText(_translate("cyclwdgt", "#CPU")) + self.cyclperc.setText(_translate("cyclwdgt", "000")) from PyQt5.QtChart import QChartView diff --git a/obserware/sources/widgets/lgptwdgt/interface.py b/obserware/sources/widgets/lgptwdgt/interface.py index ac35aa6..ab1fcd2 100644 --- a/obserware/sources/widgets/lgptwdgt/interface.py +++ b/obserware/sources/widgets/lgptwdgt/interface.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_lgptwdgt(object): def setupUi(self, lgptwdgt): lgptwdgt.setObjectName("lgptwdgt") - lgptwdgt.resize(450, 110) + lgptwdgt.resize(420, 110) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(lgptwdgt.sizePolicy().hasHeightForWidth()) lgptwdgt.setSizePolicy(sizePolicy) - lgptwdgt.setMinimumSize(QtCore.QSize(450, 110)) - lgptwdgt.setMaximumSize(QtCore.QSize(450, 110)) + lgptwdgt.setMinimumSize(QtCore.QSize(420, 110)) + lgptwdgt.setMaximumSize(QtCore.QSize(420, 110)) self.lgptdvce = QtWidgets.QLabel(lgptwdgt) - self.lgptdvce.setGeometry(QtCore.QRect(70, 5, 375, 20)) + self.lgptdvce.setGeometry(QtCore.QRect(55, 5, 360, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -33,12 +33,12 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptdvce.sizePolicy().hasHeightForWidth()) self.lgptdvce.setSizePolicy(sizePolicy) - self.lgptdvce.setMinimumSize(QtCore.QSize(375, 20)) - self.lgptdvce.setMaximumSize(QtCore.QSize(375, 20)) - self.lgptdvce.setStyleSheet('font: 15pt "JetBrains Mono";') + self.lgptdvce.setMinimumSize(QtCore.QSize(360, 20)) + self.lgptdvce.setMaximumSize(QtCore.QSize(360, 20)) + self.lgptdvce.setStyleSheet('font: 13pt "Barlow";') self.lgptdvce.setObjectName("lgptdvce") self.lgptfsys = QtWidgets.QLabel(lgptwdgt) - self.lgptfsys.setGeometry(QtCore.QRect(70, 70, 375, 15)) + self.lgptfsys.setGeometry(QtCore.QRect(55, 70, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -46,8 +46,8 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptfsys.sizePolicy().hasHeightForWidth()) self.lgptfsys.setSizePolicy(sizePolicy) - self.lgptfsys.setMinimumSize(QtCore.QSize(375, 15)) - self.lgptfsys.setMaximumSize(QtCore.QSize(375, 15)) + self.lgptfsys.setMinimumSize(QtCore.QSize(360, 15)) + self.lgptfsys.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -56,7 +56,7 @@ class Ui_lgptwdgt(object): self.lgptfsys.setStyleSheet('font: 10pt "Inter";') self.lgptfsys.setObjectName("lgptfsys") self.lgptnumb = QtWidgets.QLabel(lgptwdgt) - self.lgptnumb.setGeometry(QtCore.QRect(5, 5, 55, 20)) + self.lgptnumb.setGeometry(QtCore.QRect(5, 5, 40, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -64,16 +64,16 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptnumb.sizePolicy().hasHeightForWidth()) self.lgptnumb.setSizePolicy(sizePolicy) - self.lgptnumb.setMinimumSize(QtCore.QSize(55, 20)) - self.lgptnumb.setMaximumSize(QtCore.QSize(55, 20)) - self.lgptnumb.setStyleSheet('font: 15pt "JetBrains Mono";') + self.lgptnumb.setMinimumSize(QtCore.QSize(40, 20)) + self.lgptnumb.setMaximumSize(QtCore.QSize(40, 20)) + self.lgptnumb.setStyleSheet('font: 13pt "Barlow";') self.lgptnumb.setFrameShape(QtWidgets.QFrame.NoFrame) self.lgptnumb.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.lgptnumb.setObjectName("lgptnumb") self.lgptlabl = QtWidgets.QLabel(lgptwdgt) - self.lgptlabl.setGeometry(QtCore.QRect(5, 30, 55, 15)) + self.lgptlabl.setGeometry(QtCore.QRect(5, 30, 40, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -81,8 +81,8 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptlabl.sizePolicy().hasHeightForWidth()) self.lgptlabl.setSizePolicy(sizePolicy) - self.lgptlabl.setMinimumSize(QtCore.QSize(55, 15)) - self.lgptlabl.setMaximumSize(QtCore.QSize(55, 15)) + self.lgptlabl.setMinimumSize(QtCore.QSize(40, 15)) + self.lgptlabl.setMaximumSize(QtCore.QSize(40, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -90,11 +90,11 @@ class Ui_lgptwdgt(object): self.lgptlabl.setFont(font) self.lgptlabl.setStyleSheet('font: 10pt "Inter";') self.lgptlabl.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.lgptlabl.setObjectName("lgptlabl") self.lgptfutl = QtWidgets.QLabel(lgptwdgt) - self.lgptfutl.setGeometry(QtCore.QRect(70, 30, 375, 15)) + self.lgptfutl.setGeometry(QtCore.QRect(55, 30, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -102,8 +102,8 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptfutl.sizePolicy().hasHeightForWidth()) self.lgptfutl.setSizePolicy(sizePolicy) - self.lgptfutl.setMinimumSize(QtCore.QSize(375, 15)) - self.lgptfutl.setMaximumSize(QtCore.QSize(375, 15)) + self.lgptfutl.setMinimumSize(QtCore.QSize(360, 15)) + self.lgptfutl.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -112,7 +112,7 @@ class Ui_lgptwdgt(object): self.lgptfutl.setStyleSheet('font: 10pt "Inter";') self.lgptfutl.setObjectName("lgptfutl") self.lgptmxfp = QtWidgets.QLabel(lgptwdgt) - self.lgptmxfp.setGeometry(QtCore.QRect(70, 90, 375, 15)) + self.lgptmxfp.setGeometry(QtCore.QRect(55, 90, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -120,8 +120,8 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptmxfp.sizePolicy().hasHeightForWidth()) self.lgptmxfp.setSizePolicy(sizePolicy) - self.lgptmxfp.setMinimumSize(QtCore.QSize(375, 15)) - self.lgptmxfp.setMaximumSize(QtCore.QSize(375, 15)) + self.lgptmxfp.setMinimumSize(QtCore.QSize(360, 15)) + self.lgptmxfp.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -130,7 +130,7 @@ class Ui_lgptwdgt(object): self.lgptmxfp.setStyleSheet('font: 10pt "Inter";') self.lgptmxfp.setObjectName("lgptmxfp") self.lgptpgbr = QtWidgets.QProgressBar(lgptwdgt) - self.lgptpgbr.setGeometry(QtCore.QRect(70, 50, 375, 15)) + self.lgptpgbr.setGeometry(QtCore.QRect(55, 50, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -138,16 +138,15 @@ class Ui_lgptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.lgptpgbr.sizePolicy().hasHeightForWidth()) self.lgptpgbr.setSizePolicy(sizePolicy) - self.lgptpgbr.setMinimumSize(QtCore.QSize(375, 15)) - self.lgptpgbr.setMaximumSize(QtCore.QSize(375, 15)) + self.lgptpgbr.setMinimumSize(QtCore.QSize(360, 15)) + self.lgptpgbr.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) self.lgptpgbr.setFont(font) self.lgptpgbr.setStyleSheet( - "QProgressBar::chunk {background-color: #008080;}\n" - 'QProgressBar {border: 1px solid #808080; font: 8pt "Inter";}' + 'border: 1px solid #808080; border-radius: 0px; font: 8pt "Inter";' ) self.lgptpgbr.setProperty("value", 0) self.lgptpgbr.setAlignment( @@ -157,7 +156,7 @@ class Ui_lgptwdgt(object): self.lgptpgbr.setInvertedAppearance(False) self.lgptpgbr.setObjectName("lgptpgbr") self.lgptline = QtWidgets.QFrame(lgptwdgt) - self.lgptline.setGeometry(QtCore.QRect(65, 5, 1, 100)) + self.lgptline.setGeometry(QtCore.QRect(50, 5, 1, 100)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -180,7 +179,7 @@ class Ui_lgptwdgt(object): lgptwdgt.setWindowTitle(_translate("lgptwdgt", "Form")) self.lgptdvce.setText(_translate("lgptwdgt", "DEVICE")) self.lgptfsys.setText(_translate("lgptwdgt", "MOUNTPOINT (FILESYSTEM)")) - self.lgptnumb.setText(_translate("lgptwdgt", "0000")) + self.lgptnumb.setText(_translate("lgptwdgt", "0")) self.lgptlabl.setText(_translate("lgptwdgt", "#PART")) self.lgptfutl.setText( _translate( diff --git a/obserware/sources/widgets/ntwkwdgt/interface.py b/obserware/sources/widgets/ntwkwdgt/interface.py index 8777430..387b76a 100644 --- a/obserware/sources/widgets/ntwkwdgt/interface.py +++ b/obserware/sources/widgets/ntwkwdgt/interface.py @@ -35,7 +35,7 @@ class Ui_ntwkwdgt(object): self.ntwkdvce.setSizePolicy(sizePolicy) self.ntwkdvce.setMinimumSize(QtCore.QSize(340, 20)) self.ntwkdvce.setMaximumSize(QtCore.QSize(340, 20)) - self.ntwkdvce.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkdvce.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkdvce.setObjectName("ntwkdvce") self.ntwkstet = QtWidgets.QLabel(ntwkwdgt) self.ntwkstet.setGeometry(QtCore.QRect(350, 5, 340, 20)) @@ -48,7 +48,7 @@ class Ui_ntwkwdgt(object): self.ntwkstet.setSizePolicy(sizePolicy) self.ntwkstet.setMinimumSize(QtCore.QSize(340, 20)) self.ntwkstet.setMaximumSize(QtCore.QSize(340, 20)) - self.ntwkstet.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkstet.setStyleSheet('font: 13pt "Font Awesome 5 Free"; border: none;') self.ntwkstet.setAlignment( QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter ) @@ -64,7 +64,7 @@ class Ui_ntwkwdgt(object): self.ntwkbrrt.setSizePolicy(sizePolicy) self.ntwkbrrt.setMinimumSize(QtCore.QSize(320, 20)) self.ntwkbrrt.setMaximumSize(QtCore.QSize(320, 20)) - self.ntwkbrrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbrrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbrrt.setObjectName("ntwkbrrt") self.ntwkbrrl = QtWidgets.QLabel(ntwkwdgt) self.ntwkbrrl.setGeometry(QtCore.QRect(25, 35, 320, 15)) @@ -103,7 +103,7 @@ class Ui_ntwkwdgt(object): self.ntwkbtrt.setSizePolicy(sizePolicy) self.ntwkbtrt.setMinimumSize(QtCore.QSize(320, 20)) self.ntwkbtrt.setMaximumSize(QtCore.QSize(320, 20)) - self.ntwkbtrt.setStyleSheet('font: 15pt "JetBrains Mono"; border: none;') + self.ntwkbtrt.setStyleSheet('font: 13pt "Barlow"; border: none;') self.ntwkbtrt.setObjectName("ntwkbtrt") self.ntwkln01 = QtWidgets.QFrame(ntwkwdgt) self.ntwkln01.setGeometry(QtCore.QRect(5, 75, 340, 1)) @@ -190,7 +190,7 @@ class Ui_ntwkwdgt(object): self.frame = QtWidgets.QFrame(ntwkwdgt) self.frame.setGeometry(QtCore.QRect(0, 0, 695, 31)) self.frame.setStyleSheet( - "background-color: rgba(102, 178, 178, 0.5); border: none;" + "background-color: rgba(128, 128, 128, 0.5); border: none;" ) self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame.setFrameShadow(QtWidgets.QFrame.Raised) @@ -308,7 +308,7 @@ class Ui_ntwkwdgt(object): _translate = QtCore.QCoreApplication.translate ntwkwdgt.setWindowTitle(_translate("ntwkwdgt", "Form")) self.ntwkdvce.setText(_translate("ntwkwdgt", "DEVICE")) - self.ntwkstet.setText(_translate("ntwkwdgt", "ACTIVITY")) + self.ntwkstet.setText(_translate("ntwkwdgt", "toggle-on")) self.ntwkbrrt.setText(_translate("ntwkwdgt", "000.00XB/s (0Pk/s)")) self.ntwkbrrl.setText(_translate("ntwkwdgt", "Receiving rate")) self.ntwkbtrl.setText(_translate("ntwkwdgt", "Transmitting rate")) diff --git a/obserware/sources/widgets/phptwdgt/interface.py b/obserware/sources/widgets/phptwdgt/interface.py index 4bc1588..69a0c2c 100644 --- a/obserware/sources/widgets/phptwdgt/interface.py +++ b/obserware/sources/widgets/phptwdgt/interface.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_phptwdgt(object): def setupUi(self, phptwdgt): phptwdgt.setObjectName("phptwdgt") - phptwdgt.resize(450, 110) + phptwdgt.resize(420, 110) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -22,10 +22,10 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(phptwdgt.sizePolicy().hasHeightForWidth()) phptwdgt.setSizePolicy(sizePolicy) - phptwdgt.setMinimumSize(QtCore.QSize(450, 110)) - phptwdgt.setMaximumSize(QtCore.QSize(450, 110)) + phptwdgt.setMinimumSize(QtCore.QSize(420, 110)) + phptwdgt.setMaximumSize(QtCore.QSize(420, 110)) self.phptdvce = QtWidgets.QLabel(phptwdgt) - self.phptdvce.setGeometry(QtCore.QRect(70, 5, 375, 20)) + self.phptdvce.setGeometry(QtCore.QRect(55, 5, 360, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -33,12 +33,12 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptdvce.sizePolicy().hasHeightForWidth()) self.phptdvce.setSizePolicy(sizePolicy) - self.phptdvce.setMinimumSize(QtCore.QSize(375, 20)) - self.phptdvce.setMaximumSize(QtCore.QSize(375, 20)) - self.phptdvce.setStyleSheet('font: 15pt "JetBrains Mono";') + self.phptdvce.setMinimumSize(QtCore.QSize(360, 20)) + self.phptdvce.setMaximumSize(QtCore.QSize(360, 20)) + self.phptdvce.setStyleSheet('font: 13pt "Barlow";') self.phptdvce.setObjectName("phptdvce") self.phptfsys = QtWidgets.QLabel(phptwdgt) - self.phptfsys.setGeometry(QtCore.QRect(70, 70, 375, 15)) + self.phptfsys.setGeometry(QtCore.QRect(55, 70, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -46,8 +46,8 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptfsys.sizePolicy().hasHeightForWidth()) self.phptfsys.setSizePolicy(sizePolicy) - self.phptfsys.setMinimumSize(QtCore.QSize(375, 15)) - self.phptfsys.setMaximumSize(QtCore.QSize(375, 15)) + self.phptfsys.setMinimumSize(QtCore.QSize(360, 15)) + self.phptfsys.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -56,7 +56,7 @@ class Ui_phptwdgt(object): self.phptfsys.setStyleSheet('font: 10pt "Inter";') self.phptfsys.setObjectName("phptfsys") self.phptnumb = QtWidgets.QLabel(phptwdgt) - self.phptnumb.setGeometry(QtCore.QRect(5, 5, 55, 20)) + self.phptnumb.setGeometry(QtCore.QRect(5, 5, 40, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -64,16 +64,16 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptnumb.sizePolicy().hasHeightForWidth()) self.phptnumb.setSizePolicy(sizePolicy) - self.phptnumb.setMinimumSize(QtCore.QSize(55, 20)) - self.phptnumb.setMaximumSize(QtCore.QSize(55, 20)) - self.phptnumb.setStyleSheet('font: 15pt "JetBrains Mono";') + self.phptnumb.setMinimumSize(QtCore.QSize(40, 20)) + self.phptnumb.setMaximumSize(QtCore.QSize(40, 20)) + self.phptnumb.setStyleSheet('font: 13pt "Barlow";') self.phptnumb.setFrameShape(QtWidgets.QFrame.NoFrame) self.phptnumb.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.phptnumb.setObjectName("phptnumb") self.phptlabl = QtWidgets.QLabel(phptwdgt) - self.phptlabl.setGeometry(QtCore.QRect(5, 30, 55, 15)) + self.phptlabl.setGeometry(QtCore.QRect(5, 30, 40, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -81,8 +81,8 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptlabl.sizePolicy().hasHeightForWidth()) self.phptlabl.setSizePolicy(sizePolicy) - self.phptlabl.setMinimumSize(QtCore.QSize(55, 15)) - self.phptlabl.setMaximumSize(QtCore.QSize(55, 15)) + self.phptlabl.setMinimumSize(QtCore.QSize(40, 15)) + self.phptlabl.setMaximumSize(QtCore.QSize(40, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -90,11 +90,11 @@ class Ui_phptwdgt(object): self.phptlabl.setFont(font) self.phptlabl.setStyleSheet('font: 10pt "Inter";') self.phptlabl.setAlignment( - QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter + QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter ) self.phptlabl.setObjectName("phptlabl") self.phptfutl = QtWidgets.QLabel(phptwdgt) - self.phptfutl.setGeometry(QtCore.QRect(70, 30, 375, 15)) + self.phptfutl.setGeometry(QtCore.QRect(55, 30, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -102,8 +102,8 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptfutl.sizePolicy().hasHeightForWidth()) self.phptfutl.setSizePolicy(sizePolicy) - self.phptfutl.setMinimumSize(QtCore.QSize(375, 15)) - self.phptfutl.setMaximumSize(QtCore.QSize(375, 15)) + self.phptfutl.setMinimumSize(QtCore.QSize(360, 15)) + self.phptfutl.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -112,7 +112,7 @@ class Ui_phptwdgt(object): self.phptfutl.setStyleSheet('font: 10pt "Inter";') self.phptfutl.setObjectName("phptfutl") self.phptmxfp = QtWidgets.QLabel(phptwdgt) - self.phptmxfp.setGeometry(QtCore.QRect(70, 90, 375, 15)) + self.phptmxfp.setGeometry(QtCore.QRect(55, 90, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -120,8 +120,8 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptmxfp.sizePolicy().hasHeightForWidth()) self.phptmxfp.setSizePolicy(sizePolicy) - self.phptmxfp.setMinimumSize(QtCore.QSize(375, 15)) - self.phptmxfp.setMaximumSize(QtCore.QSize(375, 15)) + self.phptmxfp.setMinimumSize(QtCore.QSize(360, 15)) + self.phptmxfp.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) @@ -130,7 +130,7 @@ class Ui_phptwdgt(object): self.phptmxfp.setStyleSheet('font: 10pt "Inter";') self.phptmxfp.setObjectName("phptmxfp") self.phptpgbr = QtWidgets.QProgressBar(phptwdgt) - self.phptpgbr.setGeometry(QtCore.QRect(70, 50, 375, 15)) + self.phptpgbr.setGeometry(QtCore.QRect(55, 50, 360, 15)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -138,16 +138,15 @@ class Ui_phptwdgt(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.phptpgbr.sizePolicy().hasHeightForWidth()) self.phptpgbr.setSizePolicy(sizePolicy) - self.phptpgbr.setMinimumSize(QtCore.QSize(375, 15)) - self.phptpgbr.setMaximumSize(QtCore.QSize(375, 15)) + self.phptpgbr.setMinimumSize(QtCore.QSize(360, 15)) + self.phptpgbr.setMaximumSize(QtCore.QSize(360, 15)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) self.phptpgbr.setFont(font) self.phptpgbr.setStyleSheet( - "QProgressBar::chunk {background-color: #008080;}\n" - 'QProgressBar {border: 1px solid #808080; font: 8pt "Inter";}' + 'border: 1px solid #808080; border-radius: 0px; font: 8pt "Inter";' ) self.phptpgbr.setProperty("value", 0) self.phptpgbr.setAlignment( @@ -157,7 +156,7 @@ class Ui_phptwdgt(object): self.phptpgbr.setInvertedAppearance(False) self.phptpgbr.setObjectName("phptpgbr") self.phptline = QtWidgets.QFrame(phptwdgt) - self.phptline.setGeometry(QtCore.QRect(65, 5, 1, 100)) + self.phptline.setGeometry(QtCore.QRect(50, 5, 1, 100)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -180,7 +179,7 @@ class Ui_phptwdgt(object): phptwdgt.setWindowTitle(_translate("phptwdgt", "Form")) self.phptdvce.setText(_translate("phptwdgt", "DEVICE")) self.phptfsys.setText(_translate("phptwdgt", "MOUNTPOINT (FILESYSTEM)")) - self.phptnumb.setText(_translate("phptwdgt", "0000")) + self.phptnumb.setText(_translate("phptwdgt", "0")) self.phptlabl.setText(_translate("phptwdgt", "#PART")) self.phptfutl.setText( _translate( @@ -191,7 +190,7 @@ class Ui_phptwdgt(object): self.phptmxfp.setText( _translate( "phptwdgt", - '

Max filename length: XXX, Max pathname length: XXX

', + '

Max filename length: XXXX, Max pathname length: XXXX

', ) ) self.phptpgbr.setFormat(_translate("phptwdgt", "%p% "))