!10 sync

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33

0001-fix-icon-misplaced.patch

@@ -0,0 +1,73 @@
+From 79aedc7ca92b610a806c2a3cf4c29fb5396c360d Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 8 Dec 2020 17:52:53 +0800
+Subject: [PATCH 1/2] fix-icon-misplaced
+
+---
+ ukui-greeter/greeter/greeterwindow.cpp | 11 +++++------
+ ukui-greeter/ukui-greeter.pro          |  2 +-
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
+index 76e6953..5722bed 100644
+--- a/ukui-greeter/greeter/greeterwindow.cpp
++++ b/ukui-greeter/greeter/greeterwindow.cpp
+@@ -153,8 +153,8 @@ void GreeterWindow::initUI()
+         m_sessionLB->setFixedSize(48, 48);
+         m_sessionLB->setCursor(Qt::PointingHandCursor);
+         m_sessionLB->installEventFilter(this);
+-	m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
+-	If the user is logged in, it will take effect after logging in again"));
++        m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
++                                    If the user is logged in, it will take effect after logging in again"));
+         m_sessionLB->setIcon(QIcon(IMAGE_DIR + QString("badges/unknown_badge.svg")));
+         onSessionChanged(m_greeter->defaultSessionHint());
+         connect(m_sessionLB, &QPushButton::clicked, this, &GreeterWindow::showSessionWnd);
+@@ -263,7 +263,7 @@ void GreeterWindow::resizeEvent(QResizeEvent *event)
+     QSize size = event->size();
+     //重新计算缩放比例
+     scale = QString::number(size.width() / 1920.0, 'f', 1).toFloat();
+-    
++
+     if(scale > 1)
+         scale = 1;
+     fontSize = scale > 0.5 ? 10 : 8;
+@@ -413,7 +413,7 @@ void GreeterWindow::setBackground(const QModelIndex &index)
+     QString backgroundPath;
+ 
+     bool useUserBackground = false;
+-	
++
+     //读取/var/lib/lightdm-date/用户名/ukui-greeter.conf,
+     //判断是否设置了该用户的登陆界面的背景图片.
+     QString userConfigurePath = m_greeter->getEnsureShareDir(index.data(QLightDM::UsersModel::NameRole).toString()) + "/ukui-greeter.conf";
+@@ -700,7 +700,7 @@ void GreeterWindow::showSessionWnd()
+     if(!m_sessionWnd){
+         m_sessionWnd = new SessionWindow(m_sessionsModel, this);
+ 
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
+         m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
+ #else
+         m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
+@@ -786,4 +786,3 @@ bool GreeterWindow::sessionIsValid(const QString &session)
+     }
+     return false;
+ }
+-
+diff --git a/ukui-greeter/ukui-greeter.pro b/ukui-greeter/ukui-greeter.pro
+index a71b2d8..929ef7b 100644
+--- a/ukui-greeter/ukui-greeter.pro
++++ b/ukui-greeter/ukui-greeter.pro
+@@ -79,7 +79,7 @@ TRANSLATIONS += translations/zh_CN.ts \
+                 translations/tr.ts \
+                 translations/es.ts
+ 
+-system("lrelease translations/*.ts")
++system("lrelease-qt5 translations/*.ts")
+ 
+ qm_file.files = translations/*.qm
+ qm_file.path = $${PREFIX}/translations/
+-- 
+2.29.2.windows.2
+

0002-fix-ukui-greeter-desktop-option-issue.patch

@@ -0,0 +1,25 @@
+From 89d0bb88180c42c7ffd33fac9ff72260f930fcb0 Mon Sep 17 00:00:00 2001
+From: myshow <296570182@qq.com>
+Date: Tue, 8 Dec 2020 17:57:26 +0800
+Subject: [PATCH 2/2] fix-ukui-greeter-desktop-option-issue
+
+---
+ ukui-greeter/greeter/sessionwindow.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ukui-greeter/greeter/sessionwindow.cpp b/ukui-greeter/greeter/sessionwindow.cpp
+index 4940003..8f63355 100644
+--- a/ukui-greeter/greeter/sessionwindow.cpp
++++ b/ukui-greeter/greeter/sessionwindow.cpp
+@@ -69,6 +69,8 @@ void SessionWindow::addSessionLabels()
+     for(int i = 0; i < m_sessionsModel->rowCount(); i++) {
+         QString sessionName = m_sessionsModel->index(i, 0).data().toString();
+         QString sessionKey = m_sessionsModel->index(i, 0).data(Qt::UserRole).toString();
++        if(sessionKey == "xinit-compat")
++            continue;
+         QAction *action = new QAction(QIcon(getSessionIcon(sessionKey)), sessionName, this);
+         action->setData(sessionKey);
+         addAction(action);
+-- 
+2.29.2.windows.2
+

fix-default-wallpaper.patch

@@ -1,21 +0,0 @@
-diff -ur ukui-greeter-master/ukui-greeter/common/configuration.cpp ukui-greeter~/ukui-greeter/common/configuration.cpp
---- ukui-greeter-master/ukui-greeter/common/configuration.cpp	2020-07-11 17:12:01.000000000 +0800
-+++ ukui-greeter~/ukui-greeter/common/configuration.cpp	2020-07-16 17:49:32.447647884 +0800
-@@ -81,8 +81,7 @@
- 
- 
- /**
-- * 获å<C2B7>–系统版本å<C2AC>·
-- */
-+ * 获å<C2B7>–系统版本å<C2AC>? */
- QString getSystemVersion()
- {
-     QSettings settings("/etc/lsb-release", QSettings::IniFormat);
-@@ -164,6 +163,6 @@
-     else if(getSystemVersion().contains("V10.1",Qt::CaseInsensitive))
-         return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg";
-     else
--        return "/usr/share/backgrounds/kylin/kylin-background.png";
-+        return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg";
- 
- }

ukui-greeter.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           ukui-greeter
-Version:        1.2.5
-Release:        1
+Version:        3.0.1
+Release:        3
 Summary:        Lightdm greeter for UKUI
 License:        GPL-2.0
 URL:            http://www.ukui.org
@@ -20,7 +20,8 @@ Requires: xorg-x11-xkb-utils
 
 Provides: lightdm-greeter
 
-patch0:  fix-default-wallpaper.patch
+patch0:  0001-fix-icon-misplaced.patch
+patch1:  0002-fix-ukui-greeter-desktop-option-issue.patch
 
 %description
 A greeter for UKUI desktop environment written by Qt5.
@@ -29,6 +30,7 @@ A greeter for UKUI desktop environment written by Qt5.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 qmake-qt5
@@ -53,7 +55,17 @@ gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
 %{_datadir}/xgreeters/ukui-greeter.desktop
 
 %changelog
+* Tue Dec 8 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-3
+- 0001-fix-icon-misplaced.patch
+
+* Tue Dec 8 2020 douyan <douyan@kylinos.cn> - 3.0.1-2
+- 0002-fix-ukui-greeter-desktop-option-issue.patch
+
+* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
+- update 3.0.0-1+1026
+
 * Mon Jul 20 2020 douyan <douyan@kylinos.cn> - 1.2.5-1
 - update 1.2.5
+
 * Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 1.2.3-1
 - Init package for openEuler