!38 修复一些已知问题
From: @leeffo Reviewed-by: @HelloWorld_lvcongqing Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
openeuler-ci-bot
Gitee
commit
69087bfc46
56
0004-fix.patch
Normal file
56
0004-fix.patch
Normal file
@ -0,0 +1,56 @@
|
||||
From 232b34bc0ae1e2fb3ea258d9e33a04fcbcf793b6 Mon Sep 17 00:00:00 2001
|
||||
From: leeffo <leeffo@yeah.net>
|
||||
Date: Thu, 8 Jun 2023 14:26:53 +0800
|
||||
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
|
||||
=?UTF-8?q?=E7=89=88=E6=9C=AC=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF=E5=90=8E?=
|
||||
=?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83=E8=BF=9B=E5=85=A5=E7=B3=BB?=
|
||||
=?UTF-8?q?=E7=BB=9F=E4=BF=A1=E6=81=AF=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
.../window/modules/systeminfo/nativeinfowidget.cpp | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
|
||||
index d7db8d6..7bfdfc8 100644
|
||||
--- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
|
||||
+++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp
|
||||
@@ -85,6 +85,12 @@ NativeInfoWidget::NativeInfoWidget(SystemInfoModel *model, QWidget *parent)
|
||||
, m_mainLayout(new QVBoxLayout(this))
|
||||
, m_hostNameLayout(new QHBoxLayout(this))
|
||||
, m_hostNameSettingItem(new SettingsItem(this))
|
||||
+ , m_hostNameTitleLabel(nullptr)
|
||||
+ , m_hostNameLabel(nullptr)
|
||||
+ , m_hostNameBtn(nullptr)
|
||||
+ , m_hostNameLineEdit(nullptr)
|
||||
+ , m_productName(nullptr)
|
||||
+ , m_versionNumber(nullptr)
|
||||
, isContensServers(false)
|
||||
{
|
||||
initWidget();
|
||||
@@ -304,7 +310,7 @@ void NativeInfoWidget::resizeEvent(QResizeEvent *event)
|
||||
{
|
||||
ContentWidget::resizeEvent(event);
|
||||
|
||||
- if(m_hostNameLineEdit->isAlert()) {
|
||||
+ if(m_hostNameLineEdit && m_hostNameLineEdit->isAlert()) {
|
||||
m_hostNameLineEdit->hideAlertMessage();
|
||||
m_hostNameLineEdit->showAlertMessage(m_alertMessage,this);
|
||||
}
|
||||
@@ -374,9 +380,9 @@ const QString NativeInfoWidget::systemCopyright() const
|
||||
|
||||
if (oem_copyright.isEmpty()) {
|
||||
if (DSysInfo::isCommunityEdition())
|
||||
- return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(2022);
|
||||
+ return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2011-%1 Deepin Community").arg(QString(__DATE__).right(4));
|
||||
else
|
||||
- return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(2022);
|
||||
+ return QApplication::translate("dcc::systeminfo::SystemInfoWidget", "Copyright© 2019-%1 UnionTech Software Technology Co., LTD").arg(QString(__DATE__).right(4));
|
||||
} else {
|
||||
return oem_copyright;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 80e9d14a6f529fd3bccd0dd90fafb7b4fb82bb0b Mon Sep 17 00:00:00 2001
|
||||
From: leeffo <leeffo@yeah.net>
|
||||
Date: Thu, 8 Jun 2023 14:27:41 +0800
|
||||
Subject: [PATCH 2/2] fix: hide commoninfo and end-user-license-agreement
|
||||
|
||||
---
|
||||
com.deepin.dde.control-center.gschema.xml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/com.deepin.dde.control-center.gschema.xml b/com.deepin.dde.control-center.gschema.xml
|
||||
index 5b2a70f..6b330d2 100644
|
||||
--- a/com.deepin.dde.control-center.gschema.xml
|
||||
+++ b/com.deepin.dde.control-center.gschema.xml
|
||||
@@ -39,7 +39,7 @@
|
||||
<summary>Waiting for sound receipt Wait 1 second by default</summary>
|
||||
</key>
|
||||
<key name="hide-module" type="as">
|
||||
- <default>[]</default>
|
||||
+ <default>['commoninfo']</default>
|
||||
<summary>The module to display</summary>
|
||||
</key>
|
||||
<key name="show-createuser" type="b">
|
||||
@@ -720,7 +720,7 @@
|
||||
<description>default is true</description>
|
||||
</key>
|
||||
<key name="end-user-license-agreement" type="b">
|
||||
- <default>true</default>
|
||||
+ <default>false</default>
|
||||
<summary></summary>
|
||||
<description>default is true</description>
|
||||
</key>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
%define specrelease 1%{?dist}
|
||||
%define specrelease 3%{?dist}
|
||||
%if 0%{?openeuler}
|
||||
%define specrelease 2
|
||||
%define specrelease 3
|
||||
%endif
|
||||
|
||||
Name: dde-control-center
|
||||
@ -13,6 +13,8 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: 0002-hide-authorized.patch
|
||||
Patch1: 0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch
|
||||
Patch2: 0003-bugfix-for-no-check-newpassword-at-modifypwd.patch
|
||||
Patch3: 0004-fix.patch
|
||||
Patch4: 0005-fix-hide-commoninfo-and-end-user-license-agreement.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
@ -63,6 +65,8 @@ Summary: %{summary}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
|
||||
sed -i -E '/add_compile_definitions/d' CMakeLists.txt
|
||||
|
||||
@ -113,6 +117,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
|
||||
%{_libdir}/cmake/DdeControlCenter/
|
||||
|
||||
%changelog
|
||||
* Thu Jun 08 2023 lee <liweiganga@uniontech.com> - 5.4.85.4-3
|
||||
- fix: control-center core and hide commoninfo
|
||||
|
||||
* Tue Apr 11 2023 Dongxing Wang <dxwangk@isoftstone.com> - 5.4.85.4-2
|
||||
- fix: issue#I6QIOR bugfix-for-no-check-newpassword-at-modifypwd
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user