packages/ukui-screensaver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 Before adding the lock screen, determine whether the lock screen has been activated, and prevent the login password box from being input when multiple lock screens are activated.

Browse Source 
From: @hua_yadong 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-28 09:21:01 +00:00 committed by Gitee
commit 7370f4fa70
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
17 changed files with 5 additions and 1645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-fix-icon-misplaced.patch
View File

@ -1,34 +0,0 @@
From 92214058d11321cfc55613d588e47b8e33b942cc Mon Sep 17 00:00:00 2001
From: myshow <296570182@qq.com>
Date: Wed, 9 Dec 2020 10:53:02 +0800
Subject: [PATCH] fix-icon-misplaced
---
src/lockwidget.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
index d6a66c0..9a62ef7 100644
--- a/src/lockwidget.cpp
+++ b/src/lockwidget.cpp
@@ -187,7 +187,7 @@ void LockWidget::showPowerManager()
authDialog->show();
powermanager->hide();
}
- else{
+ else{
authDialog->hide();
powermanager->show();
powermanager->setGeometry((width()-ITEM_WIDTH*5)/2,
@@ -227,7 +227,7 @@ void LockWidget::initUserMenu()
* qt5.6上，qmenu文字以图标左方为起点，20.04上文字以图标右方为起点，所以
* qt5.6时，左边距要设置大一点,避免与图标重合
*/
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
#else
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
--
2.29.2.windows.2

84
0001-insert-the-monitor-after-placement-and-the-screensav.patch
View File

@ -1,84 +0,0 @@
From 7687e1221e55f96035ba559c374b1672207f4ef4 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Fri, 10 Dec 2021 15:39:21 +0800
Subject: [PATCH] insert the monitor after placement, and the screensaver is
abnormal
---
src/fullbackgroundwidget.cpp | 17 +++++++++++++----
src/lockwidget.cpp | 2 +-
src/ukui-screensaver-dialog.cpp | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/fullbackgroundwidget.cpp b/src/fullbackgroundwidget.cpp
index 46795d0..f4ddaa1 100755
--- a/src/fullbackgroundwidget.cpp
+++ b/src/fullbackgroundwidget.cpp
@@ -516,7 +516,10 @@ void FullBackgroundWidget::onGlobalButtonDrag(int xPos, int yPos)
ScreenSaver *saver = configuration->getScreensaver();
if(saver->path == "/usr/lib/ukui-screensaver/ukui-screensaver-default")
return ;
- clearScreensavers();
+ if(screenStatus & SCREEN_SAVER)
+ {
+ clearScreensavers();
+ }
}
}
@@ -526,8 +529,11 @@ void FullBackgroundWidget::onScreenCountChanged(int)
QSize newSize = monitorWatcher->getVirtualSize();
setGeometry(0, 0, newSize.width(), newSize.height());
//repaint();
+ if(screenStatus & SCREEN_SAVER)
+ {
+ clearScreensavers();
+ }
update();
- clearScreensavers();
}
void FullBackgroundWidget::onDesktopResized()
@@ -536,8 +542,11 @@ void FullBackgroundWidget::onDesktopResized()
setGeometry(desktop->geometry());
if(lockWidget)
onCursorMoved(cursor().pos());
-// clearScreensavers();
- //repaint();
+ if(screenStatus & SCREEN_SAVER)
+ {
+ clearScreensavers();
+ }
+ //repaint();
update();
}
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
index 3ab66a5..d69e890 100755
--- a/src/lockwidget.cpp
+++ b/src/lockwidget.cpp
@@ -227,7 +227,7 @@ void LockWidget::initUserMenu()
* qt5.6上，qmenu文字以图标左方为起点，20.04上文字以图标右方为起点，所以
* qt5.6时，左边距要设置大一点,避免与图标重合
*/
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
#else
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp
index d78dafb..84a912a 100755
--- a/src/ukui-screensaver-dialog.cpp
+++ b/src/ukui-screensaver-dialog.cpp
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
if(parser.isSet(lockOption))
{
- window->onScreensaver();
+ window->lock();
}
if(parser.isSet(sessionIdleOption))
--
2.30.0

26
0002-fix-ukui-screensaver-dialog-lock.patch
View File

