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

Repair user name related prompt information

Browse Source
This commit is contained in:
yangxianzhao 2023-04-06 16:22:20 +08:00
parent bbbb508d02
commit 5771765085
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0002-Repair-user-name-related-prompt-information.patch Normal file
View File

@ -0,0 +1,39 @@
From 73f60aa7739376cbcc638a505fa153233c705761 Mon Sep 17 00:00:00 2001
From: yangxianzhao <yangxianzhao@uniontech.com>
Date: Thu, 6 Apr 2023 16:19:59 +0800
Subject: [PATCH] Repair user name related prompt information
---
src/frame/window/modules/accounts/accountsdetailwidget.cpp | 2 +-
src/frame/window/modules/accounts/createaccountpage.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/frame/window/modules/accounts/accountsdetailwidget.cpp b/src/frame/window/modules/accounts/accountsdetailwidget.cpp
index b8ad19c..6239de9 100644
--- a/src/frame/window/modules/accounts/accountsdetailwidget.cpp
+++ b/src/frame/window/modules/accounts/accountsdetailwidget.cpp
@@ -297,7 +297,7 @@ void AccountsDetailWidget::initUserInfo(QVBoxLayout *layout)
for (User *user : userList) {
if (userFullName == user->fullname()) {
m_inputLineEdit->setAlert(true);
- m_inputLineEdit->showAlertMessage(tr("The username already exists"), m_inputLineEdit, 2000);
+ m_inputLineEdit->showAlertMessage(tr("The name already exists"), m_inputLineEdit, 2000);
m_inputLineEdit->lineEdit()->selectAll();
return;
}
diff --git a/src/frame/window/modules/accounts/createaccountpage.cpp b/src/frame/window/modules/accounts/createaccountpage.cpp
index 2a43c85..26b623d 100644
--- a/src/frame/window/modules/accounts/createaccountpage.cpp
+++ b/src/frame/window/modules/accounts/createaccountpage.cpp
@@ -477,7 +477,7 @@ bool CreateAccountPage::checkFullname()
for (User *user : userList) {
if (userFullName == user->fullname()) {
m_fullnameEdit->setAlert(true);
- m_fullnameEdit->showAlertMessage(tr("The username already exists"), m_fullnameEdit, 2000);
+ m_fullnameEdit->showAlertMessage(tr("The name already exists"), m_fullnameEdit, 2000);
m_fullnameEdit->lineEdit()->selectAll();
return false;
}
--
2.18.4

7
dde-control-center.spec
View File

@ -1,6 +1,6 @@
%define specrelease 1%{?dist}
%if 0%{?openeuler}
%define specrelease 4
%define specrelease 5
%endif
Name: dde-control-center
@ -11,6 +11,7 @@ License: GPLv3
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-hide-authorized.patch
Patch1: 0002-Repair-user-name-related-prompt-information.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
@ -59,6 +60,7 @@ Summary: %{summary}
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh
sed -i -E '/add_compile_definitions/d' CMakeLists.txt
@ -109,6 +111,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
%{_libdir}/cmake/DdeControlCenter/
%changelog
* Thu Apr 06 2023 yangxianzhao <yangxianzhao@uniontech.com> - 5.4.43.27-5
- Repair user name related prompt information
* Wed Aug 10 2022 liweiganga <liweiganga@uniontech.com> - 5.4.43.27-4
- fix: issue#I5LI5A