Attachment #7024 for bug #33301

View | Details | Raw Unified | Return to bug 33301
Collapse All | Expand All




	self.netstat_command = "netstat "
    	

	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 ',

	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',


	self.unlock = {
		'kde3': 'killall -s 15 -u $USER kdesktop_lock',
		'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 &',

	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',

Lines 124-130 class timers: Link Here

(-)a/timers.py (-1 / +1 lines)
124	# desktop	124	# desktop
125	if ( cfg.userList.get_value(iter, dn['desktop']) == "kde3" ):	125	if ( cfg.userList.get_value(iter, dn['desktop']) == "kde3" ):
126	cfg.userList.set(iter, 108, cfg.pixbuf_status_kde3_16)	126	cfg.userList.set(iter, 108, cfg.pixbuf_status_kde3_16)
127	elif ( cfg.userList.get_value(iter, dn['desktop']) == "kde4" ):	127	elif ( (cfg.userList.get_value(iter, dn['desktop']) == "kde4") or (cfg.userList.get_value(iter, dn['desktop']) == "kde5") ):
128	cfg.userList.set(iter, 108, cfg.pixbuf_status_kde4_16)	128	cfg.userList.set(iter, 108, cfg.pixbuf_status_kde4_16)
129	elif ( cfg.userList.get_value(iter, dn['desktop']) == "gnome2" ):	129	elif ( cfg.userList.get_value(iter, dn['desktop']) == "gnome2" ):
130	cfg.userList.set(iter, 108, cfg.pixbuf_status_gnome2_16)	130	cfg.userList.set(iter, 108, cfg.pixbuf_status_gnome2_16)

Lines 387-393 def get_desktops(out, data): Link Here

(-)a/util.py (-1 / +3 lines)
387	if ( len(x.split()) < 2 ):	387	if ( len(x.split()) < 2 ):
388	continue	388	continue
389	list = x.split()	389	list = x.split()
390	if ( "kded4" in list[1] ):	390	if ( "kded5" in list[1] ):
		391	desktops.append(list[0]+" kde5")
		392	elif ( "kded4" in list[1] ):
391	desktops.append(list[0]+" kde4")	393	desktops.append(list[0]+" kde4")
392	elif ( "kded" in list[1] ):	394	elif ( "kded" in list[1] ):
393	desktops.append(list[0]+" kde3")	395	desktops.append(list[0]+" kde3")

Return to bug 33301

Lines 358-369 class cfg(): Link Here

(-)a/config.py (-2 / +6 lines)
358	self.netstat_command = "netstat "	358	self.netstat_command = "netstat "
359		359
360		360
361	self.known_desktop = ["kde3", "kde4", "gnome2", "gnome3", "lxde", "xfce", "linux", "windows", "unknown"]	361	self.known_desktop = ["kde3", "kde4", "kde5", "gnome2", "gnome3", "lxde", "xfce", "linux", "windows", "unknown"]
362	self.unknown_desktop = ["windows", "unknown"]	362	self.unknown_desktop = ["windows", "unknown"]
363		363
364	self.message_system = {	364	self.message_system = {
365	'kde3': 'kdialog --msgbox ',	365	'kde3': 'kdialog --msgbox ',
366	'kde4': 'kdialog --msgbox ',	366	'kde4': 'kdialog --msgbox ',
		367	'kde5': '/usr/lib/kf5/bin/kdialog --msgbox ',
367	'gnome2': 'zenity --info --text ',	368	'gnome2': 'zenity --info --text ',
368	'gnome3': 'zenity --info --text ',	369	'gnome3': 'zenity --info --text ',
369	'lxde': 'zenity --info --text ',	370	'lxde': 'zenity --info --text ',
Lines 375-380 class cfg(): Link Here
375	self.lock = {	376	self.lock = {
376	'kde3': 'dcop kdesktop KScreensaverIface lock',	377	'kde3': 'dcop kdesktop KScreensaverIface lock',
377	'kde4': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver Lock;qdbus org.freedesktop.ScreenSaver /ScreenSaver SetActive 1',	378	'kde4': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver Lock;qdbus org.freedesktop.ScreenSaver /ScreenSaver SetActive 1',
		379	'kde5': '/usr/libexec/kf5/kscreenlocker_greet',
378	'gnome2': 'gnome-screensaver;gnome-screensaver-command -a',	380	'gnome2': 'gnome-screensaver;gnome-screensaver-command -a',
379	'gnome3': 'gnome-screensaver;gnome-screensaver-command -a',	381	'gnome3': 'gnome-screensaver;gnome-screensaver-command -a',
380	'lxde': 'xscreensaver-command -lock',	382	'lxde': 'xscreensaver-command -lock',
Lines 384-390 class cfg(): Link Here
384		386
385	self.unlock = {	387	self.unlock = {
386	'kde3': 'killall -s 15 -u $USER kdesktop_lock',	388	'kde3': 'killall -s 15 -u $USER kdesktop_lock',
387	'kde4': 'killall -s 15 -u $USER kscreenlocker',	389	'kde4': 'killall -s 15 -u $USER kscreenlocker_greet',
		390	'kde5': 'killall -s 15 -u $USER kscreenlocker_greet',
388	'gnome2': 'killall -s 15 -u $USER gnome-screensaver',	391	'gnome2': 'killall -s 15 -u $USER gnome-screensaver',
389	'gnome3': 'killall -s 15 -u $USER gnome-screensaver',	392	'gnome3': 'killall -s 15 -u $USER gnome-screensaver',
390	'lxde': 'killall -s 15 -u $USER xscreensaver;xscreensaver &',	393	'lxde': 'killall -s 15 -u $USER xscreensaver;xscreensaver &',
Lines 396-401 class cfg(): Link Here
396	self.logout = {	399	self.logout = {
397	'kde3': 'dcop ksmserver default logout 0 0 0',	400	'kde3': 'dcop ksmserver default logout 0 0 0',
398	'kde4': 'qdbus org.kde.ksmserver /KSMServer logout 0 0 0',	401	'kde4': 'qdbus org.kde.ksmserver /KSMServer logout 0 0 0',
		402	'kde5': 'qdbus org.kde.ksmserver /KSMServer logout 0 0 0',
399	'gnome2': 'killall gnome-session',	403	'gnome2': 'killall gnome-session',
400	'gnome3': 'gnome-session-quit --logout --force --no-prompt',	404	'gnome3': 'gnome-session-quit --logout --force --no-prompt',
401	'lxde': 'pkill -9 -u $USER',	405	'lxde': 'pkill -9 -u $USER',