From f04fc320e58d9effcff29a1df37fc769ece9f6ae Mon Sep 17 00:00:00 2001 From: Akashdeep Dhar Date: Jan 07 2022 04:12:15 +0000 Subject: Remove border radius from the interface modules Signed-off-by: Akashdeep Dhar --- diff --git a/obserware/sources/screens/cyclwind/interface.py b/obserware/sources/screens/cyclwind/interface.py index a1e708b..d615d92 100644 --- a/obserware/sources/screens/cyclwind/interface.py +++ b/obserware/sources/screens/cyclwind/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/cyclwind.ui' +# Form implementation generated from reading ui file 'assets/uifiles/cyclwind.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -101,9 +101,7 @@ class Ui_cyclwind(object): font.setBold(False) font.setItalic(False) self.cycsecbt.setFont(font) - self.cycsecbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; border-radius: 10px; font: 10pt "Inter";' - ) + self.cycsecbt.setStyleSheet('font: 10pt "Inter";') self.cycsecbt.setObjectName("cycsecbt") self.cycllin2 = QtWidgets.QFrame(cyclwind) self.cycllin2.setGeometry(QtCore.QRect(5, 60, 470, 1)) diff --git a/obserware/sources/screens/lgptwind/interface.py b/obserware/sources/screens/lgptwind/interface.py index 2878d7e..692a84f 100644 --- a/obserware/sources/screens/lgptwind/interface.py +++ b/obserware/sources/screens/lgptwind/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/lgptwind.ui' +# Form implementation generated from reading ui file 'assets/uifiles/lgptwind.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -81,6 +81,7 @@ class Ui_lgptwind(object): self.lgptlist.setMinimumSize(QtCore.QSize(470, 360)) self.lgptlist.setMaximumSize(QtCore.QSize(470, 360)) self.lgptlist.setFocusPolicy(QtCore.Qt.NoFocus) + self.lgptlist.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.lgptlist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.lgptlist.setAlternatingRowColors(False) self.lgptlist.setObjectName("lgptlist") diff --git a/obserware/sources/screens/mainwind/interface.py b/obserware/sources/screens/mainwind/interface.py index adc80b2..1d00085 100644 --- a/obserware/sources/screens/mainwind/interface.py +++ b/obserware/sources/screens/mainwind/interface.py @@ -73,7 +73,7 @@ class Ui_mainwind(object): self.cpudfmgf.setMinimumSize(QtCore.QSize(205, 205)) self.cpudfmgf.setMaximumSize(QtCore.QSize(205, 205)) self.cpudfmgf.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.cpudfmgf.setFrameShape(QtWidgets.QFrame.StyledPanel) self.cpudfmgf.setFrameShadow(QtWidgets.QFrame.Raised) @@ -103,7 +103,7 @@ class Ui_mainwind(object): self.memofmgf.setMinimumSize(QtCore.QSize(360, 205)) self.memofmgf.setMaximumSize(QtCore.QSize(360, 205)) self.memofmgf.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.memofmgf.setFrameShape(QtWidgets.QFrame.StyledPanel) self.memofmgf.setFrameShadow(QtWidgets.QFrame.Raised) @@ -255,7 +255,7 @@ class Ui_mainwind(object): self.swapfmgf.setMinimumSize(QtCore.QSize(360, 205)) self.swapfmgf.setMaximumSize(QtCore.QSize(360, 205)) self.swapfmgf.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.swapfmgf.setFrameShape(QtWidgets.QFrame.StyledPanel) self.swapfmgf.setFrameShadow(QtWidgets.QFrame.Raised) @@ -394,7 +394,7 @@ class Ui_mainwind(object): self.swaplabl.setStyleSheet('font: 15pt "JetBrains Mono";') self.swaplabl.setObjectName("swaplabl") self.cpudexdt = QtWidgets.QFrame(self.perftabp) - self.cpudexdt.setGeometry(QtCore.QRect(5, 240, 205, 210)) + self.cpudexdt.setGeometry(QtCore.QRect(5, 240, 205, 185)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -402,10 +402,10 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cpudexdt.sizePolicy().hasHeightForWidth()) self.cpudexdt.setSizePolicy(sizePolicy) - self.cpudexdt.setMinimumSize(QtCore.QSize(205, 210)) - self.cpudexdt.setMaximumSize(QtCore.QSize(205, 210)) + self.cpudexdt.setMinimumSize(QtCore.QSize(205, 185)) + self.cpudexdt.setMaximumSize(QtCore.QSize(205, 185)) self.cpudexdt.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.cpudexdt.setFrameShape(QtWidgets.QFrame.StyledPanel) self.cpudexdt.setFrameShadow(QtWidgets.QFrame.Raised) @@ -530,20 +530,6 @@ class Ui_mainwind(object): self.cpudsilb.setMaximumSize(QtCore.QSize(195, 15)) self.cpudsilb.setStyleSheet('font: 10pt "Inter"; border: none;') self.cpudsilb.setObjectName("cpudsilb") - self.cpudlin4 = QtWidgets.QFrame(self.cpudexdt) - self.cpudlin4.setGeometry(QtCore.QRect(5, 180, 195, 1)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cpudlin4.sizePolicy().hasHeightForWidth()) - self.cpudlin4.setSizePolicy(sizePolicy) - self.cpudlin4.setMinimumSize(QtCore.QSize(195, 1)) - self.cpudlin4.setMaximumSize(QtCore.QSize(195, 1)) - self.cpudlin4.setFrameShape(QtWidgets.QFrame.HLine) - self.cpudlin4.setFrameShadow(QtWidgets.QFrame.Sunken) - self.cpudlin4.setObjectName("cpudlin4") self.cpudscnm = QtWidgets.QLabel(self.cpudexdt) self.cpudscnm.setGeometry(QtCore.QRect(5, 155, 195, 20)) sizePolicy = QtWidgets.QSizePolicy( @@ -570,25 +556,8 @@ class Ui_mainwind(object): self.cpudsclb.setMaximumSize(QtCore.QSize(195, 15)) self.cpudsclb.setStyleSheet('font: 10pt "Inter"; border: none;') self.cpudsclb.setObjectName("cpudsclb") - self.cpudtmbt = QtWidgets.QPushButton(self.cpudexdt) - self.cpudtmbt.setGeometry(QtCore.QRect(5, 185, 195, 20)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.cpudtmbt.sizePolicy().hasHeightForWidth()) - self.cpudtmbt.setSizePolicy(sizePolicy) - self.cpudtmbt.setMinimumSize(QtCore.QSize(195, 20)) - self.cpudtmbt.setMaximumSize(QtCore.QSize(195, 20)) - self.cpudtmbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; font: 10pt "Inter";' - ) - self.cpudtmbt.setDefault(False) - self.cpudtmbt.setFlat(False) - self.cpudtmbt.setObjectName("cpudtmbt") self.memoexdt = QtWidgets.QFrame(self.perftabp) - self.memoexdt.setGeometry(QtCore.QRect(215, 240, 360, 210)) + self.memoexdt.setGeometry(QtCore.QRect(215, 240, 360, 185)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -596,10 +565,10 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.memoexdt.sizePolicy().hasHeightForWidth()) self.memoexdt.setSizePolicy(sizePolicy) - self.memoexdt.setMinimumSize(QtCore.QSize(360, 210)) - self.memoexdt.setMaximumSize(QtCore.QSize(360, 210)) + self.memoexdt.setMinimumSize(QtCore.QSize(360, 185)) + self.memoexdt.setMaximumSize(QtCore.QSize(360, 185)) self.memoexdt.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.memoexdt.setFrameShape(QtWidgets.QFrame.StyledPanel) self.memoexdt.setFrameShadow(QtWidgets.QFrame.Raised) @@ -830,20 +799,6 @@ class Ui_mainwind(object): self.memoexl6.setFrameShape(QtWidgets.QFrame.HLine) self.memoexl6.setFrameShadow(QtWidgets.QFrame.Sunken) self.memoexl6.setObjectName("memoexl6") - self.memoexl7 = QtWidgets.QFrame(self.memoexdt) - self.memoexl7.setGeometry(QtCore.QRect(5, 180, 350, 1)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.memoexl7.sizePolicy().hasHeightForWidth()) - self.memoexl7.setSizePolicy(sizePolicy) - self.memoexl7.setMinimumSize(QtCore.QSize(350, 1)) - self.memoexl7.setMaximumSize(QtCore.QSize(350, 1)) - self.memoexl7.setFrameShape(QtWidgets.QFrame.HLine) - self.memoexl7.setFrameShadow(QtWidgets.QFrame.Sunken) - self.memoexl7.setObjectName("memoexl7") self.memofrnm = QtWidgets.QLabel(self.memoexdt) self.memofrnm.setGeometry(QtCore.QRect(205, 110, 150, 20)) sizePolicy = QtWidgets.QSizePolicy( @@ -910,23 +865,8 @@ class Ui_mainwind(object): self.memoexl4.setFrameShape(QtWidgets.QFrame.HLine) self.memoexl4.setFrameShadow(QtWidgets.QFrame.Sunken) self.memoexl4.setObjectName("memoexl4") - self.mmscexbt = QtWidgets.QPushButton(self.memoexdt) - self.mmscexbt.setGeometry(QtCore.QRect(5, 185, 350, 20)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.mmscexbt.sizePolicy().hasHeightForWidth()) - self.mmscexbt.setSizePolicy(sizePolicy) - self.mmscexbt.setMinimumSize(QtCore.QSize(350, 20)) - self.mmscexbt.setMaximumSize(QtCore.QSize(350, 20)) - self.mmscexbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; font: 10pt "Inter";' - ) - self.mmscexbt.setObjectName("mmscexbt") self.swapexdt = QtWidgets.QFrame(self.perftabp) - self.swapexdt.setGeometry(QtCore.QRect(580, 240, 360, 210)) + self.swapexdt.setGeometry(QtCore.QRect(580, 240, 360, 185)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -934,10 +874,10 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.swapexdt.sizePolicy().hasHeightForWidth()) self.swapexdt.setSizePolicy(sizePolicy) - self.swapexdt.setMinimumSize(QtCore.QSize(360, 210)) - self.swapexdt.setMaximumSize(QtCore.QSize(360, 210)) + self.swapexdt.setMinimumSize(QtCore.QSize(360, 185)) + self.swapexdt.setMaximumSize(QtCore.QSize(360, 185)) self.swapexdt.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.swapexdt.setFrameShape(QtWidgets.QFrame.StyledPanel) self.swapexdt.setFrameShadow(QtWidgets.QFrame.Raised) @@ -1076,20 +1016,6 @@ class Ui_mainwind(object): self.swapexl5.setFrameShape(QtWidgets.QFrame.HLine) self.swapexl5.setFrameShadow(QtWidgets.QFrame.Sunken) self.swapexl5.setObjectName("swapexl5") - self.swapexl6 = QtWidgets.QFrame(self.swapexdt) - self.swapexl6.setGeometry(QtCore.QRect(5, 180, 350, 1)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.swapexl6.sizePolicy().hasHeightForWidth()) - self.swapexl6.setSizePolicy(sizePolicy) - self.swapexl6.setMinimumSize(QtCore.QSize(350, 1)) - self.swapexl6.setMaximumSize(QtCore.QSize(350, 1)) - self.swapexl6.setFrameShape(QtWidgets.QFrame.HLine) - self.swapexl6.setFrameShadow(QtWidgets.QFrame.Sunken) - self.swapexl6.setObjectName("swapexl6") self.swapttnm = QtWidgets.QLabel(self.swapexdt) self.swapttnm.setGeometry(QtCore.QRect(205, 110, 150, 20)) sizePolicy = QtWidgets.QSizePolicy( @@ -1156,23 +1082,36 @@ class Ui_mainwind(object): self.swapexl3.setFrameShape(QtWidgets.QFrame.HLine) self.swapexl3.setFrameShadow(QtWidgets.QFrame.Sunken) self.swapexl3.setObjectName("swapexl3") - self.swphexbt = QtWidgets.QPushButton(self.swapexdt) - self.swphexbt.setGeometry(QtCore.QRect(5, 185, 170, 20)) + self.cpudtmbt = QtWidgets.QPushButton(self.perftabp) + self.cpudtmbt.setGeometry(QtCore.QRect(5, 430, 205, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.swphexbt.sizePolicy().hasHeightForWidth()) - self.swphexbt.setSizePolicy(sizePolicy) - self.swphexbt.setMinimumSize(QtCore.QSize(170, 20)) - self.swphexbt.setMaximumSize(QtCore.QSize(170, 20)) - self.swphexbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; font: 10pt "Inter";' + sizePolicy.setHeightForWidth(self.cpudtmbt.sizePolicy().hasHeightForWidth()) + self.cpudtmbt.setSizePolicy(sizePolicy) + self.cpudtmbt.setMinimumSize(QtCore.QSize(205, 20)) + self.cpudtmbt.setMaximumSize(QtCore.QSize(205, 20)) + self.cpudtmbt.setStyleSheet('font: 10pt "Inter";') + self.cpudtmbt.setDefault(False) + self.cpudtmbt.setFlat(False) + self.cpudtmbt.setObjectName("cpudtmbt") + self.mmscexbt = QtWidgets.QPushButton(self.perftabp) + self.mmscexbt.setGeometry(QtCore.QRect(215, 430, 360, 20)) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) - self.swphexbt.setObjectName("swphexbt") - self.swlgexbt = QtWidgets.QPushButton(self.swapexdt) - self.swlgexbt.setGeometry(QtCore.QRect(185, 185, 170, 20)) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mmscexbt.sizePolicy().hasHeightForWidth()) + self.mmscexbt.setSizePolicy(sizePolicy) + self.mmscexbt.setMinimumSize(QtCore.QSize(360, 20)) + self.mmscexbt.setMaximumSize(QtCore.QSize(360, 20)) + self.mmscexbt.setStyleSheet('font: 10pt "Inter";') + self.mmscexbt.setObjectName("mmscexbt") + self.swlgexbt = QtWidgets.QPushButton(self.perftabp) + self.swlgexbt.setGeometry(QtCore.QRect(765, 430, 175, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) @@ -1180,26 +1119,38 @@ class Ui_mainwind(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.swlgexbt.sizePolicy().hasHeightForWidth()) self.swlgexbt.setSizePolicy(sizePolicy) - self.swlgexbt.setMinimumSize(QtCore.QSize(170, 20)) - self.swlgexbt.setMaximumSize(QtCore.QSize(170, 20)) - self.swlgexbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; font: 10pt "Inter";' - ) + self.swlgexbt.setMinimumSize(QtCore.QSize(175, 20)) + self.swlgexbt.setMaximumSize(QtCore.QSize(175, 20)) + self.swlgexbt.setStyleSheet('font: 10pt "Inter";') self.swlgexbt.setObjectName("swlgexbt") - self.partlin2 = QtWidgets.QFrame(self.swapexdt) - self.partlin2.setGeometry(QtCore.QRect(180, 185, 1, 20)) + self.swphexbt = QtWidgets.QPushButton(self.perftabp) + self.swphexbt.setGeometry(QtCore.QRect(580, 430, 175, 20)) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed + ) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.swphexbt.sizePolicy().hasHeightForWidth()) + self.swphexbt.setSizePolicy(sizePolicy) + self.swphexbt.setMinimumSize(QtCore.QSize(175, 20)) + self.swphexbt.setMaximumSize(QtCore.QSize(175, 20)) + self.swphexbt.setStyleSheet('font: 10pt "Inter";') + self.swphexbt.setObjectName("swphexbt") + self.partline = QtWidgets.QFrame(self.perftabp) + self.partline.setGeometry(QtCore.QRect(760, 430, 1, 20)) sizePolicy = QtWidgets.QSizePolicy( QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.partlin2.sizePolicy().hasHeightForWidth()) - self.partlin2.setSizePolicy(sizePolicy) - self.partlin2.setMinimumSize(QtCore.QSize(1, 20)) - self.partlin2.setMaximumSize(QtCore.QSize(1, 20)) - self.partlin2.setFrameShape(QtWidgets.QFrame.VLine) - self.partlin2.setFrameShadow(QtWidgets.QFrame.Sunken) - self.partlin2.setObjectName("partlin2") + sizePolicy.setHeightForWidth(self.partline.sizePolicy().hasHeightForWidth()) + self.partline.setSizePolicy(sizePolicy) + self.partline.setMinimumSize(QtCore.QSize(1, 20)) + self.partline.setMaximumSize(QtCore.QSize(1, 20)) + self.partline.setStyleSheet("border: 1px solid #808080;") + self.partline.setFrameShape(QtWidgets.QFrame.VLine) + self.partline.setFrameShadow(QtWidgets.QFrame.Sunken) + self.partline.setObjectName("partline") self.maintabw.addTab(self.perftabp, "") self.proctabp = QtWidgets.QWidget() sizePolicy = QtWidgets.QSizePolicy( @@ -1298,7 +1249,7 @@ class Ui_mainwind(object): self.ntwkbtbx.setMinimumSize(QtCore.QSize(205, 205)) self.ntwkbtbx.setMaximumSize(QtCore.QSize(100, 205)) self.ntwkbtbx.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.ntwkbtbx.setFrameShape(QtWidgets.QFrame.StyledPanel) self.ntwkbtbx.setFrameShadow(QtWidgets.QFrame.Raised) @@ -1553,7 +1504,7 @@ class Ui_mainwind(object): self.ntwpktbx.setMinimumSize(QtCore.QSize(205, 205)) self.ntwpktbx.setMaximumSize(QtCore.QSize(100, 205)) self.ntwpktbx.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.ntwpktbx.setFrameShape(QtWidgets.QFrame.StyledPanel) self.ntwpktbx.setFrameShadow(QtWidgets.QFrame.Raised) @@ -1854,7 +1805,7 @@ class Ui_mainwind(object): self.ntwkncbx.setMinimumSize(QtCore.QSize(725, 420)) self.ntwkncbx.setMaximumSize(QtCore.QSize(725, 315)) self.ntwkncbx.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.ntwkncbx.setFrameShape(QtWidgets.QFrame.StyledPanel) self.ntwkncbx.setFrameShadow(QtWidgets.QFrame.Raised) @@ -2070,7 +2021,7 @@ class Ui_mainwind(object): self.softfrme.setMinimumSize(QtCore.QSize(570, 210)) self.softfrme.setMaximumSize(QtCore.QSize(570, 210)) self.softfrme.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.softfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.softfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -2340,7 +2291,7 @@ class Ui_mainwind(object): self.cpuifrme.setMinimumSize(QtCore.QSize(360, 210)) self.cpuifrme.setMaximumSize(QtCore.QSize(360, 210)) self.cpuifrme.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.cpuifrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.cpuifrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -2702,7 +2653,7 @@ class Ui_mainwind(object): self.obsrfrme.setMinimumSize(QtCore.QSize(570, 205)) self.obsrfrme.setMaximumSize(QtCore.QSize(570, 305)) self.obsrfrme.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.obsrfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.obsrfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -2958,7 +2909,7 @@ class Ui_mainwind(object): self.feflfrme.setMinimumSize(QtCore.QSize(360, 205)) self.feflfrme.setMaximumSize(QtCore.QSize(360, 205)) self.feflfrme.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.feflfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.feflfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -3027,7 +2978,7 @@ class Ui_mainwind(object): self.cntbfrme.setMinimumSize(QtCore.QSize(935, 420)) self.cntbfrme.setMaximumSize(QtCore.QSize(935, 420)) self.cntbfrme.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.cntbfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.cntbfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -3132,7 +3083,7 @@ class Ui_mainwind(object): self.bottomfm.setMinimumSize(QtCore.QSize(950, 40)) self.bottomfm.setMaximumSize(QtCore.QSize(950, 40)) self.bottomfm.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.bottomfm.setFrameShape(QtWidgets.QFrame.StyledPanel) self.bottomfm.setFrameShadow(QtWidgets.QFrame.Raised) @@ -3452,6 +3403,20 @@ class Ui_mainwind(object): self.retranslateUi(mainwind) self.maintabw.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(mainwind) + mainwind.setTabOrder(self.cpudtmbt, self.mmscexbt) + mainwind.setTabOrder(self.mmscexbt, self.swphexbt) + mainwind.setTabOrder(self.swphexbt, self.swlgexbt) + mainwind.setTabOrder(self.swlgexbt, self.maintabw) + mainwind.setTabOrder(self.maintabw, self.fefllist) + mainwind.setTabOrder(self.fefllist, self.compbutn) + mainwind.setTabOrder(self.compbutn, self.swapbutn) + mainwind.setTabOrder(self.swapbutn, self.diskbutn) + mainwind.setTabOrder(self.diskbutn, self.memobutn) + mainwind.setTabOrder(self.memobutn, self.cpudbutn) + mainwind.setTabOrder(self.cpudbutn, self.proctree) + mainwind.setTabOrder(self.proctree, self.cpudgfvw) + mainwind.setTabOrder(self.cpudgfvw, self.swapgfvw) + mainwind.setTabOrder(self.swapgfvw, self.memogfvw) def retranslateUi(self, mainwind): _translate = QtCore.QCoreApplication.translate @@ -3477,7 +3442,6 @@ class Ui_mainwind(object): self.cpudsilb.setText(_translate("mainwind", "Software interrupts")) self.cpudscnm.setText(_translate("mainwind", "0")) self.cpudsclb.setText(_translate("mainwind", "System calls")) - self.cpudtmbt.setText(_translate("mainwind", "CPU cycles")) self.memoshnm.setText(_translate("mainwind", "0MB")) self.memobfnm.setText(_translate("mainwind", "0MB")) self.memosblb.setText(_translate("mainwind", "Slab")) @@ -3494,7 +3458,6 @@ class Ui_mainwind(object): self.memousnm.setText(_translate("mainwind", "0MB")) self.memouslb.setText(_translate("mainwind", "Used")) self.memoccnm.setText(_translate("mainwind", "0MB")) - self.mmscexbt.setText(_translate("mainwind", "Storage counters")) self.swapsonm.setText(_translate("mainwind", "0MB")) self.swapsinm.setText(_translate("mainwind", "0MB")) self.swapsolb.setText(_translate("mainwind", "Swapped out")) @@ -3505,8 +3468,10 @@ class Ui_mainwind(object): self.swapusnm.setText(_translate("mainwind", "0MB")) self.swapuslb.setText(_translate("mainwind", "Used")) self.swapfrnm.setText(_translate("mainwind", "0MB")) - self.swphexbt.setText(_translate("mainwind", "Physical partitions")) + self.cpudtmbt.setText(_translate("mainwind", "CPU cycles")) + self.mmscexbt.setText(_translate("mainwind", "Storage counters")) self.swlgexbt.setText(_translate("mainwind", "Logical partitions")) + self.swphexbt.setText(_translate("mainwind", "Physical partitions")) self.maintabw.setTabText( self.maintabw.indexOf(self.perftabp), _translate("mainwind", "Performance") ) diff --git a/obserware/sources/screens/phptwind/interface.py b/obserware/sources/screens/phptwind/interface.py index bb82e35..ded6737 100644 --- a/obserware/sources/screens/phptwind/interface.py +++ b/obserware/sources/screens/phptwind/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/phptwind.ui' +# Form implementation generated from reading ui file 'assets/uifiles/phptwind.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -81,6 +81,7 @@ class Ui_phptwind(object): self.phptlist.setMinimumSize(QtCore.QSize(470, 360)) self.phptlist.setMaximumSize(QtCore.QSize(470, 360)) self.phptlist.setFocusPolicy(QtCore.Qt.NoFocus) + self.phptlist.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.phptlist.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) self.phptlist.setAlternatingRowColors(False) self.phptlist.setObjectName("phptlist") diff --git a/obserware/sources/screens/procwind/interface.py b/obserware/sources/screens/procwind/interface.py index 9f1976f..688d5da 100644 --- a/obserware/sources/screens/procwind/interface.py +++ b/obserware/sources/screens/procwind/interface.py @@ -63,7 +63,7 @@ class Ui_procwind(object): self.pcidfrme.setMinimumSize(QtCore.QSize(310, 30)) self.pcidfrme.setMaximumSize(QtCore.QSize(310, 30)) self.pcidfrme.setStyleSheet( - "background-color: rgba(160, 160, 160, 0.5); border: none; border-radius: 10px;" + "background-color: rgba(160, 160, 160, 0.5); border: none;" ) self.pcidfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.pcidfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -129,7 +129,7 @@ class Ui_procwind(object): self.cpudfrme.setMinimumSize(QtCore.QSize(150, 30)) self.cpudfrme.setMaximumSize(QtCore.QSize(150, 30)) self.cpudfrme.setStyleSheet( - "background-color: rgba(160, 160, 160, 0.5); border: none; border-radius: 10px;" + "background-color: rgba(160, 160, 160, 0.5); border: none;" ) self.cpudfrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.cpudfrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -180,7 +180,7 @@ class Ui_procwind(object): self.memofrme.setMinimumSize(QtCore.QSize(150, 30)) self.memofrme.setMaximumSize(QtCore.QSize(150, 30)) self.memofrme.setStyleSheet( - "background-color: rgba(160, 160, 160, 0.5); border: none; border-radius: 10px;" + "background-color: rgba(160, 160, 160, 0.5); border: none;" ) self.memofrme.setFrameShape(QtWidgets.QFrame.StyledPanel) self.memofrme.setFrameShadow(QtWidgets.QFrame.Raised) @@ -246,7 +246,7 @@ class Ui_procwind(object): self.procmnfm.setMinimumSize(QtCore.QSize(310, 310)) self.procmnfm.setMaximumSize(QtCore.QSize(310, 310)) self.procmnfm.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" + "background: transparent; border: 1px solid #808080;" ) self.procmnfm.setFrameShape(QtWidgets.QFrame.StyledPanel) self.procmnfm.setFrameShadow(QtWidgets.QFrame.Raised) @@ -744,9 +744,8 @@ class Ui_procwind(object): self.proctmbt.setSizePolicy(sizePolicy) self.proctmbt.setMinimumSize(QtCore.QSize(150, 20)) self.proctmbt.setMaximumSize(QtCore.QSize(150, 20)) - self.proctmbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; border-radius: 10px; font: 10pt "Inter";' - ) + self.proctmbt.setStyleSheet('font: 10pt "Inter";') + self.proctmbt.setAutoDefault(False) self.proctmbt.setObjectName("proctmbt") self.procklbt = QtWidgets.QPushButton(self.procwdgt) self.procklbt.setGeometry(QtCore.QRect(5, 430, 150, 20)) @@ -759,9 +758,8 @@ class Ui_procwind(object): self.procklbt.setSizePolicy(sizePolicy) self.procklbt.setMinimumSize(QtCore.QSize(150, 20)) self.procklbt.setMaximumSize(QtCore.QSize(150, 20)) - self.procklbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; border-radius: 10px; font: 10pt "Inter";' - ) + self.procklbt.setStyleSheet('font: 10pt "Inter";') + self.procklbt.setAutoDefault(False) self.procklbt.setObjectName("procklbt") self.procspbt = QtWidgets.QPushButton(self.procwdgt) self.procspbt.setGeometry(QtCore.QRect(165, 455, 150, 20)) @@ -774,9 +772,8 @@ class Ui_procwind(object): self.procspbt.setSizePolicy(sizePolicy) self.procspbt.setMinimumSize(QtCore.QSize(150, 20)) self.procspbt.setMaximumSize(QtCore.QSize(150, 20)) - self.procspbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; border-radius: 10px; font: 10pt "Inter";' - ) + self.procspbt.setStyleSheet('font: 10pt "Inter";') + self.procspbt.setAutoDefault(False) self.procspbt.setObjectName("procspbt") self.procrsbt = QtWidgets.QPushButton(self.procwdgt) self.procrsbt.setGeometry(QtCore.QRect(165, 430, 150, 20)) @@ -789,9 +786,8 @@ class Ui_procwind(object): self.procrsbt.setSizePolicy(sizePolicy) self.procrsbt.setMinimumSize(QtCore.QSize(150, 20)) self.procrsbt.setMaximumSize(QtCore.QSize(150, 20)) - self.procrsbt.setStyleSheet( - 'background-color: rgba(102, 178, 178, 0.5); border: none; border-radius: 10px; font: 10pt "Inter";' - ) + self.procrsbt.setStyleSheet('font: 10pt "Inter";') + self.procrsbt.setAutoDefault(False) self.procrsbt.setObjectName("procrsbt") self.procln16 = QtWidgets.QFrame(self.procwdgt) self.procln16.setGeometry(QtCore.QRect(160, 70, 1, 30)) @@ -826,6 +822,12 @@ class Ui_procwind(object): self.retranslateUi(procwind) QtCore.QMetaObject.connectSlotsByName(procwind) + procwind.setTabOrder(self.procklbt, self.procrsbt) + procwind.setTabOrder(self.procrsbt, self.proctmbt) + procwind.setTabOrder(self.proctmbt, self.procspbt) + procwind.setTabOrder(self.procspbt, self.memobutn) + procwind.setTabOrder(self.memobutn, self.pcidbutn) + procwind.setTabOrder(self.pcidbutn, self.cpudbutn) def retranslateUi(self, procwind): _translate = QtCore.QCoreApplication.translate diff --git a/obserware/sources/screens/sostwind/interface.py b/obserware/sources/screens/sostwind/interface.py index 4422996..2e94d61 100644 --- a/obserware/sources/screens/sostwind/interface.py +++ b/obserware/sources/screens/sostwind/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/sostwind.ui' +# Form implementation generated from reading ui file 'assets/uifiles/sostwind.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -93,9 +93,7 @@ class Ui_sostwind(object): self.frame.setSizePolicy(sizePolicy) self.frame.setMinimumSize(QtCore.QSize(470, 225)) self.frame.setMaximumSize(QtCore.QSize(470, 225)) - self.frame.setStyleSheet( - "background: transparent; border: 1px solid #808080; border-radius: 10px;" - ) + self.frame.setStyleSheet("background: transparent; border: 1px solid #808080;") self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) self.frame.setFrameShadow(QtWidgets.QFrame.Raised) self.frame.setObjectName("frame") diff --git a/obserware/sources/widgets/lgptwdgt/interface.py b/obserware/sources/widgets/lgptwdgt/interface.py index cca2550..ac35aa6 100644 --- a/obserware/sources/widgets/lgptwdgt/interface.py +++ b/obserware/sources/widgets/lgptwdgt/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/lgptwdgt.ui' +# Form implementation generated from reading ui file 'assets/uifiles/lgptwdgt.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -147,7 +147,7 @@ class Ui_lgptwdgt(object): self.lgptpgbr.setFont(font) self.lgptpgbr.setStyleSheet( "QProgressBar::chunk {background-color: #008080;}\n" - 'QProgressBar {border: 1px solid #808080; border-radius: 5px; font: 8pt "Inter";}' + 'QProgressBar {border: 1px solid #808080; font: 8pt "Inter";}' ) self.lgptpgbr.setProperty("value", 0) self.lgptpgbr.setAlignment( diff --git a/obserware/sources/widgets/phptwdgt/interface.py b/obserware/sources/widgets/phptwdgt/interface.py index 78f4e59..4bc1588 100644 --- a/obserware/sources/widgets/phptwdgt/interface.py +++ b/obserware/sources/widgets/phptwdgt/interface.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'obserware/assets/uifiles/phptwdgt.ui' +# Form implementation generated from reading ui file 'assets/uifiles/phptwdgt.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -147,7 +147,7 @@ class Ui_phptwdgt(object): self.phptpgbr.setFont(font) self.phptpgbr.setStyleSheet( "QProgressBar::chunk {background-color: #008080;}\n" - 'QProgressBar {border: 1px solid #808080; border-radius: 5px; font: 8pt "Inter";}' + 'QProgressBar {border: 1px solid #808080; font: 8pt "Inter";}' ) self.phptpgbr.setProperty("value", 0) self.phptpgbr.setAlignment(