packages/ukui-control-center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!145 fix memorysize of aboutinfo

Browse Source 
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2023-03-30 03:25:13 +00:00 committed by Gitee
commit 6f00f438a6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0014-fix-memorysize-of-aboutinfo.patch Normal file
View File

@ -0,0 +1,51 @@
From b37c6f1491e04a28808660b57bb0b51cb23759a3 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 30 Mar 2023 10:36:31 +0800
Subject: [PATCH] fix memorysize of aboutinfo
---
plugins/system/about/about.cpp | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/plugins/system/about/about.cpp b/plugins/system/about/about.cpp
index 824b781..e783d9b 100644
--- a/plugins/system/about/about.cpp
+++ b/plugins/system/about/about.cpp
@@ -879,20 +879,20 @@ void About::setupKernelCompenent()
QString kernal = QSysInfo::kernelType() + " " + QSysInfo::kernelVersion();
getTotalMemory();
- QDBusInterface *memoryDbus = new QDBusInterface("com.control.center.qt.systemdbus",
- "/",
- "com.control.center.interface",
- QDBusConnection::systemBus(), this);
- if (memoryDbus->isValid()) {
- QDBusReply<QString> result = memoryDbus->call("getMemory");
- qDebug()<<"memory :"<<result;
- if (!result.value().isEmpty()) {
- memorySize.clear();
- memorySize.append(result + "GB" + mMemAvaliable);
- }
- }
- if (memorySize == "0GB")
- memorySize = mMemtotal + mMemAvaliable;
+// QDBusInterface *memoryDbus = new QDBusInterface("com.control.center.qt.systemdbus",
+// "/",
+// "com.control.center.interface",
+// QDBusConnection::systemBus(), this);
+// if (memoryDbus->isValid()) {
+// QDBusReply<QString> result = memoryDbus->call("getMemory");
+// qDebug()<<"memory :"<<result;
+// if (!result.value().isEmpty()) {
+// memorySize.clear();
+// memorySize.append(result + "GB" + mMemAvaliable);
+// }
+// }
+// if (memorySize == "0GB")
+ memorySize = mMemtotal + mMemAvaliable;
qDebug()<<kernal;
mKernelLabel_2->setText(kernal);
--
2.39.1

6
ukui-control-center.spec
View File

@ -1,6 +1,6 @@
Name: ukui-control-center
Version: 3.1.2
Release: 13
Release: 14
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
@ -15,6 +15,7 @@ Patch10: 0010-Fix-the-problem-of-scrambled-shortcut-keys.patch
Patch11: 0011-Fix-about-copyright-display-error.patch
Patch12: 0012-fix-add-group-failed-issue.patch
Patch13: 0013-Fix-terminal-garbled-characters-when-not-root-user-change-locale-language.patch
Patch14: 0014-fix-memorysize-of-aboutinfo.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: gsettings-qt-devel
@ -140,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Mar 30 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-14
- fix memorysize of aboutinfo
* Fri Mar 17 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.2-13
- Fix terminal garbled characters when not root user change locale language