From bc1b15a666f4ad08f4c19bfc844f16ed69b502e1 Mon Sep 17 00:00:00 2001 From: Silvan Date: Sun, 25 Feb 2024 15:16:46 +0100 Subject: [PATCH] mambatray.py: support for "plasmawayland" session --- mambatray.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mambatray.py b/mambatray.py index 8d1a272..91fc55b 100755 --- a/mambatray.py +++ b/mambatray.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # mambatray 2 -# Copyright (C) 2011-2022 by Silvan Calarco +# Copyright (C) 2011-2024 by Silvan Calarco # Copyright (C) 2011 by michiamophil # Distributed under the terms of the GPL version 3 FLOSS License # @@ -9,11 +9,10 @@ import os import gettext import libproxy import distro -from PyQt5 import uic -from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtCore import Qt from PyQt5.QtGui import QIcon, QCursor from PyQt5.QtWidgets import QSystemTrayIcon, QApplication, QMenu, QMainWindow,\ - QMessageBox, QWidget + QMessageBox from PyQt5.QtCore import QTimer, QProcess DATADIR = os.path.dirname(os.path.realpath((__file__))) + "/" @@ -190,13 +189,13 @@ class SystemTrayIcon(QSystemTrayIcon): self.showMessage("Firewall", _("Could not enable firewall")) def networkFirewallConfigure(self): - if desktop_session == 'kde' or desktop_session == 'plasma': + if desktop_session == 'kde' or desktop_session.startswith('plasma'): networkFirewallConfigureProcess.execute("/usr/bin/kcmshell5", list(set(['firewall']))) else: networkFirewallConfigureProcess.execute("/usr/bin/gufw") def networkProxy(self): - if desktop_session == 'plasma': + if desktop_session.startswith('plasma'): networkProxyProcess.execute("/usr/bin/kcmshell5", list(set(['proxy']))) elif desktop_session == 'kde': networkProxyProcess.execute("/opt/kde/bin/kcmshell4", list(set(['proxy'])))