Skip to content

Commit

Permalink
Merge branch '3.16.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	build/debian/changelog
#	build/requirements/macos.txt
  • Loading branch information
Henri Wahl committed Oct 23, 2024
2 parents 297bf8b + a16af22 commit f9a40d0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Nagstamon/Config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions Nagstamon/QUI/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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_'),
Expand Down
4 changes: 2 additions & 2 deletions build/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
nagstamon (3.17-20241021) unstable; urgency=low
nagstamon (3.16.2) stable; urgency=low
* New upstream
- fix sound problem

-- Henri Wahl <[email protected]> Mon, Oct 21 2024 08:00:00 +0200
-- Henri Wahl <[email protected]> Wed, Oct 23 2024 08:00:00 +0200

nagstamon (3.16.1) stable; urgency=low
* New upstream
Expand Down
6 changes: 3 additions & 3 deletions build/requirements/macos.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions build/requirements/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ pip-system-certs
psutil
pyinstaller
pypiwin32
pyqt6
pyqt6-qt6
# 6.7.3 has no sound
pyqt6==6.6.1
pyqt6-qt6==6.6.1
pysocks
python-dateutil
requests
Expand Down

0 comments on commit f9a40d0

Please sign in to comment.