From 15c5f91239c15f2abab1a0bf8b0cf1c57a6686f7 Mon Sep 17 00:00:00 2001 From: huayadong Date: Thu, 20 Jul 2023 15:45:03 +0800 Subject: [PATCH] fix-activation-button-display-error (cherry picked from commit ccbd8174f2ef1df0e87c38daf974df1240902069) --- ....1.2-activation-button-display-error.patch | 25 +++++++++++++++++++ ukui-control-center.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix-ukui-control-center-3.1.2-activation-button-display-error.patch diff --git a/fix-ukui-control-center-3.1.2-activation-button-display-error.patch b/fix-ukui-control-center-3.1.2-activation-button-display-error.patch new file mode 100644 index 0000000..9c46d01 --- /dev/null +++ b/fix-ukui-control-center-3.1.2-activation-button-display-error.patch @@ -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); + } diff --git a/ukui-control-center.spec b/ukui-control-center.spec index 50a4ce7..c5fca1b 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -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 - 3.1.2-19 +- add patch:fix-ukui-control-center-3.1.2-activation-button-display-error.patch + * Fri Jun 09 2023 huayadong - 3.1.2-18 - fix password changes for this user and for other use