diff --git a/glances/plugins/glances_help.py b/glances/plugins/glances_help.py index ea0b6e17..c5eaaf3f 100644 --- a/glances/plugins/glances_help.py +++ b/glances/plugins/glances_help.py @@ -65,20 +65,19 @@ class Plugin(GlancesPlugin): self.view_data['sort_network'] = msg_col2.format("b", _("Bytes or bits for network I/O")) self.view_data['sort_cpu'] = msg_col.format("c", _("Sort processes by CPU%")) self.view_data['show_hide_alert'] = msg_col2.format("l", _("Show/hide alert logs")) - - - self.view_data['show_mem'] = msg_col.format("m", _("Sort processes by MEM%")) + self.view_data['sort_mem'] = msg_col.format("m", _("Sort processes by MEM%")) + self.view_data['sort_user'] = msg_col.format("u", _("Sort processes by USER")) self.view_data['delete_warning_alerts'] = msg_col2.format("w", _("Delete warning alerts")) self.view_data['sort_proc'] = msg_col.format("p", _("Sort processes by name")) self.view_data['delete_warning_critical_alerts'] = msg_col2.format("x", _("Delete warning and critical alerts")) self.view_data['sort_io'] = msg_col.format("i", _("Sort processes by I/O rate")) self.view_data['percpu'] = msg_col2.format("1", _("Global CPU or per-CPU stats")) - self.view_data['sort_cpu_times'] = msg_col.format("t", _("Sort processes by CPU times")) + 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['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")) + self.view_data['view_cumulative_network'] = msg_col2.format("U", _("View cumulative network I/O")) self.view_data['show_hide_network'] = msg_col.format("n", _("Show/hide network stats")) self.view_data['show_hide_filesytem_freespace'] = msg_col2.format("F", _("Show filesystem free space")) self.view_data['show_hide_sensors'] = msg_col.format("s", _("Show/hide sensors stats")) @@ -89,7 +88,8 @@ class Plugin(GlancesPlugin): self.view_data['quit'] = msg_col2.format("q", _("Quit (Esc and Ctrl-C also work)")) self.view_data['enable_disable_top_extends_stats'] = msg_col.format("e", _("Enable/disable top extended stats")) self.view_data['enable_disable_short_processname'] = msg_col.format("/", _("Enable/disable short processes name")) - self.view_data['enable_disable_docker'] = msg_col.format("D", _("Enable/disable Docker stats")) + self.view_data['enable_disable_docker'] = msg_col2.format("D", _("Enable/disable Docker stats")) + self.view_data['enable_disable_quick_look'] = msg_col.format("3", _("Enable/disable quick look plugin")) self.view_data['edit_pattern_filter'] = '{0}: {1}'.format("ENTER", _("Edit the process filter pattern")) @@ -123,44 +123,46 @@ class Plugin(GlancesPlugin): ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_mem'])) + ret.append(self.curse_add_line(self.view_data['sort_mem'])) ret.append(self.curse_add_line(self.view_data['delete_warning_alerts'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['sort_proc'])) + ret.append(self.curse_add_line(self.view_data['sort_user'])) ret.append(self.curse_add_line(self.view_data['delete_warning_critical_alerts'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['sort_io'])) + ret.append(self.curse_add_line(self.view_data['sort_proc'])) ret.append(self.curse_add_line(self.view_data['percpu'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['sort_cpu_times'])) - ret.append(self.curse_add_line(self.view_data['show_hide_help'])) + ret.append(self.curse_add_line(self.view_data['sort_io'])) + ret.append(self.curse_add_line(self.view_data['enable_disable_docker'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_hide_diskio'])) + ret.append(self.curse_add_line(self.view_data['sort_cpu_times'])) ret.append(self.curse_add_line(self.view_data['view_network_io_combination'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_hide_filesystem'])) + ret.append(self.curse_add_line(self.view_data['show_hide_diskio'])) ret.append(self.curse_add_line(self.view_data['view_cumulative_network'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_hide_network'])) + ret.append(self.curse_add_line(self.view_data['show_hide_filesystem'])) ret.append(self.curse_add_line(self.view_data['show_hide_filesytem_freespace'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_hide_sensors'])) + ret.append(self.curse_add_line(self.view_data['show_hide_network'])) ret.append(self.curse_add_line(self.view_data['generate_graphs'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['show_hide_left_sidebar'])) + ret.append(self.curse_add_line(self.view_data['show_hide_sensors'])) ret.append(self.curse_add_line(self.view_data['reset_history'])) ret.append(self.curse_new_line()) + ret.append(self.curse_add_line(self.view_data['show_hide_left_sidebar'])) + ret.append(self.curse_add_line(self.view_data['show_hide_help'])) + ret.append(self.curse_new_line()) ret.append(self.curse_add_line(self.view_data['enable_disable_process_stats'])) ret.append(self.curse_add_line(self.view_data['quit'])) ret.append(self.curse_new_line()) + ret.append(self.curse_add_line(self.view_data['enable_disable_quick_look'])) + ret.append(self.curse_new_line()) ret.append(self.curse_add_line(self.view_data['enable_disable_top_extends_stats'])) ret.append(self.curse_new_line()) ret.append(self.curse_add_line(self.view_data['enable_disable_short_processname'])) ret.append(self.curse_new_line()) - ret.append(self.curse_add_line(self.view_data['enable_disable_docker'])) - - ret.append(self.curse_new_line()) ret.append(self.curse_new_line()) ret.append(self.curse_add_line(self.view_data['edit_pattern_filter']))