!51 fix version upgraded the default background is blank

From: @tanyulong2021 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2023-02-07 03:28:12 +00:00 committed by Gitee
commit 09c2e62600
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From e47a9111feb25026cc53373dda67a5e184db19d4 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Mon, 6 Feb 2023 09:44:55 +0800
Subject: [PATCH] fix version upgraded the default background is blank
---
ukui-greeter/common/configuration.cpp | 2 +-
ukui-greeter/greeter/greeterwindow.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ukui-greeter/common/configuration.cpp b/ukui-greeter/common/configuration.cpp
index 822b2d9..48e2e4c 100644
--- a/ukui-greeter/common/configuration.cpp
+++ b/ukui-greeter/common/configuration.cpp
@@ -219,5 +219,5 @@ QPixmap Configuration::getLogo()
QString Configuration::getDefaultBackgroundName()
{
- return "/usr/share/backgrounds/1-warty-final-ubuntukylin.jpg";
+ return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg";
}
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
index 2fefa9f..0fe4080 100644
--- a/ukui-greeter/greeter/greeterwindow.cpp
+++ b/ukui-greeter/greeter/greeterwindow.cpp
@@ -742,7 +742,7 @@ void GreeterWindow::setBackground(const QModelIndex &index)
//如果配置文件不存在,就创建一个
QSettings settingsbak(userConfigurePath,QSettings::IniFormat);
settingsbak.beginGroup("greeter");
- settingsbak.setValue("backgroundPath","/usr/share/backgrounds/1-warty-final-ubuntukylin.jpg");
+ settingsbak.setValue("backgroundPath","/usr/share/backgrounds/warty-final-ubuntukylin.jpg");
settingsbak.endGroup();
settingsbak.sync();
QFile file(userConfigurePath);
--
2.33.0

View File

@ -1,12 +1,13 @@
%define debug_package %{nil}
Name: ukui-greeter
Version: 3.1.2
Release: 2
Release: 3
Summary: Lightdm greeter for UKUI
License: GPL-2.0-or-later
URL: http://www.ukui.org
Source0: ukui-greeter-%{version}.tar.gz
Patch01: 0001-fix-greeter-translation.patch
Patch02: 0002-fix-version-upgraded-the-default-background-is-blank.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
@ -29,6 +30,7 @@ A greeter for UKUI desktop environment written by Qt5.
%prep
%setup -q
%patch01 -p1
%patch02 -p1
%build
qmake-qt5
@ -56,6 +58,9 @@ 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 Feb 06 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.2-3
- fix version upgraded the default background is blank
* Fri Jan 6 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-2
- fix greeter translation