diff --git a/0001-removes-transparency.patch b/0001-removes-transparency.patch new file mode 100644 index 0000000000000000000000000000000000000000..617f6f6d3b4c85040f930b2c3459e800edeed7fa --- /dev/null +++ b/0001-removes-transparency.patch @@ -0,0 +1,53 @@ +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/ukui-system-monitor.spec b/ukui-system-monitor.spec index 5482faae987acddcf735f840e2ae17ef7386adbe..8a5dc16f3411fe12b63129e2741ae11d4e984689 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,9 +1,9 @@ %define debug_package %{nil} Name: ukui-system-monitor Version: 1.0.1 -Release: 1 +Release: 2 Summary: A simple system monitor written in QT -License: GPL-3+ GPL-2+ +License: GPL-3+ GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz @@ -32,20 +32,20 @@ Requires: kernel-tools Requires: pciutils Requires: libpcap -#patch0: fix-monitor-default.patch +patch0: 0001-removes-transparency.patch %description A simple system monitor written in QT %prep %setup -q -#%%patch0 -p1 +%patch0 -p1 %build export PATH=%{_qt5_bindir}:$PATH mkdir qmake-build pushd qmake-build -%{qmake_qt5} .. +%{qmake_qt5} .. %{make_build} popd @@ -70,8 +70,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml %changelog +* Wed Dec 16 2020 lvhan - 1.0.1-2 +- removes transparency + * Mon Oct 26 2020 douyan - 1.0.1-1 - update to upstream version 1.0.0-1+1027 * Thu Jul 9 2020 douyan - 0.1.1-1 -- Init package for openEuler \ No newline at end of file +- Init package for openEuler