fix power missing issue

This commit is contained in:
peijiankang 2022-12-15 17:48:18 +08:00
parent fff689d939
commit f004cde9da
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From 434d2c7ffce80409d61eb62fad01b2ed342161a1 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang>
Date: Thu, 15 Dec 2022 17:09:20 +0800
Subject: [PATCH] fix power missing issue
---
shell/mainwindow.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/shell/mainwindow.cpp b/shell/mainwindow.cpp
index a1ac0e5..c75e55b 100644
--- a/shell/mainwindow.cpp
+++ b/shell/mainwindow.cpp
@@ -810,7 +810,7 @@ QPushButton * MainWindow::buildLeftsideBtn(QString bname,QString tipName, QIcon
bool MainWindow::isExistsCloudAccount() {
QProcess *wifiPro = new QProcess();
QString shellOutput = "";
- wifiPro->start("dpkg -l | grep kylin-sso-client");
+ wifiPro->start("rpm -qa|grep kylin-sso-client");
wifiPro->waitForFinished();
QString output = wifiPro->readAll();
shellOutput += output;
@@ -827,14 +827,14 @@ bool MainWindow::isExistsCloudAccount() {
bool MainWindow::isExistsPower()
{
QProcess *process = new QProcess;
- process->start("dpkg -l ukui-power-manager");
+ process->start("rpm -q ukui-power-manager");
process->waitForFinished();
QByteArray ba = process->readAllStandardOutput();
delete process;
QString mOutput = QString(ba.data());
- return mOutput.contains("ii", Qt::CaseSensitive) ? true : false;
+ return mOutput.contains("ukui-power-manager", Qt::CaseSensitive) ? true : false;
}
bool MainWindow::isExistWirelessDevice()
--
2.33.0

View File

@ -1,13 +1,14 @@
%define debug_package %{nil}
Name: ukui-control-center
Version: 3.1.2
Release: 3
Release: 4
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-ukui-control-center.patch
Patch02: 0001-modify-version-info-error.patch
Patch03: 0003-fix-power-missing-issue.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: gsettings-qt-devel
@ -119,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 15 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-4
- fix power missing issue
* Fri Dec 9 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
- add libkylin-chkname1 Requires to fix useradd error