update to 2.2.0
This commit is contained in:
parent
e40eb3399a
commit
ec0bc9689d
@ -0,0 +1,33 @@
|
||||
From 973431738550652eca51ff83639909eb5cef4bd9 Mon Sep 17 00:00:00 2001
|
||||
From: liuxinhao <liuxinhao@kylinos.com.cn>
|
||||
Date: Thu, 30 Dec 2021 09:46:51 +0800
|
||||
Subject: [PATCH] fix(control center): fix kiran session account management is
|
||||
not displayed in the control panel
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 修复账户管理工具由于desktop之中OnlyShowIn=MATE,导致的不能显示在KIRAN桌面的mate-control-center之中
|
||||
|
||||
Signed-off-by: liuxinhao <liuxinhao@kylinos.com.cn>
|
||||
---
|
||||
config/kiran-cpanel-account.desktop.in | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config/kiran-cpanel-account.desktop.in b/config/kiran-cpanel-account.desktop.in
|
||||
index 37f640b..d5d2b2c 100644
|
||||
--- a/config/kiran-cpanel-account.desktop.in
|
||||
+++ b/config/kiran-cpanel-account.desktop.in
|
||||
@@ -9,8 +9,7 @@ Exec=kiran-cpanel-launcher --cpanel-plugin=kiran-cpanel-account
|
||||
Icon=kcp-account
|
||||
StartupNotify=true
|
||||
Categories=Qt;Settings;Account;X-System-Server;X-Common-Features;
|
||||
-Keywords=mate-control-center;MATE;clock;date;user;account;
|
||||
-OnlyShowIn=MATE;
|
||||
+Keywords=user;account;
|
||||
X-KIRAN-NoDisplay=true
|
||||
|
||||
[Kiran Control Panel Plugin]
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,77 @@
|
||||
From 04c065a529a55619cb640fbe4df85dd68993c90b Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
Date: Tue, 25 Jan 2022 16:09:54 +0800
|
||||
Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build
|
||||
error
|
||||
|
||||
---
|
||||
avatar-editor/src/image-preview-widget.cpp | 1 +
|
||||
src/widgets/avatar-item-button.cpp | 1 +
|
||||
src/widgets/enroll-progressbar.cpp | 1 +
|
||||
src/widgets/kiran-tips.cpp | 1 +
|
||||
src/widgets/user-avatar-widget.cpp | 1 +
|
||||
5 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/avatar-editor/src/image-preview-widget.cpp b/avatar-editor/src/image-preview-widget.cpp
|
||||
index a471969..920afb9 100644
|
||||
--- a/avatar-editor/src/image-preview-widget.cpp
|
||||
+++ b/avatar-editor/src/image-preview-widget.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <QResizeEvent>
|
||||
#include <QTimer>
|
||||
#include <QWheelEvent>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include "image-preview-widget.h"
|
||||
#include "include/ui-defines.h"
|
||||
diff --git a/src/widgets/avatar-item-button.cpp b/src/widgets/avatar-item-button.cpp
|
||||
index ad2082d..430db56 100644
|
||||
--- a/src/widgets/avatar-item-button.cpp
|
||||
+++ b/src/widgets/avatar-item-button.cpp
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <QSvgRenderer>
|
||||
#include <QtDebug>
|
||||
#include <QtMath>
|
||||
+#include <QPainterPath>
|
||||
|
||||
AvatarItemButton::AvatarItemButton(QWidget *parent)
|
||||
: QAbstractButton(parent),
|
||||
diff --git a/src/widgets/enroll-progressbar.cpp b/src/widgets/enroll-progressbar.cpp
|
||||
index d749716..494a8f8 100644
|
||||
--- a/src/widgets/enroll-progressbar.cpp
|
||||
+++ b/src/widgets/enroll-progressbar.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "enroll-progressbar.h"
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
|
||||
EnrollProgressBar::EnrollProgressBar(QWidget *parent) : QWidget(parent)
|
||||
{
|
||||
diff --git a/src/widgets/kiran-tips.cpp b/src/widgets/kiran-tips.cpp
|
||||
index d727b05..96122b4 100644
|
||||
--- a/src/widgets/kiran-tips.cpp
|
||||
+++ b/src/widgets/kiran-tips.cpp
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <QPainter>
|
||||
#include <QStyleOption>
|
||||
#include <QTimerEvent>
|
||||
+#include <QPainterPath>
|
||||
|
||||
///tips离显示控件的间距
|
||||
#define TIPS_SPACING 3
|
||||
diff --git a/src/widgets/user-avatar-widget.cpp b/src/widgets/user-avatar-widget.cpp
|
||||
index 7305ca6..b1974c4 100644
|
||||
--- a/src/widgets/user-avatar-widget.cpp
|
||||
+++ b/src/widgets/user-avatar-widget.cpp
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <QPainter>
|
||||
#include <QtMath>
|
||||
#include <qt5-log-i.h>
|
||||
+#include <QPainterPath>
|
||||
|
||||
UserAvatarWidget::UserAvatarWidget(QWidget *parent)
|
||||
: QWidget(parent),
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,350 @@
|
||||
From 60fd3816a74cabbad309d1320fb21121001e0b8d Mon Sep 17 00:00:00 2001
|
||||
From: liuxinhao <liuxinhao@kylinos.com.cn>
|
||||
Date: Wed, 19 Jan 2022 15:22:48 +0800
|
||||
Subject: [PATCH] fix(create user): the user was created successfully, but the
|
||||
property setting failed. The user will not be deleted
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 创建用户成功,设置属性失败不删除用户,弹窗警告用户
|
||||
|
||||
Closes #47439
|
||||
|
||||
Signed-off-by: liuxinhao <liuxinhao@kylinos.com.cn>
|
||||
---
|
||||
src/hard-worker.cpp | 6 +-
|
||||
.../advance-settings.cpp | 2 +-
|
||||
.../create-user-page/create-user-page.cpp | 10 ++-
|
||||
translations/kiran-cpanel-account.zh_CN.ts | 85 ++++++++++---------
|
||||
4 files changed, 58 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/src/hard-worker.cpp b/src/hard-worker.cpp
|
||||
index 89ac041..3ab232c 100644
|
||||
--- a/src/hard-worker.cpp
|
||||
+++ b/src/hard-worker.cpp
|
||||
@@ -110,7 +110,10 @@ void HardWorker::doCreateUser(QString userName,
|
||||
KLOG_INFO() << QString("create user(%1) is done").arg(userName);
|
||||
emit sigCreateUserDnoe(userObjPath, "");
|
||||
return;
|
||||
+
|
||||
failed:
|
||||
+ //NOTE:创建用户成功,设置用户属性失败时,不再删除用户
|
||||
+#if 0
|
||||
if (!userObjPath.isEmpty())
|
||||
{
|
||||
KSDAccountsUserProxy userInterface(ACCOUNTS_DBUS_NAME,
|
||||
@@ -125,13 +128,14 @@ failed:
|
||||
KLOG_WARNING() << "create user failed,delete user:" << reply.error();
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
QString errMsg = errMsgPrefix;
|
||||
if (!errMsgDetail.isEmpty())
|
||||
{
|
||||
errMsg.append(",");
|
||||
errMsg.append(errMsgDetail);
|
||||
}
|
||||
- emit sigCreateUserDnoe("", errMsg);
|
||||
+ emit sigCreateUserDnoe(userObjPath, errMsg);
|
||||
}
|
||||
|
||||
void HardWorker::doUpdatePasswd(QString objPath,
|
||||
diff --git a/src/pages/advance-settings-page/advance-settings.cpp b/src/pages/advance-settings-page/advance-settings.cpp
|
||||
index 3fd7900..244cf00 100644
|
||||
--- a/src/pages/advance-settings-page/advance-settings.cpp
|
||||
+++ b/src/pages/advance-settings-page/advance-settings.cpp
|
||||
@@ -58,7 +58,7 @@ void AdvanceSettings::setInfo(QString userName, AdvanceSettingsInfo &info)
|
||||
}
|
||||
else
|
||||
{
|
||||
- ui->edit_loginShell->clear();
|
||||
+ ui->edit_loginShell->setText(DEFAULT_SHELL);
|
||||
}
|
||||
|
||||
///缓存账用户信息,当特殊用户Home目录设置关闭时,重新生成Home目录路径
|
||||
diff --git a/src/pages/create-user-page/create-user-page.cpp b/src/pages/create-user-page/create-user-page.cpp
|
||||
index 69092a6..7f3956e 100644
|
||||
--- a/src/pages/create-user-page/create-user-page.cpp
|
||||
+++ b/src/pages/create-user-page/create-user-page.cpp
|
||||
@@ -241,11 +241,15 @@ void CreateUserPage::handlerCreateNewUserIsDone(QString userPath,
|
||||
{
|
||||
emit sigIsBusyChanged(false);
|
||||
ui->btn_confirm->setBusy(false);
|
||||
- if (!errMsg.isEmpty())
|
||||
+ if (!errMsg.isEmpty() && userPath.isEmpty())
|
||||
{
|
||||
- KiranMessageBox::message(nullptr, tr("Error"),
|
||||
- errMsg, KiranMessageBox::Yes | KiranMessageBox::No);
|
||||
+ KiranMessageBox::message(nullptr, tr("Error"),errMsg, KiranMessageBox::Ok);
|
||||
}
|
||||
+ else if(!errMsg.isEmpty() && !userPath.isEmpty())
|
||||
+ {
|
||||
+ KiranMessageBox::message(nullptr,tr("Warning"),errMsg,KiranMessageBox::Ok);
|
||||
+ }
|
||||
+
|
||||
if (!userPath.isEmpty())
|
||||
{
|
||||
emit sigRequestSetCurrentUser(userPath);
|
||||
diff --git a/translations/kiran-cpanel-account.zh_CN.ts b/translations/kiran-cpanel-account.zh_CN.ts
|
||||
index 9a48aef..6b430c9 100644
|
||||
--- a/translations/kiran-cpanel-account.zh_CN.ts
|
||||
+++ b/translations/kiran-cpanel-account.zh_CN.ts
|
||||
@@ -76,8 +76,8 @@
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="129"/>
|
||||
- <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="139"/>
|
||||
+ <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="130"/>
|
||||
+ <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="140"/>
|
||||
<source>Automatically generated by system</source>
|
||||
<translation>由系统自动生成</translation>
|
||||
</message>
|
||||
@@ -89,17 +89,17 @@
|
||||
<translation>指定用户目录</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="171"/>
|
||||
+ <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="172"/>
|
||||
<source>Please enter the correct path</source>
|
||||
<translation>请输入正确的路径</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="179"/>
|
||||
+ <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="180"/>
|
||||
<source>Please enter specify user Id</source>
|
||||
<translation>请输入用户ID</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="187"/>
|
||||
+ <location filename="../src/pages/advance-settings-page/advance-settings.cpp" line="188"/>
|
||||
<source>Please enter the correct home directory</source>
|
||||
<translation>请输入正确的用户目录</translation>
|
||||
</message>
|
||||
@@ -212,12 +212,12 @@
|
||||
<translation type="vanished">账户类型</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="83"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="84"/>
|
||||
<source>standard</source>
|
||||
<translation>普通用户</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="84"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="85"/>
|
||||
<source>administrator</source>
|
||||
<translation>管理员</translation>
|
||||
</message>
|
||||
@@ -298,51 +298,56 @@
|
||||
<translation type="vanished">请输入用户名</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="107"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="108"/>
|
||||
<source>Please enter user name first</source>
|
||||
<translation>请输入用户名</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="141"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="142"/>
|
||||
<source>Please enter your user name</source>
|
||||
<translation>请输入用户名</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="157"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="158"/>
|
||||
<source>user name cannot be a pure number</source>
|
||||
<translation>用户名不能全为数字</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="164"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="165"/>
|
||||
<source>user name already exists</source>
|
||||
<translation>用户名已存在</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="176"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="177"/>
|
||||
<source>Please enter your password</source>
|
||||
<translation type="unfinished">请输入密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="183"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="184"/>
|
||||
<source>Please enter the password again</source>
|
||||
<translation>请再次输入密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="190"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="191"/>
|
||||
<source>The password you enter must be the same as the former one</source>
|
||||
<translation>两次密码不相同,请核对后,再次输入</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="200"/>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="235"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="211"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="247"/>
|
||||
<source>Error</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="200"/>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="211"/>
|
||||
<source>Password encryption failed</source>
|
||||
<translation>密码加密失败</translation>
|
||||
</message>
|
||||
+ <message>
|
||||
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="251"/>
|
||||
+ <source>Warning</source>
|
||||
+ <translation type="unfinished">警告</translation>
|
||||
+ </message>
|
||||
</context>
|
||||
<context>
|
||||
<name>FaceEnrollDialog</name>
|
||||
@@ -520,17 +525,17 @@
|
||||
<translation type="vanished">设置用户属性失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="147"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="151"/>
|
||||
<source> update password failed</source>
|
||||
<translation>更新密码失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="173"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="177"/>
|
||||
<source>icon file</source>
|
||||
<translation>头像</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="184"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="188"/>
|
||||
<source>userName type</source>
|
||||
<translation>用户名</translation>
|
||||
</message>
|
||||
@@ -539,12 +544,12 @@
|
||||
<translation type="vanished">账户类型</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="195"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="199"/>
|
||||
<source>locked</source>
|
||||
<translation>启用状态</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="203"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="207"/>
|
||||
<source>Failed to update user properties,%1</source>
|
||||
<translation>更新用户属性失败,%1</translation>
|
||||
</message>
|
||||
@@ -553,7 +558,7 @@
|
||||
<translation type="vanished">更新用户属性失败(%1)</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/hard-worker.cpp" line="226"/>
|
||||
+ <location filename="../src/hard-worker.cpp" line="230"/>
|
||||
<source>Failed to delete user,%1</source>
|
||||
<translation>删除用户失败,%1</translation>
|
||||
</message>
|
||||
@@ -837,12 +842,12 @@
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="141"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="143"/>
|
||||
<source>standard</source>
|
||||
<translation>普通用户</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="142"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="144"/>
|
||||
<source>administrator</source>
|
||||
<translation>管理员</translation>
|
||||
</message>
|
||||
@@ -851,65 +856,65 @@
|
||||
<translation type="vanished">账户信息更新成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="326"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="338"/>
|
||||
<source>Password updated successfully</source>
|
||||
<translation>密码更新成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="332"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="344"/>
|
||||
<source>The directory and files under the user's home directory are deleted with the user.Are you sure you want to delete the user(%1)?</source>
|
||||
<translation>用户目录下的目录和文件会随用户一起删除,确定要删除%1用户吗?</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="335"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="347"/>
|
||||
<source>Warning</source>
|
||||
<translation>警告</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="217"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="219"/>
|
||||
<source>Please enter the new user password</source>
|
||||
<translation>请输入新密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="225"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="227"/>
|
||||
<source>Please enter the password again</source>
|
||||
<translation>请再次输入密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="231"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="233"/>
|
||||
<source>The password you enter must be the same as the former one</source>
|
||||
<translation>两次密码不相同,请核对后,再次输入</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="242"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="244"/>
|
||||
<source>Please enter the current user password</source>
|
||||
<translation>请输入当前密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="248"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="250"/>
|
||||
<source>The current password is incorrect</source>
|
||||
<translation>当前密码错误,请再次输入</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="255"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="257"/>
|
||||
<source>The new password cannot be the same as the current password</source>
|
||||
<translation>新密码不能和旧密码相同,请重新输入</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="264"/>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="301"/>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="320"/>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="354"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="276"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="313"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="332"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="366"/>
|
||||
<source>Error</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="264"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="276"/>
|
||||
<source>Password encryption failed</source>
|
||||
<translation>密码加密失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../src/pages/user-info-page/user-info-page.cpp" line="306"/>
|
||||
+ <location filename="../src/pages/user-info-page/user-info-page.cpp" line="318"/>
|
||||
<source>user information updated successfully</source>
|
||||
<translation>用户信息更新成功</translation>
|
||||
</message>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Binary file not shown.
@ -1,14 +1,15 @@
|
||||
Name: kiran-cpanel-account
|
||||
Version: 2.1.1
|
||||
Release: 3%{?dist}
|
||||
Version: 2.2.0
|
||||
Release: 3.kb4
|
||||
Summary: Kiran Account Manager
|
||||
Summary(zh_CN): 账户管理工具
|
||||
Summary(zh_CN): 用户管理工具
|
||||
|
||||
License: Mulan PSL v2
|
||||
#URL:
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
%define SHOW_AUTH_MANAGER false
|
||||
Patch0001: 0000-fix-control-center-fix-kiran-session-account-managem-97343173.patch
|
||||
Patch0002: 0002-fix-create-user-the-user-was-created-successfully-bu-60fd3816.patch
|
||||
Patch0003: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
@ -21,10 +22,8 @@ BuildRequires: qt5-qtx11extras-devel
|
||||
BuildRequires: qt5-qtsvg-devel
|
||||
BuildRequires: kiran-widgets-qt5-devel
|
||||
BuildRequires: zeromq-devel
|
||||
BuildRequires: kiran-cc-daemon-devel
|
||||
%if %{SHOW_AUTH_MANAGER} == true
|
||||
BuildRequires: kiran-cc-daemon-devel >= 2.0.7
|
||||
BuildRequires: kiran-biometrics-devel
|
||||
%endif
|
||||
BuildRequires: kiran-log-qt5-devel
|
||||
BuildRequires: kiran-control-panel-devel
|
||||
BuildRequires: kiran-qdbusxml2cpp
|
||||
@ -37,9 +36,7 @@ Requires: qt5-qtbase
|
||||
Requires: qt5-qtx11extras
|
||||
Requires: zeromq
|
||||
Requires: kiran-system-daemon
|
||||
%if %{SHOW_AUTH_MANAGER} == true
|
||||
Requires: kiran-biometrics
|
||||
%endif
|
||||
Requires: kiran-log-qt5
|
||||
Requires: kiran-cpanel-launcher
|
||||
|
||||
@ -54,12 +51,7 @@ Account Manager
|
||||
|
||||
%build
|
||||
%{__mkdir} -p %{buildroot}
|
||||
|
||||
%cmake \
|
||||
%if %{SHOW_AUTH_MANAGER} == true
|
||||
-DAUTH_MANAGER_VISIBLE=on \
|
||||
%endif
|
||||
|
||||
%cmake
|
||||
make
|
||||
|
||||
%install
|
||||
@ -93,8 +85,36 @@ fi
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Mon Oct 18 2021 xiewenhao <xiewenhao@kylinos.com.cn> - 2.1.1-2
|
||||
- KYOS: rebuild for KiranUI-2.1-OE (#43502)
|
||||
* Wed Jan 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.0-3.kb4
|
||||
- KYOS-B: fix compilation errors on OpenEuler
|
||||
|
||||
* Wed Jan 19 2022 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-3.kb3
|
||||
- KYOS-B: the user was created successfully, but the property setting failed. The user will not be deleted(#47439)
|
||||
|
||||
* Thu Dec 30 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-3.kb2
|
||||
- fix kiran session account management is not displayed in the control panel
|
||||
|
||||
* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 2.2.0-3.kb1
|
||||
- rebuild for KY3.4-MATE-modules-dev
|
||||
|
||||
* Wed Dec 29 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.0-3
|
||||
- Upgrade version number for easy upgrade
|
||||
|
||||
* Tue Dec 28 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.0-2.kb1
|
||||
- rebuild for KY3.4-4-KiranUI-2.2
|
||||
|
||||
* Tue Dec 21 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-2
|
||||
- KYOS-F: add do crack passwd check build option
|
||||
|
||||
* Thu Dec 02 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.0-1
|
||||
- KYBD: rebuild for 2.2,changed required name to kiran-widgets-qt5
|
||||
|
||||
* Thu Dec 02 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.1-2.kb2
|
||||
- KYBD: changed required name to kiranwidgets-qt5
|
||||
|
||||
* Fri Nov 05 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.1-2.kb1
|
||||
- KYBD: changed required name and license
|
||||
- KYOS-B: passwd edit filter paster event(#45721)
|
||||
|
||||
* Mon Sep 06 2021 liuxinaho <liuxinhao@kylinos.com.cn> - 2.1.1-1.kb1
|
||||
- KYOS-B: fix moc error
|
||||
@ -116,7 +136,7 @@ rm -rf %{buildroot}
|
||||
- KYOS-B: install desktop link (#38890)
|
||||
|
||||
* Wed Jun 30 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-4.kb1
|
||||
- KYOS-B: don't exit if translation file not found (#40693)
|
||||
- KYOS-B: don't exit if translation file not found
|
||||
|
||||
* Mon Jun 28 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-3.kb1
|
||||
- KYOS-B: unified user name for interface description (#40542)
|
||||
@ -124,9 +144,6 @@ rm -rf %{buildroot}
|
||||
* Wed Jun 23 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-2.kb1
|
||||
- KYOS-B: modify user prompt infomation
|
||||
|
||||
* Fri Jun 18 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-1.kb2
|
||||
- KYBD: disable authentication management page
|
||||
|
||||
* Wed Jun 16 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 2.1.0-1.kb1
|
||||
- KYOS-B: solve the related problems of authentication management page(#40172)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user