diff --git a/0001-removes-transparency.patch b/0001-removes-transparency.patch deleted file mode 100644 index 617f6f6..0000000 --- a/0001-removes-transparency.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 25409b7ebcfaa987ba38a3c8f5481b58362b4df4 Mon Sep 17 00:00:00 2001 -From: myshow <296570182@qq.com> -Date: Wed, 16 Dec 2020 16:37:42 +0800 -Subject: [PATCH] removes-transparency - ---- - src/propertiesdialog.cpp | 2 +- - src/systemmonitor.cpp | 2 +- - widgets/mydialog.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/propertiesdialog.cpp b/src/propertiesdialog.cpp -index c0c4b88..90fcd60 100644 ---- a/src/propertiesdialog.cpp -+++ b/src/propertiesdialog.cpp -@@ -43,7 +43,7 @@ PropertiesDialog::PropertiesDialog(QWidget *parent, pid_t processId) : QDialog(p - this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint/* | Qt::WindowCloseButtonHint*/| Qt::WindowStaysOnTopHint); - // this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint);//Attention: Qt::WindowCloseButtonHint make showMinimized() valid - -- this->setAttribute(Qt::WA_TranslucentBackground); -+// this->setAttribute(Qt::WA_TranslucentBackground); - this->setAttribute(Qt::WA_Resized, false); - // this->setMaximumSize(480, 600); - // this->setMinimumWidth(320); -diff --git a/src/systemmonitor.cpp b/src/systemmonitor.cpp -index 0aa8055..ac1af9a 100644 ---- a/src/systemmonitor.cpp -+++ b/src/systemmonitor.cpp -@@ -61,7 +61,7 @@ SystemMonitor::SystemMonitor(QWidget *parent) - this->setObjectName("SystemMonitor"); - - this->setWindowFlags(Qt::FramelessWindowHint); //set for no windowhint -- this->setAttribute(Qt::WA_TranslucentBackground);//背景透明 -+// this->setAttribute(Qt::WA_TranslucentBackground);//背景透明 - this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); - // QPainterPath path; - // auto rect = this->rect(); -diff --git a/widgets/mydialog.cpp b/widgets/mydialog.cpp -index a969f68..d940746 100644 ---- a/widgets/mydialog.cpp -+++ b/widgets/mydialog.cpp -@@ -39,7 +39,7 @@ MyDialog::MyDialog(const QString &title, const QString &message, QWidget *parent - this->setWindowFlags(this->windowFlags() | Qt::FramelessWindowHint | Qt::WindowCloseButtonHint); - // this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint);//Attention: Qt::WindowCloseButtonHint make showMinimized() valid - -- this->setAttribute(Qt::WA_TranslucentBackground); -+// this->setAttribute(Qt::WA_TranslucentBackground); - // this->setAttribute(Qt::WA_DeleteOnClose, false); - this->setAttribute(Qt::WA_Resized, false); - --- -2.29.2.windows.2 - diff --git a/hide_idle_rate.patch b/hide_idle_rate.patch deleted file mode 100644 index 049297d..0000000 --- a/hide_idle_rate.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur ukui-system-monitor-1.0.1/src/cpuratewidget.cpp ukui-system-monitor-1.0.1~/src/cpuratewidget.cpp ---- ukui-system-monitor-1.0.1/src/cpuratewidget.cpp 2019-05-27 15:48:18.000000000 +0800 -+++ ukui-system-monitor-1.0.1~/src/cpuratewidget.cpp 2021-08-31 22:55:24.266527686 +0800 -@@ -353,6 +353,9 @@ - m_cpuIdleRateText = new QLabel; - m_cpuIdleRateText->setStyleSheet("QLabel{background:transparent;font-size:20px;color:palette(windowTexg);}"); - -+ m_cpuIdleRateText->hide(); -+ m_cpuIdleRateTitle->hide(); -+ - m_cpuRunTimeTitle = new QLabel; - // m_cpuRunTimeTitle->setStyleSheet("QLabel{background:transparent;font-size:12px;color:palette(windowTexg);}"); - m_cpuRunTimeTitle->setText(tr("The running time of system")); diff --git a/ukui-system-monitor-1.0.1.tar.gz b/ukui-system-monitor-1.0.1.tar.gz deleted file mode 100644 index cc6686e..0000000 Binary files a/ukui-system-monitor-1.0.1.tar.gz and /dev/null differ diff --git a/ukui-system-monitor-2.0.10.tar.gz b/ukui-system-monitor-2.0.10.tar.gz new file mode 100644 index 0000000..750352b Binary files /dev/null and b/ukui-system-monitor-2.0.10.tar.gz differ diff --git a/ukui-system-monitor.spec b/ukui-system-monitor.spec index 0844e91..8825c06 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: ukui-system-monitor -Version: 1.0.1 +Version: 2.0.10 Release: 3 Summary: A simple system monitor written in QT License: GPL-3+ GPL-2+ @@ -20,6 +20,8 @@ BuildRequires: gsettings-qt-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: libpcap-devel BuildRequires: kf5-kwindowsystem-devel +BuildRequires: qt5-qtcharts-devel +BuildRequires: qt5-qtcharts #Requires: inotify-hookable #Requires: bsdutils @@ -32,15 +34,11 @@ Requires: kernel-tools Requires: pciutils Requires: libpcap -patch0: 0001-removes-transparency.patch -patch1: hide_idle_rate.patch %description A simple system monitor written in QT %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -69,8 +67,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/ukui-system-monitor.desktop %{_datadir}/icons/hicolor/ukui-system-monitor.png %{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml +%{_prefix}/lib64/qt5/plugins/generic/libprocnet-monitor.a +%{_datadir}/ukui/ukui-system-monitor.conf + %changelog +* Thu Jan 27 2022 huayadong - 2.0.10-1 +- update to upstream version 2.0.10-1 + * Wed Sep 1 2021 douyan - 1.0.1-3 - hide idle rate