From 9d825229c63d8618802749e294126ff6e118042a Mon Sep 17 00:00:00 2001 From: Burt P Date: Sun, 18 Aug 2019 17:14:25 -0500 Subject: various: entry hide flag, fix text format report, fix key_*() funcs * fix key_is_highlighted() and key_wants_details() so that they don't look for flags in the label. * fix -r -f text, g_hash-related warnings from icon cache * add MODULE_FLAG_HIDE flag to hide module entries instead of using the '#' at the beginning of string hack, which didn't work everywhere, and screwed up translated strings. * hide GPU Drawing benchmark See: https://github.com/lpereira/hardinfo/issues/329 Signed-off-by: Burt P --- modules/benchmark/benches.c | 8 ++++---- modules/devices.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/benchmark/benches.c b/modules/benchmark/benches.c index de1aa507..945cfe15 100644 --- a/modules/benchmark/benches.c +++ b/modules/benchmark/benches.c @@ -101,16 +101,16 @@ static ModuleEntry entries[] = { [BENCHMARK_SBCPU_ALL] = {N_("SysBench CPU (Multi-thread)"), "processor.png", callback_benchmark_sbcpu_all, scan_benchmark_sbcpu_all, MODULE_FLAG_NONE}, [BENCHMARK_SBCPU_QUAD] = - {N_("#SysBench CPU (Four threads)"), "processor.png", callback_benchmark_sbcpu_quad, scan_benchmark_sbcpu_quad, MODULE_FLAG_NONE}, + {N_("#SysBench CPU (Four threads)"), "processor.png", callback_benchmark_sbcpu_quad, scan_benchmark_sbcpu_quad, MODULE_FLAG_HIDE}, [BENCHMARK_MEMORY_SINGLE] = - {N_("#SysBench Memory (Single-thread)"), "memory.png", callback_benchmark_memory_single, scan_benchmark_memory_single, MODULE_FLAG_NONE}, + {N_("#SysBench Memory (Single-thread)"), "memory.png", callback_benchmark_memory_single, scan_benchmark_memory_single, MODULE_FLAG_HIDE}, [BENCHMARK_MEMORY_DUAL] = - {N_("#SysBench Memory (Two threads)"), "memory.png", callback_benchmark_memory_dual, scan_benchmark_memory_dual, MODULE_FLAG_NONE}, + {N_("#SysBench Memory (Two threads)"), "memory.png", callback_benchmark_memory_dual, scan_benchmark_memory_dual, MODULE_FLAG_HIDE}, [BENCHMARK_MEMORY_QUAD] = {N_("SysBench Memory"), "memory.png", callback_benchmark_memory_quad, scan_benchmark_memory_quad, MODULE_FLAG_NONE}, #if !GTK_CHECK_VERSION(3,0,0) [BENCHMARK_GUI] = - {N_("GPU Drawing"), "module.png", callback_gui, scan_gui, MODULE_FLAG_NO_REMOTE}, + {N_("GPU Drawing"), "module.png", callback_gui, scan_gui, MODULE_FLAG_NO_REMOTE | MODULE_FLAG_HIDE}, #else [BENCHMARK_GUI] = { "#" }, #endif diff --git a/modules/devices.c b/modules/devices.c index 14b3708c..a13213ba 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -110,7 +110,7 @@ static ModuleEntry entries[] = { [ENTRY_DMI] = {N_("System DMI"), "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, [ENTRY_DMI_MEM] = {N_("Memory Devices"), "memory.png", callback_dmi_mem, scan_dmi_mem, MODULE_FLAG_NONE}, #if defined(ARCH_x86) || defined(ARCH_x86_64) - [ENTRY_DTREE] = {"#"}, + [ENTRY_DTREE] = {N_("Device Tree"), "devices.png", callback_dtree, scan_dtree, MODULE_FLAG_HIDE}, #else [ENTRY_DTREE] = {N_("Device Tree"), "devices.png", callback_dtree, scan_dtree, MODULE_FLAG_NONE}, #endif /* x86 or x86_64 */ -- cgit v1.2.3