From 3eccf416d9a82dc587ab375b81ff3d953dca095e Mon Sep 17 00:00:00 2001 From: JezerM Date: Sat, 11 Dec 2021 20:53:26 -0600 Subject: [PATCH] Some bugfixes --- NEWS.md | 10 ++++++++++ build/DEBIAN/control | 6 +++--- dist/web-greeter.appdata.xml | 8 ++++++++ web-greeter/browser/browser.py | 5 ++++- web-greeter/config.py | 4 ++-- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4e8620b..739b837 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,13 @@ # Change Log +## [3.2.1](https://github.com/JezerM/web-greeter/tree/3.2.0) ~ 12-11-2021 + +**Changes:** + + * Bugfixes related to older Qt versions + +[Full changelog](https://github.com/JezerM/web-greeter/compare/3.2.0...3.2.1) + ## [3.2.0](https://github.com/JezerM/web-greeter/tree/3.2.0) ~ 12-08-2021 **Changes:** @@ -10,6 +18,8 @@ - LightDM API should be instantly accessible * Lots of bugfixes +[Full changelog](https://github.com/JezerM/web-greeter/compare/3.1.1...3.2.0) + ## [3.1.1](https://github.com/JezerM/web-greeter/tree/3.1.1) ~ 10-27-2021 **Changes:** diff --git a/build/DEBIAN/control b/build/DEBIAN/control index 14e4eed..918ca90 100644 --- a/build/DEBIAN/control +++ b/build/DEBIAN/control @@ -1,14 +1,14 @@ Package: web-greeter -Version: 3.2.0 +Version: 3.2.1 Provides: lightdm-greeter Replaces: lightdm-webkit-greeter Section: x11 Priority: optional Homepage: https://github.com/JezerM/web-greeter -Installed-Size: 15088 +Installed-Size: 15068 Architecture: all Maintainer: JezerM -Depends: liblightdm-gobject-1-0, liblightdm-gobject-1-dev, python3, python3-gi, python3-pyqt5, libqt5webengine5 +Depends: liblightdm-gobject-1-0, liblightdm-gobject-1-dev, python3, python3-gi, python3-pyqt5, pyqt5-dev, libqt5webengine5, python3-pyqt5.qtwebengine, python3-ruamel.yaml, python3-xlib Description: A modern, visually appealing greeter for LightDM. Web Greeter utilizes themes built with HTML/CSS/JavaScript for it's login screen. Web Greeter themes provide modern, visually appealing, and feature-rich login screens. Two themes are diff --git a/dist/web-greeter.appdata.xml b/dist/web-greeter.appdata.xml index fbfe9d4..6d2435c 100644 --- a/dist/web-greeter.appdata.xml +++ b/dist/web-greeter.appdata.xml @@ -44,6 +44,14 @@ --> + + +

Changes:

+
    +
  • Bugfixes related to older Qt versions
  • +
+
+

Changes:

diff --git a/web-greeter/browser/browser.py b/web-greeter/browser/browser.py index 969ba4c..24d6269 100644 --- a/web-greeter/browser/browser.py +++ b/web-greeter/browser/browser.py @@ -236,7 +236,10 @@ class Browser(Application): self._initialize_devtools() if web_greeter_config["config"]["greeter"]["secure_mode"]: - self.profile.setUrlRequestInterceptor(self.interceptor) + if (hasattr(QWebEngineProfile, "setUrlRequestInterceptor")): + self.profile.setUrlRequestInterceptor(self.interceptor) + else: # Older Qt5 versions + self.profile.setRequestInterceptor(self.interceptor) self.page.setBackgroundColor(QColor(0, 0, 0)) self.window.setStyleSheet("""QMainWindow, QWebEngineView { diff --git a/web-greeter/config.py b/web-greeter/config.py index 418204d..701ac1a 100644 --- a/web-greeter/config.py +++ b/web-greeter/config.py @@ -68,10 +68,10 @@ web_greeter_config = { "debug_mode": False, "theme_dir": "/usr/share/web-greeter/themes/", "version": { - "full": "3.2.0", + "full": "3.2.1", "major": 3, "minor": 2, - "micro": 0, + "micro": 1, }, } }