fix ui5-systray-hide-when-inactive patch [release 3.22.4-2mamba;Mon Jun 20 2022]

This commit is contained in:
Silvan Calarco 2024-01-05 23:42:58 +01:00
parent 868c8224ba
commit ca81e4fa4b
2 changed files with 21 additions and 3 deletions

View File

@ -1,5 +1,6 @@
--- hplip-3.20.11/ui5/ui_utils.py.orig 2020-12-13 11:57:56.371789774 +0100 diff -Nru hplip-3.22.4/ui5/ui_utils.py hplip-3.22.4.patched/ui5/ui_utils.py
+++ hplip-3.20.11/ui5/ui_utils.py 2020-12-13 11:58:44.127640113 +0100 --- hplip-3.22.4/ui5/ui_utils.py 2022-04-26 06:17:00.000000000 +0200
+++ hplip-3.22.4.patched/ui5/ui_utils.py 2022-06-20 10:08:24.597882779 +0200
@@ -173,7 +173,7 @@ @@ -173,7 +173,7 @@
else: else:
QSettings.__init__(self, os.path.join(prop.user_dir, 'hplip.conf'), QSettings.IniFormat) QSettings.__init__(self, os.path.join(prop.user_dir, 'hplip.conf'), QSettings.IniFormat)
@ -9,3 +10,17 @@
self.systray_messages = SYSTRAY_MESSAGES_SHOW_ALL self.systray_messages = SYSTRAY_MESSAGES_SHOW_ALL
self.last_used_device_uri = '' self.last_used_device_uri = ''
self.last_used_printer = '' self.last_used_printer = ''
@@ -214,8 +214,11 @@
self.sync()
self.beginGroup("settings")
- self.systray_visible = value_int(self.value("systray_visible"))[0]
-
+ if self.value("systray_visible") is not None:
+ self.systray_visible = value_int(self.value("systray_visible"))[0]
+ else:
+ self.systray_visible = SYSTRAY_VISIBLE_HIDE_WHEN_INACTIVE
+
self.systray_messages = value_int(self.value("systray_messages"))[0]
self.endGroup()

View File

@ -3,7 +3,7 @@
%define cups_ver %(cups-config --api-version) %define cups_ver %(cups-config --api-version)
Name: hplip Name: hplip
Version: 3.22.4 Version: 3.22.4
Release: 1mamba Release: 2mamba
Summary: A printer driver for HP inkjet devices Summary: A printer driver for HP inkjet devices
Group: System/Spooling Group: System/Spooling
Vendor: openmamba Vendor: openmamba
@ -286,6 +286,9 @@ fi
%{_localstatedir}/lib/hp/hplip.state %{_localstatedir}/lib/hp/hplip.state
%changelog %changelog
* Mon Jun 20 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.22.4-2mamba
- fix ui5-systray-hide-when-inactive patch
* Sat May 21 2022 Automatic Build System <autodist@mambasoft.it> 3.22.4-1mamba * Sat May 21 2022 Automatic Build System <autodist@mambasoft.it> 3.22.4-1mamba
- automatic version update by autodist - automatic version update by autodist