From 5c1eef8776857bb3be0de30d46075a0521d22773 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 18 Sep 2025 10:03:03 +0800 Subject: [PATCH] change password prompt (cherry picked from commit 2cddb6bf6b37feee688b6a7708d7cc011966ddb8) --- 0001-change-password-prompt.patch | 104 ++++++++++++++++++++++++++++++ dde-control-center.spec | 7 +- 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 0001-change-password-prompt.patch diff --git a/0001-change-password-prompt.patch b/0001-change-password-prompt.patch new file mode 100644 index 0000000..eb7b935 --- /dev/null +++ b/0001-change-password-prompt.patch @@ -0,0 +1,104 @@ +From a797b534cb017b7cd3f088c337aef29aa752879f Mon Sep 17 00:00:00 2001 +From: wangqi +Date: Thu, 4 Sep 2025 15:17:36 +0800 +Subject: [PATCH] change password prompt + +--- + src/frame/window/modules/accounts/modifypasswdpage.cpp | 6 ++++++ + translations/dde-control-center_en.ts | 8 +++++++- + translations/dde-control-center_zh_CN.ts | 5 +++++ + translations/dde-control-center_zh_HK.ts | 5 +++++ + translations/dde-control-center_zh_TW.ts | 5 +++++ + 5 files changed, 28 insertions(+), 1 deletion(-) + +diff --git a/src/frame/window/modules/accounts/modifypasswdpage.cpp b/src/frame/window/modules/accounts/modifypasswdpage.cpp +index 3a83915..ca00b82 100644 +--- a/src/frame/window/modules/accounts/modifypasswdpage.cpp ++++ b/src/frame/window/modules/accounts/modifypasswdpage.cpp +@@ -253,6 +253,12 @@ void ModifyPasswdPage::onPasswordChangeFinished(const int exitCode, const QStrin + qDebug() << "exit code:" << exitCode << "error text:" << errorTxt << "error type:" << error + << "error tips:" << PwqualityManager::instance()->getErrorTips(error); + if (exitCode != 0) { ++ if (errorTxt.contains("You must wait longer to change your password")) { ++ m_oldPasswordEdit->setAlert(true); ++ m_oldPasswordEdit->showAlertMessage(tr("You must wait longer to change your password")); ++ m_oldPasswordEdit->lineEdit()->selectAll(); ++ return; ++ } + if (errorTxt.startsWith("Current Password: passwd:", Qt::CaseInsensitive)) { + m_oldPasswordEdit->setAlert(true); + m_oldPasswordEdit->showAlertMessage(tr("Wrong password")); +diff --git a/translations/dde-control-center_en.ts b/translations/dde-control-center_en.ts +index 5f61a40..3fa9dba 100644 +--- a/translations/dde-control-center_en.ts ++++ b/translations/dde-control-center_en.ts +@@ -540,6 +540,12 @@ + Wrong password + Wrong password + ++ ++ ++ You must wait longer to change your password ++ You must wait longer to change your password ++ ++ + + + New password should differ from the current one +@@ -6488,4 +6494,4 @@ UnionTech Software is committed to research and improve the security, accuracy a + Control Center provides the options for system settings. + + +- +\ No newline at end of file ++ +diff --git a/translations/dde-control-center_zh_CN.ts b/translations/dde-control-center_zh_CN.ts +index 3d5e66b..92d2d6f 100644 +--- a/translations/dde-control-center_zh_CN.ts ++++ b/translations/dde-control-center_zh_CN.ts +@@ -540,6 +540,11 @@ + Wrong password + 密码错误 + ++ ++ ++ You must wait longer to change your password ++ 您必须等待更长时间以更改密码 ++ + + + New password should differ from the current one +diff --git a/translations/dde-control-center_zh_HK.ts b/translations/dde-control-center_zh_HK.ts +index 2adaccd..6e588e2 100644 +--- a/translations/dde-control-center_zh_HK.ts ++++ b/translations/dde-control-center_zh_HK.ts +@@ -540,6 +540,11 @@ + Wrong password + 密碼錯誤 + ++ ++ ++ You must wait longer to change your password ++ 您必須久候，以更改您的密碼 ++ + + + New password should differ from the current one +diff --git a/translations/dde-control-center_zh_TW.ts b/translations/dde-control-center_zh_TW.ts +index de875ec..f6d6f00 100644 +--- a/translations/dde-control-center_zh_TW.ts ++++ b/translations/dde-control-center_zh_TW.ts +@@ -540,6 +540,11 @@ + Wrong password + 密碼錯誤 + ++ ++ ++ You must wait longer to change your password ++ 您必須久候，以更改您的密碼 ++ + + + New password should differ from the current one +-- +2.43.0 diff --git a/dde-control-center.spec b/dde-control-center.spec index 2a8db5d..156a5f4 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,7 +1,7 @@ %define __cmake_builddir $(pwd) Name: dde-control-center Version: 5.5.182 -Release: 8 +Release: 9 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center @@ -29,6 +29,7 @@ Patch0011: 0010-fix-Array-out-of-bounds-causes-crash-handling.patch # hide activate Patch0012: 0011-hide-activate-function.patch #end +Patch0013: 0001-change-password-prompt.patch #Patch0: 0002-hide-authorized.patch #Patch1: 0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch @@ -105,6 +106,7 @@ Summary: %{summary} %patch0010 -p1 %patch0011 -p1 %patch0012 -p1 +%patch0013 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i -E '/add_compile_definitions/d' CMakeLists.txt @@ -161,6 +163,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Thu Sep 18 2025 wangqia - 5.5.182-9 +- fix: change password prompt + * Tue Sep 24 2024 songmingliang - 5.5.182-8 - delete redundant 0002-dde-control-center-delete-keyboard-wayland.patch -- Gitee