diff --git a/config.py b/config.py index 027bc9c..18c1d2e 100644 --- a/config.py +++ b/config.py @@ -358,12 +358,13 @@ class cfg(): self.netstat_command = "netstat " - self.known_desktop = ["kde3", "kde4", "gnome2", "gnome3", "lxde", "xfce", "linux", "windows", "unknown"] + self.known_desktop = ["kde3", "kde4", "kde5", "gnome2", "gnome3", "lxde", "xfce", "linux", "windows", "unknown"] self.unknown_desktop = ["windows", "unknown"] self.message_system = { 'kde3': 'kdialog --msgbox ', 'kde4': 'kdialog --msgbox ', + 'kde5': '/usr/lib/kf5/bin/kdialog --msgbox ', 'gnome2': 'zenity --info --text ', 'gnome3': 'zenity --info --text ', 'lxde': 'zenity --info --text ', @@ -375,6 +376,7 @@ class cfg(): self.lock = { 'kde3': 'dcop kdesktop KScreensaverIface lock', 'kde4': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver Lock;qdbus org.freedesktop.ScreenSaver /ScreenSaver SetActive 1', + 'kde5': '/usr/libexec/kf5/kscreenlocker_greet', 'gnome2': 'gnome-screensaver;gnome-screensaver-command -a', 'gnome3': 'gnome-screensaver;gnome-screensaver-command -a', 'lxde': 'xscreensaver-command -lock', @@ -384,7 +386,8 @@ class cfg(): self.unlock = { 'kde3': 'killall -s 15 -u $USER kdesktop_lock', - 'kde4': 'killall -s 15 -u $USER kscreenlocker', + 'kde4': 'killall -s 15 -u $USER kscreenlocker_greet', + 'kde5': 'killall -s 15 -u $USER kscreenlocker_greet', 'gnome2': 'killall -s 15 -u $USER gnome-screensaver', 'gnome3': 'killall -s 15 -u $USER gnome-screensaver', 'lxde': 'killall -s 15 -u $USER xscreensaver;xscreensaver &', @@ -396,6 +399,7 @@ class cfg(): self.logout = { 'kde3': 'dcop ksmserver default logout 0 0 0', 'kde4': 'qdbus org.kde.ksmserver /KSMServer logout 0 0 0', + 'kde5': 'qdbus org.kde.ksmserver /KSMServer logout 0 0 0', 'gnome2': 'killall gnome-session', 'gnome3': 'gnome-session-quit --logout --force --no-prompt', 'lxde': 'pkill -9 -u $USER', diff --git a/timers.py b/timers.py index 77dca10..a828922 100644 --- a/timers.py +++ b/timers.py @@ -124,7 +124,7 @@ class timers: # desktop if ( cfg.userList.get_value(iter, dn['desktop']) == "kde3" ): cfg.userList.set(iter, 108, cfg.pixbuf_status_kde3_16) - elif ( cfg.userList.get_value(iter, dn['desktop']) == "kde4" ): + elif ( (cfg.userList.get_value(iter, dn['desktop']) == "kde4") or (cfg.userList.get_value(iter, dn['desktop']) == "kde5") ): cfg.userList.set(iter, 108, cfg.pixbuf_status_kde4_16) elif ( cfg.userList.get_value(iter, dn['desktop']) == "gnome2" ): cfg.userList.set(iter, 108, cfg.pixbuf_status_gnome2_16) diff --git a/util.py b/util.py index 0afa8dd..0c22929 100644 --- a/util.py +++ b/util.py @@ -387,7 +387,9 @@ def get_desktops(out, data): if ( len(x.split()) < 2 ): continue list = x.split() - if ( "kded4" in list[1] ): + if ( "kded5" in list[1] ): + desktops.append(list[0]+" kde5") + elif ( "kded4" in list[1] ): desktops.append(list[0]+" kde4") elif ( "kded" in list[1] ): desktops.append(list[0]+" kde3")