!76 don't use comma to concatenate pam messages when not need to

From: @hou-hongxun 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-ukui-greeter-don-t-add-redundant-comma.patch

@@ -0,0 +1,34 @@
+From 680e62a11e8591f5681008869ecef7614b07d7ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Mon, 22 Apr 2024 09:49:50 +0800
+Subject: [PATCH] ukui-greeter: don't add redundant comma
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+when not need to
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ ukui-greeter/greeter/loginwindow.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp
+index 4ab27b7..c6b2dd5 100644
+--- a/ukui-greeter/greeter/loginwindow.cpp
++++ b/ukui-greeter/greeter/loginwindow.cpp
+@@ -757,7 +757,10 @@ void LoginWindow::onShowMessage(QString text, QLightDM::Greeter::MessageType typ
+     unacknowledged_messages = true;
+     if (!m_preStrMessage.isEmpty() && m_preStrMessageType != type && m_preStrMessageType != -1)
+     {
+-        text = m_preStrMessage + "," + text;
++	if (m_preStrMessage.endsWith("。") || m_preStrMessage.endsWith("."))
++            text = m_preStrMessage + text;
++	else
++            text = m_preStrMessage + "," + text;
+     }
+ 
+     qDebug()<<"unacknowledged_messages = true";
+-- 
+2.43.0
+

disable-Suspend-and-Sleep-of-ukui-greeter.patch

@@ -0,0 +1,51 @@
+From 53a0dcf9936e23aba31e85e232ddb3a00ee8160c Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Wed, 14 Jun 2023 15:27:22 +0800
+Subject: [PATCH] disable Suspend and Sleep of ukui-greeter
+
+---
+ ukui-greeter/greeter/powerwindow.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/ukui-greeter/greeter/powerwindow.cpp b/ukui-greeter/greeter/powerwindow.cpp
+index 81fa29f..d11e350 100644
+--- a/ukui-greeter/greeter/powerwindow.cpp
++++ b/ukui-greeter/greeter/powerwindow.cpp
+@@ -237,7 +237,7 @@ void PowerManager::initUI()
+     QVBoxLayout *shutdownlayout = new QVBoxLayout(shutdownWidget);
+     shutdownlayout->addWidget(shutdownFace);
+     shutdownlayout->addWidget(shutdownLabel);
+-
++/*
+     if(m_power->canHibernate()) {
+         hibernateWidget = new QWidget(this);
+         hibernateWidget->setObjectName("hibernateWidget");
+@@ -271,7 +271,7 @@ void PowerManager::initUI()
+     	suspendlayout->addWidget(suspendFace);
+     	suspendlayout->addWidget(suspendLabel);
+     }
+-
++*/
+ 
+ //   if(userCount>1){
+ //        QListWidgetItem *item0 = new QListWidgetItem();
+@@ -279,6 +279,7 @@ void PowerManager::initUI()
+ //        insertItem(this->count(), item0);
+ //        setItemWidget(item0, switchWidget);
+ //    }
++/*
+     if(m_power->canHibernate()){
+         QListWidgetItem *item1 = new QListWidgetItem();
+         item1->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT));
+@@ -292,7 +293,7 @@ void PowerManager::initUI()
+         insertItem(this->count(), item0);
+         setItemWidget(item0, suspendWidget);
+     }
+-
++*/
+     QListWidgetItem *item2 = new QListWidgetItem();
+     item2->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT));
+     insertItem(this->count(), item2);
+-- 
+2.33.0
+

fix-date-and-nm-of-greeter.patch

