diff options
| -rw-r--r-- | hardinfo/info.c | 6 | ||||
| -rw-r--r-- | includes/info.h | 22 |
2 files changed, 5 insertions, 23 deletions
diff --git a/hardinfo/info.c b/hardinfo/info.c index b9cd8cb9..7e49fd73 100644 --- a/hardinfo/info.c +++ b/hardinfo/info.c @@ -157,10 +157,10 @@ static void flatten_group(GString *output, const struct InfoGroup *group, guint else snprintf(tag, 255, "ITEM%d-%d", group_count, i); - if (*tag != 0 || field.flags) + if (*tag != 0 || field.highlight || field.report_details) g_string_append_printf(output, "$%s%s%s$", - field.flags & INFO_FIELD_SELECTED ? "*" : "", - field.flags & INFO_FIELD_SELECTED ? "!" : "", + field.highlight ? "*" : "", + field.report_details ? "!" : "", tag); g_string_append_printf(output, "%s=%s\n", field.name, field.value); diff --git a/includes/info.h b/includes/info.h index 47e41980..4e86c146 100644 --- a/includes/info.h +++ b/includes/info.h @@ -21,13 +21,6 @@ #include <stdarg.h> #include <glib.h> -enum { - INFO_NONE = 0, - INFO_FIELD_SELECTED = 1, /* '*' */ - INFO_FIELD_REPORT_DETAILS - = 1<<1, /* '!' */ -}; - struct Info { GArray *groups; @@ -58,7 +51,8 @@ struct InfoField { gchar *tag; /* moreinfo() lookup tag */ int update_interval; - unsigned int flags; + gboolean highlight; /* select in GUI, highlight in report (flag:*) */ + gboolean report_details; /* show moreinfo() in report (flag:!) */ gboolean free_value_on_flatten; int magic; @@ -89,18 +83,6 @@ static inline struct InfoField info_field_with_icon(struct InfoField field, cons field.icon = icon; return field; } -static inline struct InfoField info_field_set_flags(struct InfoField field, int flags) -{ - field.flags |= flags; - return field; -} -#define info_field_selected(field, INFO_FIELD_SELECTED); -#define info_field_report_details(field, INFO_FIELD_REPORT_DETAILS); -static inline struct InfoField info_field_with_tag(struct InfoField field, const gchar *tag) -{ - field.tag = g_strdup(tag); - return field; -} void info_set_column_title(struct Info *info, const gchar *column, const gchar *title); void info_set_column_headers_visible(struct Info *info, gboolean setting); |