57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
|
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
|
||
|
|
|