@@ -0,0 +1,111 @@
+From a156505e911a65c3933d58707ff39ada1476e08c Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 6 Jul 2023 17:45:41 +0800
+Subject: [PATCH] fix date and nm of greeter
+
+---
+ ukui-greeter/greeter/greeterwindow.cpp | 36 ++++++++++++++++----------
+ ukui-greeter/kylin-nm/src/kylinnm.cpp  |  7 +++++
+ ukui-greeter/kylin-nm/src/kylinnm.h    |  2 +-
+ 3 files changed, 31 insertions(+), 14 deletions(-)
+
+diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
+index 0fe4080..54e81d9 100644
+--- a/ukui-greeter/greeter/greeterwindow.cpp
++++ b/ukui-greeter/greeter/greeterwindow.cpp
+@@ -793,16 +793,13 @@ void GreeterWindow::updateLanguage(QString userName)
+             qWarning() << "Get User's language error" << languageReply.error();
+         else {
+             formatsLocale = fomatsLocalReply.value().variant().toString();
+-            if(!formatsLocale.isEmpty()){
+-                if(formatsLocale.startsWith("zh")){
+-                    local = QLocale::Chinese;
+-                }
+-                else{
+-                    local = QLocale::English;
++            if(formatsLocale.isEmpty())
++                formatsLocale = QLocale::system().name();
++            if(formatsLocale.startsWith("zh"))
++                local = QLocale::Chinese;
++            else
++                local = QLocale::English;
+         }
+-            }
+-        }
+-
+     }
+ }
+ 
+@@ -866,9 +863,17 @@ void GreeterWindow::onCurrentUserChanged(const QModelIndex &index)
+         }
+     }
+ 
+-    if(realName == "*guest" || realName == "*login")
+-        return;
+-
++    if(realName == "*guest" || realName == "*login"){
++        QString language = QLocale::system().name();
++        onLanguageChanged(language);
++        if(language.startsWith("zh"))
++            local = QLocale::Chinese;
++        else
++            local = QLocale::English;
++        timeType=24;
++        dataType = "cn";
++        return;
++    }
+     updateLanguage(realName);
+     Q_EMIT currentUserChange(realName);
+     if(!m_sessionHasChanged && m_sessionsModel->rowCount() > 1)
+@@ -879,6 +884,10 @@ void GreeterWindow::onCurrentUserChanged(const QModelIndex &index)
+     m_configuration->getCurrentUser(realName);
+     timeType = m_configuration->getTimetp("timeType").toInt();
+     dataType = m_configuration->getTimetp("dateType").toString();
++    if(timeType == 0)
++        timeType = 24;
++    if(dataType == "")
++        dataType = "cn";
+     timer = new QTimer(this);
+     connect(timer, &QTimer::timeout, this, [&]{
+         if(timeType == 12){
+@@ -1065,7 +1074,8 @@ void GreeterWindow::onLanguageChanged(QString languageCode)
+     qApp->installTranslator(m_configuration->m_trans);
+ 
+     m_greeter->setLang(languageCode);
+-
++    if(m_kylinNM)
++        m_kylinNM->updatetext();
+ }
+ 
+ void GreeterWindow::showSessionWnd()
+diff --git a/ukui-greeter/kylin-nm/src/kylinnm.cpp b/ukui-greeter/kylin-nm/src/kylinnm.cpp
+index ee3e29e..1ede7aa 100644
+--- a/ukui-greeter/kylin-nm/src/kylinnm.cpp
++++ b/ukui-greeter/kylin-nm/src/kylinnm.cpp
+@@ -2676,3 +2676,10 @@ void KylinNM::showEvent(QShowEvent *event)
+ {
+     on_btnWifiList_clicked();
+ }
++
++void KylinNM::updatetext()
++{
++    lbNetListText->setText(tr("LAN"));
++    
++    lbWifiListText->setText(tr("WLAN"));
++}
+diff --git a/ukui-greeter/kylin-nm/src/kylinnm.h b/ukui-greeter/kylin-nm/src/kylinnm.h
+index 28803f7..c459ee9 100644
+--- a/ukui-greeter/kylin-nm/src/kylinnm.h
++++ b/ukui-greeter/kylin-nm/src/kylinnm.h
+@@ -182,7 +182,7 @@ public:
+     void updateNetList();
+ 
+     int getConnectStatus();//获取网络连接状态，返回值 -1 无连接； 0 有线连接； 1无线连接； 2有线和无线都已连接
+-
++    void updatetext();
+     QIcon iconLanOnline, iconLanOffline;
+     QIcon iconWifiFull, iconWifiHigh, iconWifiMedium, iconWifiLow;
+     QIcon iconConnecting;
+-- 
+2.33.0
+

translation-error-about-Login.patch

@@ -0,0 +1,25 @@
+From 447b041f473a590a92b900e6a63e5365ba7783ca Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 15 Jun 2023 20:37:40 +0800
+Subject: [PATCH] fix translation error about Login
+
+---
+ ukui-greeter/greeter/loginwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp
+index 616b081..4ab27b7 100644
+--- a/ukui-greeter/greeter/loginwindow.cpp
++++ b/ukui-greeter/greeter/loginwindow.cpp
+@@ -712,7 +712,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type)
+             text = tr("Password: ");
+             m_isPassWdInput = true;
+         }
+-        if(text == "login:") {
++        if(text == "login:" || text == "登录：") {
+             text = tr("Username");
+             m_name = "*login";
+             //m_nameLabel->setText(tr("login"));
+-- 
+2.33.0
+

ukui-greeter.spec

@@ -1,6 +1,6 @@
 Name:           ukui-greeter
 Version:        3.1.2
-Release:        7
+Release:        12
 Summary:        Lightdm greeter for UKUI
 License:        GPL-2.0-or-later
 URL:            http://www.ukui.org
@@ -9,7 +9,12 @@ Patch01:        0001-fix-greeter-translation.patch
 Patch02:	0002-fix-version-upgraded-the-default-background-is-blank.patch
 Patch03:	0003-fix-build-compile-error.patch
 Patch04:	0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch
-
+%if 0%{?kylin}
+Patch05:        disable-Suspend-and-Sleep-of-ukui-greeter.patch
+%endif
+Patch06:        translation-error-about-Login.patch
+Patch07:        fix-date-and-nm-of-greeter.patch
+Patch08:	0001-ukui-greeter-don-t-add-redundant-comma.patch
 BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel
 BuildRequires: gsettings-qt-devel
 Requires: pkgconf
@@ -35,12 +40,21 @@ A greeter for UKUI desktop environment written by Qt5.
 %setup -q
 %patch01 -p1
 %patch02 -p1
+if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then
 %patch03 -p1
+fi
 %patch04 -p1
+%if 0%{?kylin}
+%patch05 -p1
+%endif
+%patch06 -p1
+%patch07 -p1
+%patch08 -p1
 
 %build
-qmake-qt5
+%{qmake_qt5}
-make -j4
+%{make_build}
+
 
 %install
 make INSTALL_ROOT=%{buildroot} install
@@ -63,6 +77,30 @@ gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
 /usr/lib/ukui-greeter/ukui-greeter-nm-start.sh
 
 %changelog
+* Mon Apr 22 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.2-12
+- don't use comma to concatenate pam messages when not need to
+
+* Mon Jul 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-11
+- Type:Bugfix
+- ID:NA
+- SUG:NA
+- DESC: add fix-date-and-nm-of-greeter.patch
+
+* Thu Jun 15 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-10
+- Type:Bugfix
+- ID:NA
+- SUG:NA
+- DESC: add translation-error-about-Login.patch
+
+* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-9
+- Type:Bugfix
+- ID:NA
+- SUG:NA
+- DESC: disable Suspend and Sleep of ukui-greeter
+
+* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-8
+- update glib2 error
+
 * Tue Mar 14 2023 douyan <douyan@kylinos.cn> - 3.1.2-7
 - remove unnecessary requires