7c1c085a0a
- 简要展示激活信息,提供激活信息入口 - 修复部分代码问题 - 调整控制中心弹窗按钮问题 - 修复快捷键 提取desktop entry Exec过滤%u,%f问题 - 修复检查出内存泄漏的问题
63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
From 458eeaf6b93ace479e96dd464b9c13a1309aa67d Mon Sep 17 00:00:00 2001
|
|
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
Date: Mon, 14 Nov 2022 17:28:45 +0800
|
|
Subject: [PATCH 4/5] fix(messagebox): Adjust the pop-up button of account
|
|
management
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 调整帐户管理下弹框的按钮
|
|
---
|
|
.../account/src/pages/create-user-page/create-user-page.cpp | 2 +-
|
|
plugins/account/src/pages/user-info-page/user-info-page.cpp | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/plugins/account/src/pages/create-user-page/create-user-page.cpp b/plugins/account/src/pages/create-user-page/create-user-page.cpp
|
|
index 65a4b74..cb8695f 100644
|
|
--- a/plugins/account/src/pages/create-user-page/create-user-page.cpp
|
|
+++ b/plugins/account/src/pages/create-user-page/create-user-page.cpp
|
|
@@ -232,7 +232,7 @@ void CreateUserPage::handlerCreateNewUserIsDone(QString userPath,
|
|
if (!errMsg.isEmpty())
|
|
{
|
|
KiranMessageBox::message(nullptr, tr("Error"),
|
|
- errMsg, KiranMessageBox::Yes | KiranMessageBox::No);
|
|
+ errMsg, KiranMessageBox::Ok);
|
|
}
|
|
if (!userPath.isEmpty())
|
|
{
|
|
diff --git a/plugins/account/src/pages/user-info-page/user-info-page.cpp b/plugins/account/src/pages/user-info-page/user-info-page.cpp
|
|
index 68b2e17..4e76c51 100644
|
|
--- a/plugins/account/src/pages/user-info-page/user-info-page.cpp
|
|
+++ b/plugins/account/src/pages/user-info-page/user-info-page.cpp
|
|
@@ -311,7 +311,7 @@ void UserInfoPage::handlerUpdateUserPropertyDone(QString errMsg)
|
|
{
|
|
KiranMessageBox::message(nullptr,
|
|
tr("Error"), errMsg,
|
|
- KiranMessageBox::Yes | KiranMessageBox::No);
|
|
+ KiranMessageBox::Ok);
|
|
}
|
|
else
|
|
{
|
|
@@ -330,7 +330,7 @@ void UserInfoPage::handlerUpdatePasswdDone(QString errMsg)
|
|
{
|
|
KiranMessageBox::message(nullptr,
|
|
tr("Error"), errMsg,
|
|
- KiranMessageBox::Yes | KiranMessageBox::No);
|
|
+ KiranMessageBox::Ok);
|
|
}
|
|
else
|
|
{
|
|
@@ -363,7 +363,7 @@ void UserInfoPage::handlerDeleteUserDone(QString errMsg)
|
|
emit sigIsBusyChanged(false);
|
|
if (!errMsg.isEmpty())
|
|
{
|
|
- KiranMessageBox::message(this, tr("Error"), errMsg, KiranMessageBox::Yes | KiranMessageBox::No);
|
|
+ KiranMessageBox::message(this, tr("Error"), errMsg, KiranMessageBox::Ok);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|