diff --git a/docs/cmds.rst b/docs/cmds.rst index f6ed26a2..c62803f1 100644 --- a/docs/cmds.rst +++ b/docs/cmds.rst @@ -66,6 +66,10 @@ Command-Line Options disable folder module +.. option:: --disable-irq + + disable IRQ module + .. option:: --disable-sensors disable sensors module @@ -363,6 +367,9 @@ The following commands (key pressed) are supported while in Glances: ``q|ESC`` Quit the current Glances session +``Q`` + Show/hide IRQ module + ``r`` Reset history diff --git a/docs/conf.py b/docs/conf.py index 12e1fb6c..babb8c4a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -115,15 +115,12 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'alabaster' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. html_theme_options = { - 'github_user': 'nicolargo', - 'github_repo': 'glances', - 'show_powered_by': False } # Add any paths that contain custom themes here, relative to this directory. diff --git a/docs/man/glances.1 b/docs/man/glances.1 index fd4062c7..370dd432 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -123,6 +123,11 @@ disable folder module .UNINDENT .INDENT 0.0 .TP +.B \-\-disable\-irq +disable IRQ module +.UNINDENT +.INDENT 0.0 +.TP .B \-\-disable\-sensors disable sensors module .UNINDENT diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 3791bd57..5d33f7de 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -361,8 +361,6 @@ class _GlancesCurses(object): elif self.pressedkey == ord('d'): # 'd' > Show/hide disk I/O stats self.args.disable_diskio = not self.args.disable_diskio - elif self.pressedkey == ord('R'): - self.args.disable_irq = not self.args.disable_irq elif self.pressedkey == ord('D'): # 'D' > Show/hide Docker stats self.args.disable_docker = not self.args.disable_docker @@ -417,6 +415,8 @@ class _GlancesCurses(object): elif self.pressedkey == ord('P'): # 'P' > Disable ports scan plugins self.args.disable_ports = not self.args.disable_ports + elif self.pressedkey == ord('Q'): + self.args.disable_irq = not self.args.disable_irq elif self.pressedkey == ord('r'): # 'r' > Reset history self.reset_history_tag = not self.reset_history_tag diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js index e2b04862..b10c9e01 100644 --- a/glances/outputs/static/js/stats_controller.js +++ b/glances/outputs/static/js/stats_controller.js @@ -104,7 +104,7 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval // d => Show/hide disk I/O stats $scope.arguments.disable_diskio = !$scope.arguments.disable_diskio; break; - case $event.shiftKey && $event.keyCode == keycodes.R: + case $event.shiftKey && $event.keyCode == keycodes.Q: // R => Show/hide IRQ $scope.arguments.disable_irq = !$scope.arguments.disable_irq; break; diff --git a/glances/plugins/glances_help.py b/glances/plugins/glances_help.py index 109fef58..31dded7d 100644 --- a/glances/plugins/glances_help.py +++ b/glances/plugins/glances_help.py @@ -74,7 +74,7 @@ class Plugin(GlancesPlugin): self.view_data['sort_cpu_times'] = msg_col.format('t', 'Sort processes by TIME') self.view_data['show_hide_help'] = msg_col2.format('h', 'Show/hide this help screen') self.view_data['show_hide_diskio'] = msg_col.format('d', 'Show/hide disk I/O stats') - self.view_data['show_hide_irq'] = msg_col2.format('R', 'Show/hide IRQ stats') + self.view_data['show_hide_irq'] = msg_col2.format('Q', 'Show/hide IRQ stats') self.view_data['view_network_io_combination'] = msg_col2.format('T', 'View network I/O as combination') self.view_data['show_hide_filesystem'] = msg_col.format('f', 'Show/hide filesystem stats') self.view_data['view_cumulative_network'] = msg_col2.format('U', 'View cumulative network I/O')