From c148907e7b5bf695557413c5a3da2d48ccf056b4 Mon Sep 17 00:00:00 2001 From: Hisham Date: Tue, 2 Feb 2016 16:39:08 +0100 Subject: [PATCH] Try to make threads less confusing. --- Action.c | 6 +++++- ChangeLog | 2 +- DisplayOptionsPanel.c | 2 +- configure.ac | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Action.c b/Action.c index e53f5688..4ef06f48 100644 --- a/Action.c +++ b/Action.c @@ -388,7 +388,7 @@ static struct { const char* key; const char* info; } helpLeft[] = { { .key = " F4 \\: ",.info = "incremental name filtering" }, { .key = " F5 t: ", .info = "tree view" }, { .key = " u: ", .info = "show processes of a single user" }, - { .key = " H: ", .info = "hide/show user threads" }, + { .key = " H: ", .info = "hide/show user process threads" }, { .key = " K: ", .info = "hide/show kernel threads" }, { .key = " F: ", .info = "cursor follows process" }, { .key = " F6 + -: ", .info = "expand/collapse tree" }, @@ -478,6 +478,10 @@ static Htop_Reaction actionHelp(State* st) { attrset(CRT_colors[HELP_BOLD]); for (int i = 0; helpLeft[i].key; i++) { mvaddstr(9+i, 0, helpLeft[i].key); } for (int i = 0; helpRight[i].key; i++) { mvaddstr(9+i, 40, helpRight[i].key); } + attrset(CRT_colors[PROCESS_THREAD]); + mvaddstr(15, 32, "threads"); + mvaddstr(16, 26, "threads"); + attrset(CRT_colors[DEFAULT_COLOR]); attrset(CRT_colors[HELP_BOLD]); mvaddstr(23,0, "Press any key to return."); diff --git a/ChangeLog b/ChangeLog index 4627743a..beeb7f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -What's new in version 1.0.4 +What's new in version 2.0.0 * Platform abstraction layer * Initial FreeBSD support diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c index fbf30795..0a32c447 100644 --- a/DisplayOptionsPanel.c +++ b/DisplayOptionsPanel.c @@ -86,7 +86,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Tree view"), &(settings->treeView))); Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Shadow other users' processes"), &(settings->shadowOtherUsers))); Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Hide kernel threads"), &(settings->hideKernelThreads))); - Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Hide userland threads"), &(settings->hideUserlandThreads))); + Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Hide userland process threads"), &(settings->hideUserlandThreads))); Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Display threads in a different color"), &(settings->highlightThreads))); Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show custom thread names"), &(settings->showThreadNames))); Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show program path"), &(settings->showProgramPath))); diff --git a/configure.ac b/configure.ac index 424e80ce..3bd58bce 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.65) -AC_INIT([htop],[1.0.3],[hisham@gobolinux.org]) +AC_INIT([htop],[2.0.0],[hisham@gobolinux.org]) year=$(date +%Y)