Correct hotkeys d, f, l, n

This commit is contained in:
nicolargo 2016-12-31 18:41:58 +01:00
parent 60d2704161
commit 68482c3d8a
4 changed files with 25 additions and 22 deletions

View File

@ -78,6 +78,10 @@ Command-Line Options
disable network module
.. option:: --disable-now
disable current time module
.. option:: --disable-ports
disable Ports module
@ -393,6 +397,9 @@ The following commands (key pressed) are supported while in Glances:
``n``
Show/hide network stats
``N``
Show/hide current time
``p``
Sort processes by name

View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "GLANCES" "1" "Dec 29, 2016" "2.8_DEVELOP" "Glances"
.TH "GLANCES" "1" "Dec 31, 2016" "2.8_DEVELOP" "Glances"
.SH NAME
glances \- An eye on your system
.
@ -138,6 +138,11 @@ disable network module
.UNINDENT
.INDENT 0.0
.TP
.B \-\-disable\-now
disable current time module
.UNINDENT
.INDENT 0.0
.TP
.B \-\-disable\-ports
disable Ports module
.UNINDENT
@ -513,6 +518,9 @@ Reset processes summary min/max
.B \fBn\fP
Show/hide network stats
.TP
.B \fBN\fP
Show/hide current time
.TP
.B \fBp\fP
Sort processes by name
.TP

View File

@ -127,6 +127,8 @@ Start the client browser (browser mode):\n\
dest='disable_memswap', help='disable memory swap module')
parser.add_argument('--disable-network', action='store_true', default=False,
dest='disable_network', help='disable network module')
parser.add_argument('--disable-now', action='store_true', default=False,
dest='disable_now', help='disable current time module')
parser.add_argument('--disable-ports', action='store_true', default=False,
dest='disable_ports', help='disable ports scanner module')
parser.add_argument('--disable-process', action='store_true', default=False,

View File

@ -66,6 +66,7 @@ class _GlancesCurses(object):
'l': {'switch': 'disable_alert'},
'M': {'switch': 'reset_minmax_tag'},
'n': {'switch': 'disable_network'},
'N': {'switch': 'disable_now'},
'P': {'switch': 'disable_ports'},
'Q': {'switch': 'enable_irq'},
'R': {'switch': 'disable_raid'},
@ -721,27 +722,12 @@ class _GlancesCurses(object):
network+wifi+ports+diskio+fs+irq+folders+raid+sensors+now
"""
self.init_column()
if not (self.args.disable_network and
self.args.disable_wifi and
self.args.disable_ports and
self.args.disable_diskio and
self.args.disable_fs and
self.args.enable_irq and
self.args.disable_folders and
self.args.disable_raid and
self.args.disable_sensors) and not self.args.disable_left_sidebar:
for s in (stat_display["network"],
stat_display["wifi"],
stat_display["ports"],
stat_display["diskio"],
stat_display["fs"],
stat_display["irq"],
stat_display["folders"],
stat_display["raid"],
stat_display["sensors"],
stat_display["now"]):
self.new_line()
self.display_plugin(s)
if not self.args.disable_left_sidebar:
for s in ['network', 'wifi', 'ports', 'diskio', 'fs', 'irq',
'folders', 'raid', 'sensors', 'now']:
if hasattr(self.args, 'disable_' + s) and s in stat_display:
self.new_line()
self.display_plugin(stat_display[s])
def __display_right(self, stat_display):
"""Display the right sidebar in the Curses interface.