@ -1,26 +0,0 @@
From 39459bf543d45644426885ae98641fa26ea0ab55 Mon Sep 17 00:00:00 2001
From: lvhan <lvhan@kylinos.cn>
Date: Wed, 13 Jan 2021 14:31:46 +0800
Subject: [PATCH] fix-ukui-screensaver-dialog--lock
---
src/ukui-screensaver-dialog.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp
index 2baad4b..237b377 100644
--- a/src/ukui-screensaver-dialog.cpp
+++ b/src/ukui-screensaver-dialog.cpp
@@ -174,7 +174,8 @@ int main(int argc, char *argv[])
if(parser.isSet(lockOption))
{
- window->lock();
+ // window->lock();
+ window->onScreensaver();
}
if(parser.isSet(sessionIdleOption))
--
2.29.2.windows.2

24
0003-Fix-a-return-type-error.patch
View File

@ -1,24 +0,0 @@
From 2c1aad754aa7b1923c5d2e3805f9352a0dd79a82 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 17:07:08 +0800
Subject: [PATCH] Fix a return type error
---
src/screensaver.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/screensaver.cpp b/src/screensaver.cpp
index 601b325..8e35ab1 100755
--- a/src/screensaver.cpp
+++ b/src/screensaver.cpp
@@ -63,6 +63,7 @@ bool ScreenSaver::exists()
case SAVER_IMAGE:
return QDir(path).exists();
}
+ return false;
}
void ScreenSaver::startSwitchImages()
--
2.30.0

24
0004-remove-in-debian-copyright-file.patch
View File

@ -1,24 +0,0 @@
From 47cd0361ea8f29ad2a92ad280f1882087af3e547 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 29 Oct 2021 11:04:43 +0800
Subject: [PATCH] remove in debian copyright file
---
debian/copyright | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/copyright b/debian/copyright
index 9920bbb..a79795b 100755
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,6 @@ Files: CMakeLists.txt
debian/*
screensaver/*
Common/*
- .gitmodules
Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd.
License: GPL-3+
--
2.30.0

25
0005-Add-sentence-author-info.patch
View File

@ -1,25 +0,0 @@
From a8eb0d69feedb02693b711348a7aaa25ff3961b6 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Sat, 30 Oct 2021 14:24:31 +0800
Subject: [PATCH] Add sentence author info
---
screensaver/language/screensaver-zh_CN.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/screensaver/language/screensaver-zh_CN.ini b/screensaver/language/screensaver-zh_CN.ini
index 7c4a442..0b1b594 100755
--- a/screensaver/language/screensaver-zh_CN.ini
+++ b/screensaver/language/screensaver-zh_CN.ini
@@ -136,7 +136,7 @@ OL=我将永远忠于自己，披星戴月的奔向理想与自由。
author=佚名
[41]
OL=有一天，我看了43次日落！
-author=佚名
+author=《小王子》
[42]
OL=当太阳升到最高点的时候，影子就不见了。
author=佚名
--
2.30.0

28
0007-screen-saver-mode-is-set-to-single-and-the-problem-of-segfault.patch
View File

@ -1,28 +0,0 @@
From 53c17d4f9cf4a85f662b2ebdbb97610cb91ed237 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 11:08:30 +0800
Subject: [PATCH] screen saver mode is set to single and the problem of
segfault
---
src/configuration.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 6590172..f67f844 100755
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -141,6 +141,10 @@ ScreenSaver *Configuration::getScreensaver()
break;
}
case SAVER_SINGLE:
+ if(themes.count()==0){
+ saver->path = "/usr/lib/ukui-screensaver/ukui-screensaver-default";
+ break;
+ }
saver->path = getXScreensaverPath(themes[0]);
break;
case SAVER_IMAGE:
--
2.30.0

48
0008-Screen-saver-add-x11-attribute.patch
View File

@ -1,48 +0,0 @@
From 3ff7cce8755475f9a458cabf9bfacafb2f587225 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 2 Nov 2021 14:52:58 +0800
Subject: [PATCH] Screen saver add x11 attribute
---
screensaver/screensaver.cpp | 1 +
src/screensaverwidget.cpp | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/screensaver/screensaver.cpp b/screensaver/screensaver.cpp
index f722c8f..1739afd 100755
--- a/screensaver/screensaver.cpp
+++ b/screensaver/screensaver.cpp
@@ -57,6 +57,7 @@ Screensaver::Screensaver(QWidget *parent):
m_timer(nullptr)
{
installEventFilter(this);
+ setWindowFlags(Qt::X11BypassWindowManagerHint);
setUpdateCenterWidget();
initUI();
m_background = new MBackground();
diff --git a/src/screensaverwidget.cpp b/src/screensaverwidget.cpp
index 8f9efd3..d691786 100755
--- a/src/screensaverwidget.cpp
+++ b/src/screensaverwidget.cpp
@@ -37,10 +37,15 @@ ScreenSaverWidget::ScreenSaverWidget(ScreenSaver *screensaver, QWidget *parent)
setFocus();
this->installEventFilter(this);
- QPalette plt;
- plt.setBrush(QPalette::Window, Qt::black);
- setPalette(plt);
+ //QPalette plt;
+ //plt.setBrush(QPalette::Window, Qt::black);
+ //setPalette(plt);
+ QPalette pal(palette());
+ pal.setColor(QPalette::Background, Qt::black); //设置背景黑色
+
setAutoFillBackground(true);
+ setPalette(pal);
+
switch(screensaver->mode) {
case SAVER_RANDOM:
case SAVER_SINGLE:
--
2.30.0

27
0009-only-one-user-the-switch-user-button-is-not-displayed.patch
View File

@ -1,27 +0,0 @@
From 1e26460fc8b4cd856feade5711004f5d85391f2c Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 5 Nov 2021 14:25:30 +0800
Subject: [PATCH] only one user the switch user button is not displayed
---
src/lockwidget.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
index 9a62ef7..0b75b6d 100755
--- a/src/lockwidget.cpp
+++ b/src/lockwidget.cpp
@@ -52,6 +52,10 @@ LockWidget::LockWidget(QWidget *parent)
authDialog, &AuthDialog::onCapsLockChanged);
this->installEventFilter(this);
initUI();
+
+ if(users->getUsers().count() < 2){
+ ui->btnSwitchUser->hide();
+ }
}
LockWidget::~LockWidget()
--
2.30.0

24
0010-Add-opencv-compilation-dependency.patch
View File

@ -1,24 +0,0 @@
From 92a02f6bbe9305a18f9a918697a43194ad2bbe90 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Wed, 10 Nov 2021 09:57:29 +0800
Subject: [PATCH] Add opencv compilation dependency
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index cdfa10f..1cd8543 100755
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 12),
qttools5-dev,
qttools5-dev-tools,
libglib2.0-dev,
+ libopencv-dev,
libx11-dev,
libxtst-dev,
libgsettings-qt-dev
--
2.30.0

22
0011-Add-gitattriutes-files.patch
View File

@ -1,22 +0,0 @@
From 47f5cde3cd8392153b10f6565c7da0c69547603c Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 2 Dec 2021 11:34:30 +0800
Subject: [PATCH] Add gitattriutes files
---
.gitattributes | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..df0353f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+debian/changelog
+debian/compat
+debian/source/format
--
2.30.0

27
0012-add-build-requires-packages.patch
View File

@ -1,27 +0,0 @@
From 252361725d993924eac3f86989eb8250ad03d534 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 3 Dec 2021 09:59:53 +0800
Subject: [PATCH] add build requires packages
---
debian/control | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 1cd8543..d5fcc83 100755
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,9 @@ Build-Depends: debhelper-compat (= 12),
libopencv-dev,
libx11-dev,
libxtst-dev,
- libgsettings-qt-dev
+ libgsettings-qt-dev,
+ libkf5windowsystem-dev,
+ libmatemixer-dev
Standards-Version: 4.5.0
Rules-Requires-Root: no
Homepage: https://www.github.com/ukui/ukui-screensaver
--
2.30.0

32
0013-Update-package-version.patch
View File

@ -1,32 +0,0 @@
From e2bc456fa7ab55d67e851aef35c34b39617412ca Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 7 Dec 2021 14:47:14 +0800
Subject: [PATCH] Update package version
---
debian/changelog | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 146b2b5..843e20c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ukui-screensaver (3.0.2-1~0804) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- handsome_feng <jianfengli@ubuntukylin.com> Thu, 05 Aug 2021 14:22:40+0800
+
+ukui-screensaver (3.0.1-1) unstable; urgency=medium
+
+ * New upstream bugfix release.
+
+ -- handsome_feng <jianfengli@ubuntukylin.com> Sun, 27 Sep 2020 14:47:09 +0800
+
ukui-screensaver (3.0.0-1+1031) focal; urgency=medium
* Daily build.
--
2.30.0

32
fix-root-can-not-input-passwd-bug.patch
View File

@ -1,32 +0,0 @@
From 6740159fcdaa0276824fbac93501c4fd79b23d03 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Thu, 9 Dec 2021 18:01:43 +0800
Subject: [PATCH] fix root can not input passwd bug
---
data/ukui-screensaver-qt | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/data/ukui-screensaver-qt b/data/ukui-screensaver-qt
index 6af045a..25d81df 100755
--- a/data/ukui-screensaver-qt
+++ b/data/ukui-screensaver-qt
@@ -1,11 +1,5 @@
-@include common-auth
-auth optional pam_gnome_keyring.so
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
-
-#If you are using Arch,comment out the
-#above and use the following.
-
-#auth include system-auth
-#account include system-auth
-#password include system-auth
-#session include system-auth
--
2.30.0

1153
fix-root-user-had-not-face-icon.patch
View File

File diff suppressed because it is too large Load Diff

BIN
ukui-screensaver-3.0.1.tar.gz
View File

Binary file not shown.

40
ukui-screensaver.spec
View File

@ -1,6 +1,6 @@
Name: ukui-screensaver
Version: 3.0.1
Release: 17
Release: 18
Summary: parallels toolbox for UKUI
License: GPL-3+ GPL-2+
URL: http://www.ukui.org
@ -26,23 +26,6 @@ Requires: qt5-qttools-devel
Requires: gsettings-qt-devel
Requires: dconf-devel
patch0: 0001-fix-icon-misplaced.patch
patch1: 0002-fix-ukui-screensaver-dialog-lock.patch
patch2: 0003-Fix-a-return-type-error.patch
patch3: 0004-remove-in-debian-copyright-file.patch
patch4: 0005-Add-sentence-author-info.patch
#patch5: 0006-Add-fractional-scaling-parameters.patch
patch6: 0007-screen-saver-mode-is-set-to-single-and-the-problem-of-segfault.patch
patch7: 0008-Screen-saver-add-x11-attribute.patch
patch8: 0009-only-one-user-the-switch-user-button-is-not-displayed.patch
patch9: 0010-Add-opencv-compilation-dependency.patch
patch10: 0011-Add-gitattriutes-files.patch
patch11: 0012-add-build-requires-packages.patch
patch12: 0013-Update-package-version.patch
patch13: fix-root-user-had-not-face-icon.patch
Patch14: fix-root-can-not-input-passwd-bug.patch
Patch15: 0001-insert-the-monitor-after-placement-and-the-screensav.patch
%description
The ukui-sidebar is mainly used in the desktop operating system.
It pops up from the right side of the desktop in the form of a tray,
@ -51,22 +34,6 @@ Patch15: 0001-insert-the-monitor-after-placement-and-the-screensav.patch
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
#%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch15 -p1
%patch14 -p1
%build
cmake .
@ -90,11 +57,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/desktop-directories/ukui-screensaver.directory
%{_sysconfdir}/xdg/menus/ukui-screensavers.menu
%{_sysconfdir}/pam.d/ukui-screensaver-qt
%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
##%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
#%%{_datadir}/ukui-screensaver/screensaver.ini
#%%{_datadir}/ukui-screensaver/screensaver-en.ini
%changelog
* Mon Mar 28 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-18
- Before adding the lock screen, determine whether the lock screen has been activated, and prevent the login password box from being input when multiple lock screens are activated.
* Fri Dec 10 2021 huayadong <huayadong@kylinos.cn> - 3.0.1-17
- add patch15: 0001-insert-the-monitor-after-placement-and-the-screensav.patch