mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-16 21:08:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct issue on PROC stats if screen < 80 pixels v2

Browse Source
This commit is contained in:
Nicolargo
2014-05-25 18:51:24 +02:00
parent a7c5ce2fdd
commit 3e49d3cc2d
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glances/outputs/glances_curses.py
View File

@@ -334,9 +334,11 @@ class glancesCurses:
stats_processlist = stats.get_plugin('processlist').get_stats_display(args=self.args)
stats_alert = stats.get_plugin('alert').get_stats_display(args=self.args)
stats_monitor = stats.get_plugin('monitor').get_stats_display(args=self.args)
# Display
self.display_plugin(stats_processcount)
self.display_plugin(stats_monitor)
self.display_plugin(stats_processlist,
display_optional=(screen_x > 102),
max_y=(screen_y - self.get_stats_display_height(stats_alert) - 2))
self.display_plugin(stats_alert)

20
glances/plugins/glances_processlist.py
View File

@@ -106,13 +106,13 @@ class Plugin(GlancesPlugin):
msg = "{0:>6}".format(_("RES"))
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>6}".format(_("PID"))
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
msg = " {0:10}".format(_("USER"))
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
msg = "{0:>4}".format(_("NI"))
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
msg = "{0:>2}".format(_("S"))
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
msg = "{0:>9}".format(_("TIME+"))
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>6}".format(_("IOR/s"))
@@ -144,24 +144,24 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg, optional=True))
# PID
msg = "{0:>6}".format(p['pid'])
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
# USER
msg = " {0:9}".format(p['username'][:9])
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
# NICE
nice = p['nice']
msg = "{0:>5}".format(nice)
if nice != 0:
ret.append(self.curse_add_line(msg, decoration='NICE', optional=True))
ret.append(self.curse_add_line(msg, decoration='NICE'))
else:
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
# STATUS
status = p['status']
msg = "{0:>2}".format(status)
if status == 'R':
ret.append(self.curse_add_line(msg, decoration='STATUS', optional=True))
ret.append(self.curse_add_line(msg, decoration='STATUS'))
else:
ret.append(self.curse_add_line(msg, optional=True))
ret.append(self.curse_add_line(msg))
# TIME+
if tag_proc_time:
try: