From 8e8e6544e9eb41b8762c35356b41835ac2d69065 Mon Sep 17 00:00:00 2001 From: Nicolargo Date: Mon, 3 Aug 2015 19:01:54 +0200 Subject: [PATCH] Add --full-quicklook tag (key '4') --- docs/glances-doc.rst | 9 ++++++++- glances/core/glances_main.py | 6 ++++-- glances/outputs/glances_curses.py | 15 +++++++++++++++ man/glances.1 | 24 +++++++++++++++++++++--- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index 81025b61..644d483a 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -147,6 +147,12 @@ Command-Line Options -d, --debug enable debug mode -C CONF_FILE, --config CONF_FILE path to the configuration file + --disable-quicklook disable quick look module + --full-quicklook enable all but quick look and load + --disable-cpu disable CPU module + --disable-mem disable MEM module + --disable-swap disable SWAP module + --disable-load disable LOAD module --disable-network disable network module --disable-ip disable IP module --disable-diskio disable disk I/O module @@ -160,7 +166,6 @@ Command-Line Options sensors modules (py3sensors needed) --disable-process disable process module --disable-log disable log module - --disable-quicklook disable quick look module --disable-bold disable bold mode in the terminal --enable-process-extended enable extended stats on top process @@ -280,6 +285,8 @@ The following commands (key pressed) are supported while in Glances: Enable/disable left sidebar ``3`` Enable/disable the quick look module +``4`` + Enable/disable all but quick look and load module ``/`` Switch between short name / command line (processes name) diff --git a/glances/core/glances_main.py b/glances/core/glances_main.py index e8d45046..b1040c3d 100644 --- a/glances/core/glances_main.py +++ b/glances/core/glances_main.py @@ -100,6 +100,10 @@ Start the client browser (browser mode):\n\ parser.add_argument('-C', '--config', dest='conf_file', help='path to the configuration file') # Enable or disable option on startup + parser.add_argument('-3', '--disable-quicklook', action='store_true', default=False, + dest='disable_quicklook', help='disable quick look module') + parser.add_argument('-4', '--full-quicklook', action='store_true', default=False, + dest='full_quicklook', help='disable all but quick look and load') parser.add_argument('--disable-cpu', action='store_true', default=False, dest='disable_cpu', help='disable CPU module') parser.add_argument('--disable-mem', action='store_true', default=False, @@ -131,8 +135,6 @@ Start the client browser (browser mode):\n\ dest='disable_process', help='disable process module') parser.add_argument('--disable-log', action='store_true', default=False, dest='disable_log', help='disable log module') - parser.add_argument('-3', '--disable-quicklook', action='store_true', default=False, - dest='disable_quicklook', help='disable quick look module') parser.add_argument('--disable-bold', action='store_false', default=True, dest='disable_bold', help='disable bold mode in the terminal') parser.add_argument('--enable-process-extended', action='store_true', default=False, diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 1831be5d..f19370af 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -264,6 +264,21 @@ class _GlancesCurses(object): elif self.pressedkey == ord('3'): # '3' > Enable/disable quicklook self.args.disable_quicklook = not self.args.disable_quicklook + elif self.pressedkey == ord('4'): + # '4' > Enable/disable all but quick look and load + self.args.full_quicklook = not self.args.full_quicklook + if self.args.full_quicklook: + self.args.disable_quicklook = False + self.args.disable_cpu = True + self.args.disable_mem = True + self.args.disable_swap = True + self.args.disable_load = False + else: + self.args.disable_quicklook = False + self.args.disable_cpu = False + self.args.disable_mem = False + self.args.disable_swap = False + self.args.disable_load = False elif self.pressedkey == ord('/'): # '/' > Switch between short/long name for processes self.args.process_short_name = not self.args.process_short_name diff --git a/man/glances.1 b/man/glances.1 index 0a4463ca..b26c495d 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -31,6 +31,24 @@ enable debug mode (log file is /tmp/glances.log) .B \-C CONF_FILE, \-\-config CONF_FILE path to the configuration file .TP +.B \-\-disable-quicklook +disable quick look module +.TP +.B \-\-full-quicklook +disable all but quick look and load modules +.TP +.B \-\-disable-cpu +disable CPU module +.TP +.B \-\-disable-mem +disable MEM module +.TP +.B \-\-disable-swap +disable SWAP module +.TP +.B \-\-disable-load +disable LOAD module +.TP .B \-\-disable-network disable network module .TP @@ -64,9 +82,6 @@ disable process module .B \-\-disable-log disable log module .TP -.B \-\-disable-quicklook -disable quick look module -.TP .B \-\-disable-bold disable bold mode in the terminal .TP @@ -261,6 +276,9 @@ Enable/disable left sidebar .B 3 Enable/disable the quick look module .TP +.B 4 +Enable/disable all but quick look and load module +.TP .B / Switch between short name/command line (processes name) .SH EXAMPLES