Compare commits
10 Commits
38d508148d
...
937ebe5a80
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
937ebe5a80 | ||
|
|
e6b54872f6 | ||
|
|
4e6fe928a2 | ||
|
|
5241867d8d | ||
|
|
78956341bd | ||
|
|
98a1c0fdaf | ||
|
|
21fad34104 | ||
|
|
6888de8293 | ||
|
|
11c68e2bd7 | ||
|
|
acb20de926 |
53
0001-removes-transparency.patch
Normal file
53
0001-removes-transparency.patch
Normal file
@ -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
|
||||
|
||||
13
hide_idle_rate.patch
Normal file
13
hide_idle_rate.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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"));
|
||||
@ -1,9 +1,9 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-system-monitor
|
||||
Version: 1.0.1
|
||||
Release: 1
|
||||
Release: 5
|
||||
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,21 @@ Requires: kernel-tools
|
||||
Requires: pciutils
|
||||
Requires: libpcap
|
||||
|
||||
#patch0: fix-monitor-default.patch
|
||||
|
||||
patch0: 0001-removes-transparency.patch
|
||||
patch1: hide_idle_rate.patch
|
||||
%description
|
||||
A simple system monitor written in QT
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%%patch0 -p1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
mkdir qmake-build
|
||||
pushd qmake-build
|
||||
%{qmake_qt5} ..
|
||||
%{qmake_qt5} ..
|
||||
%{make_build}
|
||||
popd
|
||||
|
||||
@ -55,9 +56,9 @@ pushd qmake-build
|
||||
popd
|
||||
|
||||
%post
|
||||
setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor
|
||||
set -e
|
||||
glib-compile-schemas /usr/share/glib-2.0/schemas/
|
||||
setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor &> /dev/null || :
|
||||
set -e &> /dev/null || :
|
||||
glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -70,8 +71,20 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.1-5
|
||||
- rebuild
|
||||
|
||||
* Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 1.0.1-4
|
||||
- fix first install post script issue
|
||||
|
||||
* Wed Sep 1 2021 douyan <douyan@kylinos.cn> - 1.0.1-3
|
||||
- hide idle rate
|
||||
|
||||
* Wed Dec 16 2020 lvhan <lvhan@kylinos.cn> - 1.0.1-2
|
||||
- removes transparency
|
||||
|
||||
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 1.0.1-1
|
||||
- update to upstream version 1.0.0-1+1027
|
||||
|
||||
* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 0.1.1-1
|
||||
- Init package for openEuler
|
||||
- Init package for openEuler
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user