packages/kiran-session-guard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.2.3

Browse Source
This commit is contained in:
kylinsecos_admin 2022-03-02 16:13:21 +08:00
parent 6a88935231
commit 7e18d3753e
5 changed files with 18 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

311
0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch
View File

@ -1,311 +0,0 @@
From 85d16be296340058a28540ebbdb2989aa898c975 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinos.com.cn>
Date: Thu, 20 Jan 2022 12:05:16 +0800
Subject: [PATCH] fix(translator): fix screensaver-dialog translator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复屏保窗口的翻译
---
libexec/session-guard-checkpass/main.cpp | 2 +-
.../kiran-cpanel-greeter.zh_CN.ts | 28 ++++++-------
.../lightdm-kiran-greeter.zh_CN.ts | 42 +++++++++----------
screensaver-dialog/src/plugin.cpp | 21 +++++++---
.../kiran-screensaver-dialog.zh_CN.ts | 9 +++-
5 files changed, 59 insertions(+), 43 deletions(-)
diff --git a/libexec/session-guard-checkpass/main.cpp b/libexec/session-guard-checkpass/main.cpp
index 5bd4839..e667bde 100644
--- a/libexec/session-guard-checkpass/main.cpp
+++ b/libexec/session-guard-checkpass/main.cpp
@@ -77,7 +77,7 @@ int conversation(int num_msg, const pam_message **msgs, pam_response **resp, voi
else
{
auto replyEvent = dynamic_cast<PromptReplyEvent *>(recvReply);
- KLOG_DEBUG() << "recv prompt reply:" << replyEvent->result() << replyEvent->text();
+ //KLOG_DEBUG() << "recv prompt reply:" << replyEvent->result() << replyEvent->text();
//消息返回失败
if (!replyEvent->result())
{
diff --git a/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts b/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts
index a863764..9ee3e23 100644
--- a/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts
+++ b/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts
@@ -84,13 +84,13 @@
</message>
<message>
<location filename="../src/greeter-setting-window.cpp" line="190"/>
- <location filename="../src/greeter-setting-window.cpp" line="360"/>
+ <location filename="../src/greeter-setting-window.cpp" line="355"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
<location filename="../src/greeter-setting-window.cpp" line="205"/>
- <location filename="../src/greeter-setting-window.cpp" line="375"/>
+ <location filename="../src/greeter-setting-window.cpp" line="370"/>
<source>Reset</source>
<translation>重置</translation>
</message>
@@ -115,22 +115,22 @@
<translation>禁用</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="269"/>
+ <location filename="../src/greeter-setting-window.cpp" line="264"/>
<source>Scale Factor</source>
<translation>缩放比例</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="294"/>
+ <location filename="../src/greeter-setting-window.cpp" line="289"/>
<source>Enable manual input user login</source>
<translation>允许手动输入用户名登录</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="319"/>
+ <location filename="../src/greeter-setting-window.cpp" line="314"/>
<source>Show User List</source>
<translation>显示用户列表</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="682"/>
+ <location filename="../src/greeter-setting-window.cpp" line="680"/>
<source>Please ensure that one of the two options is turned on!</source>
<translation>请确保两个选项之一被打开!</translation>
</message>
@@ -143,28 +143,28 @@
<translation type="vanished">隐藏用户列表</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="453"/>
- <location filename="../src/greeter-setting-window.cpp" line="529"/>
+ <location filename="../src/greeter-setting-window.cpp" line="448"/>
+ <location filename="../src/greeter-setting-window.cpp" line="524"/>
<source>Configuration changed</source>
<translation>配置已改变</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="454"/>
- <location filename="../src/greeter-setting-window.cpp" line="530"/>
+ <location filename="../src/greeter-setting-window.cpp" line="449"/>
+ <location filename="../src/greeter-setting-window.cpp" line="525"/>
<source>The external configuration file has changed
If you choose to save, all external changes will be overwritten
Select discard to discard the modification and reload the new configuration</source>
<translation>配置文件已被修改，如果继续保存所有额外的修改将会被覆盖，选择丢弃将丢弃所有的修改并重新加载新的配置文件</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="507"/>
- <location filename="../src/greeter-setting-window.cpp" line="567"/>
+ <location filename="../src/greeter-setting-window.cpp" line="502"/>
+ <location filename="../src/greeter-setting-window.cpp" line="562"/>
<source>Save failed, reload</source>
<translation>保存失败，已重新加载</translation>
</message>
<message>
- <location filename="../src/greeter-setting-window.cpp" line="511"/>
- <location filename="../src/greeter-setting-window.cpp" line="571"/>
+ <location filename="../src/greeter-setting-window.cpp" line="506"/>
+ <location filename="../src/greeter-setting-window.cpp" line="566"/>
<source>Saved successfully</source>
<translation>保存成功</translation>
</message>
diff --git a/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts b/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts
index 71eeba4..b3ebbda 100644
--- a/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts
+++ b/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts
@@ -27,7 +27,7 @@
</message>
<message>
<location filename="../src/greeterloginwindow.ui" line="665"/>
- <location filename="../src/greeter-login-window.cpp" line="513"/>
+ <location filename="../src/greeter-login-window.cpp" line="517"/>
<source>login other user</source>
<translation>登录其他用户</translation>
</message>
@@ -83,28 +83,28 @@
<translation type="vanished">认证失败</translation>
</message>
<message>
- <location filename="../src/greeter-login-window.cpp" line="560"/>
- <location filename="../src/greeter-login-window.cpp" line="723"/>
+ <location filename="../src/greeter-login-window.cpp" line="564"/>
+ <location filename="../src/greeter-login-window.cpp" line="727"/>
<source>Return</source>
<translation>返回</translation>
</message>
<message>
- <location filename="../src/greeter-login-window.cpp" line="572"/>
+ <location filename="../src/greeter-login-window.cpp" line="576"/>
<source>Entry your name</source>
<translation>请输入用户名</translation>
</message>
<message>
- <location filename="../src/greeter-login-window.cpp" line="607"/>
+ <location filename="../src/greeter-login-window.cpp" line="611"/>
<source>dddd MMM HH:mm</source>
<translation>MM月dd日 dddd HH:mm</translation>
</message>
<message>
- <location filename="../src/greeter-login-window.cpp" line="778"/>
+ <location filename="../src/greeter-login-window.cpp" line="782"/>
<source>Start face authentication</source>
<translation>开始人脸认证</translation>
</message>
<message>
- <location filename="../src/greeter-login-window.cpp" line="789"/>
+ <location filename="../src/greeter-login-window.cpp" line="793"/>
<source>Start fingerprint authentication</source>
<translation>开始指纹认证</translation>
</message>
@@ -133,13 +133,13 @@
</message>
<message>
<location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="190"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="360"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="355"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="205"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="375"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="370"/>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
@@ -164,48 +164,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="269"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="264"/>
<source>Scale Factor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="294"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="289"/>
<source>Enable manual input user login</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="319"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="314"/>
<source>Show User List</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="453"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="529"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="448"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="524"/>
<source>Configuration changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="454"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="530"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="449"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="525"/>
<source>The external configuration file has changed
If you choose to save, all external changes will be overwritten
Select discard to discard the modification and reload the new configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="507"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="567"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="502"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="562"/>
<source>Save failed, reload</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="511"/>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="571"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="506"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="566"/>
<source>Saved successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="682"/>
+ <location filename="../kiran-cpanel-greeter/src/greeter-setting-window.cpp" line="680"/>
<source>Please ensure that one of the two options is turned on!</source>
<translation type="unfinished"></translation>
</message>
diff --git a/screensaver-dialog/src/plugin.cpp b/screensaver-dialog/src/plugin.cpp
index 649d276..f8f036f 100644
--- a/screensaver-dialog/src/plugin.cpp
+++ b/screensaver-dialog/src/plugin.cpp
@@ -15,9 +15,11 @@
#include <QApplication>
#include <QLocale>
+#include <kiran-log/qt5-log-i.h>
#include "config.h"
#include "screensaver-dialog.h"
+
#define TRANSLATION_FILE_DIR "/usr/share/kiran-screensaver-dialog/translations/"
using namespace Kiran::ScreenSaver;
@@ -30,12 +32,19 @@ int KSPlugin::init(Interface* ksInterface)
Q_INIT_RESOURCE(commonWidgets);
m_translator = new QTranslator;
- m_translator->load(QLocale(),
- "kiran-screensaver-dialog",
- ".",
- TRANSLATION_FILE_DIR,
- ".qm");
- qApp->installTranslator(m_translator);
+ if (m_translator->load(QLocale(),
+ "kiran-screensaver-dialog",
+ ".",
+ TRANSLATION_FILE_DIR,
+ ".qm"))
+ {
+ qApp->installTranslator(m_translator);
+ KLOG_DEBUG() << "install kiran-screensaver-dialog success";
+ }
+ else
+ {
+ KLOG_WARNING() << "can't load kiran-screensaver-dialog translator";
+ }
return 0;
}
diff --git a/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts b/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts
index f9b9faa..55c86f9 100644
--- a/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts
+++ b/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts
@@ -5,7 +5,7 @@
<name>AuthProxy</name>
<message>
<source>Failed to authenticate</source>
- <translation type="vanished">认证失败</translation>
+ <translation>认证失败</translation>
</message>
</context>
<context>
@@ -39,6 +39,13 @@
<translation type="obsolete">开始指纹认证</translation>
</message>
</context>
+<context>
+ <name>KSPlugin</name>
+ <message>
+ <source>Failed to authenticate</source>
+ <translation type="unfinished">认证失败</translation>
+ </message>
+</context>
<context>
<name>ScreenSaverDialog</name>
<message>
--
2.27.0

38
0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch
View File

@ -1,38 +0,0 @@
From 7c4fdfa5e93361d99c51e5b9f8ae8dbe89252f04 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 25 Jan 2022 14:56:35 +0800
Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build
error
---
lib/common-widgets/finger-auth-avatar.cpp | 1 +
lib/common-widgets/user-avatar.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/lib/common-widgets/finger-auth-avatar.cpp b/lib/common-widgets/finger-auth-avatar.cpp
index e26ff41..b0c7300 100644
--- a/lib/common-widgets/finger-auth-avatar.cpp
+++ b/lib/common-widgets/finger-auth-avatar.cpp
@@ -15,6 +15,7 @@
#include "finger-auth-avatar.h"
#include <QPainter>
+#include <QPainterPath>
FingerAuthAvatar::FingerAuthAvatar(QWidget *parent) : QWidget(parent)
{
diff --git a/lib/common-widgets/user-avatar.cpp b/lib/common-widgets/user-avatar.cpp
index 9cfb2df..9394818 100644
--- a/lib/common-widgets/user-avatar.cpp
+++ b/lib/common-widgets/user-avatar.cpp
@@ -17,6 +17,7 @@
#include <QDebug>
#include <QFile>
#include <QPainter>
+#include <QPainterPath>
#define DEFAULT_USER_AVATAR ":/common-widgets-images/user_180.png"
--
2.33.0

BIN
kiran-session-guard-2.2.1.tar.gz
View File

Binary file not shown.

BIN
kiran-session-guard-2.2.3.tar.gz Normal file
View File

Binary file not shown.

25
kiran-session-guard.spec
View File

@ -1,13 +1,11 @@
Name: kiran-session-guard
Version: 2.2.1
Release: 1.kb4
Version: 2.2.3
Release: 1
Summary: Kiran desktop environment login and lock screen dialog
Summary(zh_CN): Kiran桌面环境登录和解锁框
License: Mulan PSL v2
Source0: %{name}-%{version}.tar.gz
Patch0001: 0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch
Patch0002: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch
%define SHOW_VIRTUAL_KEYBOARD 0
@ -61,6 +59,7 @@ Requires: onboard
%endif
%package -n lightdm-kiran-greeter
Requires: gtk-update-icon-cache
Provides: lightdm-greeter
Obsoletes: lightdm-settings
Summary: Kiran desktop environment login greeter
@ -132,11 +131,23 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
rm -rf %{buildroot}
%changelog
* Wed Jan 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.1-1.kb4
* Wed Mar 02 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.3-1
- KYOS-B: fix compilation errors on OpenEuler
* Thu Jan 20 2022 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.1-1.kb3
- rebuild for KY3.4-5-KiranUI-2.2
* Tue Mar 01 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.2-3
- KYOS-B: Add Requires gtk-update-icon-cache
* Sat Feb 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.2-2
- KYOS-R: rebuild for KY3.4-3-LS-dev
* Sat Feb 26 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.2-1
- KYOS-B: fix build error in KY3.4-3-LS
* Thu Feb 24 2022 chendingjian <chendingjian@kylinos.com.cn> - 2.2.1-2
- rebuild for KY3.4-MATE-modules-dev
* Fri Feb 11 2022 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.1-1.kb3
- KYOS-B: fix translation problems
* Thu Jan 20 2022 liuxinhao <liuxinhao@kylinos.com.cn> - 2.2.1-1.kb2
- KYOS-B: fix kiran-screensaver-dialog type eq vanished translator