From ac337ff6251ed7f130821a1ac5306da1f506f404 Mon Sep 17 00:00:00 2001 From: Henri Date: Mon, 21 Oct 2024 00:08:44 +0200 Subject: [PATCH 01/11] fix for Windows icon --- build/windows/nagstamon.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/nagstamon.iss b/build/windows/nagstamon.iss index 6a09b639..3cb9c088 100644 --- a/build/windows/nagstamon.iss +++ b/build/windows/nagstamon.iss @@ -27,8 +27,8 @@ ArchitecturesInstallIn64BitMode=x64 CloseApplications=no WizardStyle=modern [Icons] -Name: {group}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\resources\nagstamon.ico; IconIndex: 0 -Name: {commonstartup}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\resources\nagstamon.ico; IconIndex: 0 +Name: {group}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\_internal\resources\nagstamon.ico; IconIndex: 0 +Name: {commonstartup}\Nagstamon; Filename: {app}\nagstamon.exe; WorkingDir: {app}; IconFilename: {app}\_internal\resources\nagstamon.ico; IconIndex: 0 [Files] Source: "*"; DestDir: {app}; Flags: recursesubdirs createallsubdirs ignoreversion; BeforeInstall: KillRunningNagstamon() [Tasks] From 9d5e1583f9381c3f39bbde972a1e7e990d32a545 Mon Sep 17 00:00:00 2001 From: Henri Date: Mon, 21 Oct 2024 00:29:19 +0200 Subject: [PATCH 02/11] fix for Windows icon uninstaller --- build/windows/nagstamon.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/windows/nagstamon.iss b/build/windows/nagstamon.iss index 3cb9c088..96b8f4a4 100644 --- a/build/windows/nagstamon.iss +++ b/build/windows/nagstamon.iss @@ -10,7 +10,7 @@ ShowLanguageDialog=no SetupIconFile=nagstamon.ico UsePreviousGroup=false OutputBaseFilename=Nagstamon-{#version}-win{#arch}_setup -UninstallDisplayIcon={app}\resources\nagstamon.ico +UninstallDisplayIcon={app}\_internal\resources\nagstamon.ico UsePreviousAppDir=false AppID={{44F7CFFB-4776-4DA4-9930-A07178069517} UninstallRestartComputer=false From c0010abe698295edc76d5e3af9b0253d071b3750 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Mon, 21 Oct 2024 17:04:27 +0200 Subject: [PATCH 03/11] fix sound problem (cherry picked from commit 297bf8bbb3dd85655de8b765b7c7460b4b33d29b) --- build/debian/changelog | 6 ++++++ build/requirements/macos.txt | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 2a7a5ec8..0cccdf05 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +nagstamon (3.17-20241021) unstable; urgency=low + * New upstream + - fix sound problem + + -- Henri Wahl Mon, Oct 21 2024 08:00:00 +0200 + nagstamon (3.16.1) stable; urgency=low * New upstream - fix ridiculous Windows 11 appearance diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index 1e34e689..e9842b4f 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -5,8 +5,9 @@ lxml psutil pyinstaller pyobjc-framework-ApplicationServices -pyqt6 -pyqt6-qt6 +# since 6.6.0 no sound is available!?! +pyqt6==6.5.3 +pyqt6-qt6==6.5.3 pysocks python-dateutil requests From 4b592a3003c4e742dd415129b00360b9ac7aaaa1 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Mon, 21 Oct 2024 17:07:08 +0200 Subject: [PATCH 04/11] fix sound problem --- build/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/debian/changelog b/build/debian/changelog index 0cccdf05..d634d769 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -nagstamon (3.17-20241021) unstable; urgency=low +nagstamon (3.16.2) stable; urgency=low * New upstream - fix sound problem From be4283d636b968716caf4b0a55dfa6786d0198ed Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Mon, 21 Oct 2024 16:48:31 +0200 Subject: [PATCH 05/11] play with Qt 6.5.3 --- Nagstamon/QUI/__init__.py | 5 +++-- build/requirements/windows.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py index d8c04172..81c51c3f 100644 --- a/Nagstamon/QUI/__init__.py +++ b/Nagstamon/QUI/__init__.py @@ -142,8 +142,9 @@ APP = QApplication(sys.argv) # as long as Windows 11 + Qt6 looks that ugly it's better to choose another app style -if OS == OS_WINDOWS and platform.release() >= '11': - APP.setStyle('fusion') +# might be mitigated with Qt 6.5.3, so commented out now +#if OS == OS_WINDOWS and platform.release() >= '11': +# APP.setStyle('fusion') # fixed shortened and lowered color names for cells, also used by statusbar label snippets COLORS = OrderedDict([('DOWN', 'color_down_'), diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 5a1becbd..033189ac 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -6,8 +6,9 @@ pip-system-certs psutil pyinstaller pypiwin32 -pyqt6 -pyqt6-qt6 +# since 6.6.0 no sound is available!?! +pyqt6==6.5.3 +pyqt6-qt6==6.5.3 pysocks python-dateutil requests From 195e48b2bc78684c48076582c6132c8148fec4f0 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 23 Oct 2024 17:53:24 +0200 Subject: [PATCH 06/11] try to fix sound problem --- Nagstamon/Config.py | 2 +- build/requirements/windows.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py index 939a6334..0aaa0c7c 100644 --- a/Nagstamon/Config.py +++ b/Nagstamon/Config.py @@ -131,7 +131,7 @@ class AppInfo(object): contains app information previously located in GUI.py """ NAME = 'Nagstamon' - VERSION = '3.16.1' + VERSION = '3.16.2' WEBSITE = 'https://nagstamon.de' COPYRIGHT = '©2008-2024 Henri Wahl et al.' COMMENTS = 'Nagios status monitor for your desktop' diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 033189ac..0894ec2a 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -7,8 +7,8 @@ psutil pyinstaller pypiwin32 # since 6.6.0 no sound is available!?! -pyqt6==6.5.3 -pyqt6-qt6==6.5.3 +pyqt6==6.6.1 +pyqt6-qt6==6.6.1 pysocks python-dateutil requests From 9b408463fa1d202ff927a584da4534aa3f799e1a Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 23 Oct 2024 19:27:33 +0200 Subject: [PATCH 07/11] try to fix sound problem --- build/requirements/macos.txt | 6 +++--- build/requirements/windows.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index e9842b4f..8136b3a5 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -5,9 +5,9 @@ lxml psutil pyinstaller pyobjc-framework-ApplicationServices -# since 6.6.0 no sound is available!?! -pyqt6==6.5.3 -pyqt6-qt6==6.5.3 +# 6.7.3 has no sound +pyqt6==6.6.1 +pyqt6-qt6==6.6.1 pysocks python-dateutil requests diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 0894ec2a..4c56fd13 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -6,7 +6,7 @@ pip-system-certs psutil pyinstaller pypiwin32 -# since 6.6.0 no sound is available!?! +# 6.7.3 has no sound pyqt6==6.6.1 pyqt6-qt6==6.6.1 pysocks From 70764f74b9952e5d324044bc5f0d9bcf11e1c604 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Mon, 21 Oct 2024 17:04:27 +0200 Subject: [PATCH 08/11] fix sound problem (cherry picked from commit 297bf8bbb3dd85655de8b765b7c7460b4b33d29b) --- build/requirements/macos.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index 8136b3a5..e9842b4f 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -5,9 +5,9 @@ lxml psutil pyinstaller pyobjc-framework-ApplicationServices -# 6.7.3 has no sound -pyqt6==6.6.1 -pyqt6-qt6==6.6.1 +# since 6.6.0 no sound is available!?! +pyqt6==6.5.3 +pyqt6-qt6==6.5.3 pysocks python-dateutil requests From c1140b75f2748e170c19c3a797db29dc9b5d3595 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 23 Oct 2024 17:53:24 +0200 Subject: [PATCH 09/11] try to fix sound problem --- build/requirements/windows.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 4c56fd13..0894ec2a 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -6,7 +6,7 @@ pip-system-certs psutil pyinstaller pypiwin32 -# 6.7.3 has no sound +# since 6.6.0 no sound is available!?! pyqt6==6.6.1 pyqt6-qt6==6.6.1 pysocks From c924ff8f980f8aee5ee8548f277b5c788297fc22 Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 23 Oct 2024 19:27:33 +0200 Subject: [PATCH 10/11] try to fix sound problem --- build/requirements/macos.txt | 6 +++--- build/requirements/windows.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index e9842b4f..8136b3a5 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -5,9 +5,9 @@ lxml psutil pyinstaller pyobjc-framework-ApplicationServices -# since 6.6.0 no sound is available!?! -pyqt6==6.5.3 -pyqt6-qt6==6.5.3 +# 6.7.3 has no sound +pyqt6==6.6.1 +pyqt6-qt6==6.6.1 pysocks python-dateutil requests diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 0894ec2a..4c56fd13 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -6,7 +6,7 @@ pip-system-certs psutil pyinstaller pypiwin32 -# since 6.6.0 no sound is available!?! +# 6.7.3 has no sound pyqt6==6.6.1 pyqt6-qt6==6.6.1 pysocks From a16af223313e54ce3e9c509f2075e6c6b6f1e96b Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 23 Oct 2024 19:50:15 +0200 Subject: [PATCH 11/11] prepare 3.16.2 --- build/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/debian/changelog b/build/debian/changelog index d634d769..a6d50a57 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -2,7 +2,7 @@ nagstamon (3.16.2) stable; urgency=low * New upstream - fix sound problem - -- Henri Wahl Mon, Oct 21 2024 08:00:00 +0200 + -- Henri Wahl Wed, Oct 23 2024 08:00:00 +0200 nagstamon (3.16.1) stable; urgency=low * New upstream