From 937052b231259a47d881d539ad5748245ef55b99 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Fri, 3 Jun 2022 08:55:20 +0200 Subject: New upstream version 3.2.1 --- DisplayOptionsPanel.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'DisplayOptionsPanel.c') diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c index f5e64b1..fc23cb6 100644 --- a/DisplayOptionsPanel.c +++ b/DisplayOptionsPanel.c @@ -18,6 +18,7 @@ in the source distribution for its full text. #include "Object.h" #include "OptionItem.h" #include "ProvideCurses.h" +#include "ScreensPanel.h" static const char* const DisplayOptionsFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL}; @@ -43,6 +44,8 @@ static HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) { case KEY_RECLICK: case ' ': switch (OptionItem_kind(selected)) { + case OPTION_ITEM_TEXT: + break; case OPTION_ITEM_CHECK: CheckItem_toggle((CheckItem*)selected); result = HANDLED; @@ -69,6 +72,7 @@ static HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) { if (result == HANDLED) { this->settings->changed = true; + this->settings->lastUpdate++; Header* header = this->scr->header; Header_calculateHeight(header); Header_reinit(header); @@ -97,9 +101,17 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* this->scr = scr; Panel_setHeader(super, "Display options"); - Panel_add(super, (Object*) CheckItem_newByRef("Tree view (for the current Screen tab)", &(settings->ss->treeView))); + + #define TABMSG "For current screen tab: \0" + char tabheader[sizeof(TABMSG) + SCREEN_NAME_LEN + 1] = TABMSG; + strncat(tabheader, settings->ss->name, SCREEN_NAME_LEN); + Panel_add(super, (Object*) TextItem_new(tabheader)); + #undef TABMSG + + Panel_add(super, (Object*) CheckItem_newByRef("Tree view", &(settings->ss->treeView))); Panel_add(super, (Object*) CheckItem_newByRef("- Tree view is always sorted by PID (htop 2 behavior)", &(settings->ss->treeViewAlwaysByPID))); Panel_add(super, (Object*) CheckItem_newByRef("- Tree view is collapsed by default", &(settings->ss->allBranchesCollapsed))); + Panel_add(super, (Object*) TextItem_new("Global options:")); Panel_add(super, (Object*) CheckItem_newByRef("Show tabs for screens", &(settings->screenTabs))); Panel_add(super, (Object*) CheckItem_newByRef("Shadow other users' processes", &(settings->shadowOtherUsers))); Panel_add(super, (Object*) CheckItem_newByRef("Hide kernel threads", &(settings->hideKernelThreads))); -- cgit v1.2.3