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

!170 [sync] PR-168: fix-activation-button-display-error

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

25
fix-ukui-control-center-3.1.2-activation-button-display-error.patch Normal file
View File

@ -0,0 +1,25 @@
diff -Naur ukui-control-center-3.1.2-O/plugins/system/about/about.cpp ukui-control-center-3.1.2~/plugins/system/about/about.cpp
--- ukui-control-center-3.1.2-O/plugins/system/about/about.cpp 2023-06-13 14:49:20.975918427 +0800
+++ ukui-control-center-3.1.2~/plugins/system/about/about.cpp 2023-06-14 00:13:15.785946666 +0800
@@ -683,9 +683,9 @@
}
mSequenceLabel_2->setText(serial);
mSequenceLabel_2->setStyleSheet("color : #2FB3E8");
- if (!serial.isEmpty())
+ if (serial.isEmpty())
mActivationBtn->hide();
- if (dateRes.isEmpty()) { //未激活
+ if (status == 0) { //未激活 激活或未激活应通过status判断
if (!trial_dateRes.isEmpty()) { //试用期
mStatusLabel_2->setText(tr("Inactivated"));
mStatusLabel_2->setStyleSheet("color : red ");
@@ -707,7 +707,8 @@
mStatusLabel_2->setStyleSheet("");
mStatusLabel_2->setText(tr("Activated"));
mTimeLabel_2->setText(dateRes);
- mActivationBtn->setText(tr("Extend"));
+ mActivationBtn->setText(tr("Extend"));
+ mActivationBtn->show();
}
connect(mActivationBtn, &QPushButton::clicked, this, &About::runActiveWindow);
}

6
ukui-control-center.spec
View File

@ -1,6 +1,6 @@
Name: ukui-control-center
Version: 3.1.2
Release: 18
Release: 19
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
@ -19,6 +19,7 @@ Patch14: 0014-fix-memorysize-of-aboutinfo.patch
Patch15: fix-changeOtherUserPasswd-critical-vulnerabilities.patch
Patch16: fix-createuser-critical-vulnerabilities.patch
Patch17: ukui-control-center-3.1.2-fix-password-changes-for-this-user-and-for-other-use.patch
Patch18: fix-ukui-control-center-3.1.2-activation-button-display-error.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: gsettings-qt-devel
@ -143,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jun 14 2023 huayadong <huayadong@kylinos.cn> - 3.1.2-19
- add patch:fix-ukui-control-center-3.1.2-activation-button-display-error.patch
* Fri Jun 09 2023 huayadong <huayadong@kylinos.cn> - 3.1.2-18
- fix password changes for this user and for other use