From 8b276c960374982956399967a613dad23f5325f1 Mon Sep 17 00:00:00 2001 From: Akashdeep Dhar Date: Jan 08 2022 16:30:20 +0000 Subject: Review QListWidget items size hints Removed the theming colors for the donut chart slices Signed-off-by: Akashdeep Dhar --- diff --git a/obserware/sources/screens/cputwind/operations.py b/obserware/sources/screens/cputwind/operations.py index 892aefb..d280a94 100644 --- a/obserware/sources/screens/cputwind/operations.py +++ b/obserware/sources/screens/cputwind/operations.py @@ -52,7 +52,7 @@ class CPUTWind(QDialog, Ui_cputwind): for indx in range(cpucount): listitem = QListWidgetItem(self.cputlist) wdgtitem = CPUTWdgt(self, indx + 1) - listitem.setSizeHint(QSize(570, 250)) + listitem.setSizeHint(QSize(560, 250)) self.cputlist.setItemWidget(listitem, wdgtitem) self.cputlist.addItem(listitem) self.wdgtlist.append(wdgtitem) diff --git a/obserware/sources/screens/cyclwind/operations.py b/obserware/sources/screens/cyclwind/operations.py index 021cfba..0946562 100644 --- a/obserware/sources/screens/cyclwind/operations.py +++ b/obserware/sources/screens/cyclwind/operations.py @@ -54,7 +54,7 @@ class CyclWind(QDialog, Ui_cyclwind): for indx in range(cpucount): listitem = QListWidgetItem(self.cycllist) wdgtitem = CyclWdgt(self, indx + 1) - listitem.setSizeHint(QSize(450, 50)) + listitem.setSizeHint(QSize(350, 50)) self.cycllist.setItemWidget(listitem, wdgtitem) self.cycllist.addItem(listitem) self.wdgtlist.append(wdgtitem) diff --git a/obserware/sources/screens/lgptwind/operations.py b/obserware/sources/screens/lgptwind/operations.py index bf13791..d54c72b 100644 --- a/obserware/sources/screens/lgptwind/operations.py +++ b/obserware/sources/screens/lgptwind/operations.py @@ -43,7 +43,7 @@ class LgPtWind(QDialog, Ui_lgptwind): for indx in range(len(retndata)): listitem = QListWidgetItem(self.lgptlist) wdgtitem = LgPtWdgt(self, indx + 1) - listitem.setSizeHint(QSize(450, 110)) + listitem.setSizeHint(QSize(420, 110)) self.lgptlist.setItemWidget(listitem, wdgtitem) self.lgptlist.addItem(listitem) wdgtitem.handle_elements( diff --git a/obserware/sources/screens/mainwind/operations.py b/obserware/sources/screens/mainwind/operations.py index 773925f..54d5204 100644 --- a/obserware/sources/screens/mainwind/operations.py +++ b/obserware/sources/screens/mainwind/operations.py @@ -126,9 +126,7 @@ class MainWind(QMainWindow, Ui_mainwind): self.cpud_time_series.setHoleSize(0.60) self.cpud_donut_chart.setBackgroundBrush(QtGui.QColor("transparent")) cpud_free_slice = self.cpud_time_series.append("Free", 0.0) - cpud_free_slice.setBrush(QtGui.QColor("#b2d8d8")) cpud_used_slice = self.cpud_time_series.append("Used", 0.0) - cpud_used_slice.setBrush(QtGui.QColor("#008080")) self.cpud_donut_chart.legend().hide() self.cpud_donut_chart.addSeries(self.cpud_time_series) self.cpud_donut_chart.setAnimationOptions(QChart.SeriesAnimations) @@ -139,11 +137,8 @@ class MainWind(QMainWindow, Ui_mainwind): self.memo_time_series.setHoleSize(0.60) self.memo_donut_chart.setBackgroundBrush(QtGui.QColor("transparent")) memo_free_slice = self.memo_time_series.append("Free", 0.0) - memo_free_slice.setBrush(QtGui.QColor("#b2d8d8")) memo_cach_slice = self.memo_time_series.append("Cached", 0.0) - memo_cach_slice.setBrush(QtGui.QColor("#66b3b3")) memo_used_slice = self.memo_time_series.append("Used", 0.0) - memo_used_slice.setBrush(QtGui.QColor("#008080")) self.memo_time_series.append("Free", 0.0) self.memo_time_series.append("Used", 0.0) self.memo_donut_chart.legend().hide() @@ -156,9 +151,7 @@ class MainWind(QMainWindow, Ui_mainwind): self.swap_time_series.setHoleSize(0.60) self.swap_donut_chart.setBackgroundBrush(QtGui.QColor("transparent")) swap_free_slice = self.swap_time_series.append("Free", 0.0) - swap_free_slice.setBrush(QtGui.QColor("#b2d8d8")) swap_used_slice = self.swap_time_series.append("Used", 0.0) - swap_used_slice.setBrush(QtGui.QColor("#008080")) self.swap_time_series.append("Free", 0.0) self.swap_time_series.append("Used", 0.0) self.swap_donut_chart.legend().hide() diff --git a/obserware/sources/screens/phptwind/operations.py b/obserware/sources/screens/phptwind/operations.py index 5cee331..0b2174d 100644 --- a/obserware/sources/screens/phptwind/operations.py +++ b/obserware/sources/screens/phptwind/operations.py @@ -43,7 +43,7 @@ class PhPtWind(QDialog, Ui_phptwind): for indx in range(len(retndata)): listitem = QListWidgetItem(self.phptlist) wdgtitem = PhPtWdgt(self, indx + 1) - listitem.setSizeHint(QSize(450, 110)) + listitem.setSizeHint(QSize(420, 110)) self.phptlist.setItemWidget(listitem, wdgtitem) self.phptlist.addItem(listitem) wdgtitem.handle_elements( diff --git a/obserware/sources/widgets/cyclwdgt/operations.py b/obserware/sources/widgets/cyclwdgt/operations.py index a68b917..108f2fe 100644 --- a/obserware/sources/widgets/cyclwdgt/operations.py +++ b/obserware/sources/widgets/cyclwdgt/operations.py @@ -39,9 +39,7 @@ class CyclWdgt(QWidget, Ui_cyclwdgt): self.cpuutime.setHoleSize(0.55) self.cpuugraf.setBackgroundBrush(QtGui.QColor("transparent")) self.cpuufrlc = self.cpuutime.append("Free", 100 - cyclperc) - self.cpuufrlc.setBrush(QtGui.QColor("#b2d8d8")) self.cpuuuslc = self.cpuutime.append("Used", cyclperc) - self.cpuuuslc.setBrush(QtGui.QColor("#008080")) self.cpuugraf.legend().hide() self.cpuugraf.addSeries(self.cpuutime) self.cpuugraf.setAnimationOptions(QChart.SeriesAnimations) diff --git a/obserware/sources/widgets/ntwkwdgt/operations.py b/obserware/sources/widgets/ntwkwdgt/operations.py index 1de4d70..c106392 100644 --- a/obserware/sources/widgets/ntwkwdgt/operations.py +++ b/obserware/sources/widgets/ntwkwdgt/operations.py @@ -79,7 +79,7 @@ class NtwkWdgt(QWidget, Ui_ntwkwdgt): ntwkpdtx, ): self.ntwkdvce.setText(ntwkdvce) - self.ntwkstet.setText("ACTIVE" if ntwkstet else "INACTIVE") + self.ntwkstet.setText("toggle-on" if ntwkstet else "toggle-off") self.ntwkbrrt.setText("%s (%s)" % (ntwkbrrt, ntwkprrt)) self.ntwkbtrt.setText("%s (%s)" % (ntwkbtrt, ntwkptrt)) self.ntwkbprx.setText(