diff --git a/gdashboard.c b/gdashboard.c index 8aa38bfb2d..5395243a52 100644 --- a/gdashboard.c +++ b/gdashboard.c @@ -405,10 +405,10 @@ render_bars (WINDOW * win, GDashModule * module_data, int y, int *x, int idx, bar = get_bars (module_data->data[idx].hits, module_data->max_hits, *x); if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); mvwhline (win, y, *x, ' ', w); @@ -436,10 +436,10 @@ render_data (WINDOW * win, GDashModule * module_data, int y, int *x, int idx, convert_date (buf, data, "%Y%m%d", "%d/%b/%Y", DATE_LEN); if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); if (module_data->module == HOSTS && module_data->data[idx].is_subitem) @@ -472,10 +472,10 @@ render_bandwidth (WINDOW * win, GDashModule * module_data, int y, int *x, return; if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); mvwhline (win, y, *x, ' ', w); @@ -504,10 +504,10 @@ render_usecs (WINDOW * win, GDashModule * module_data, int y, int *x, return; if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); mvwhline (win, y, *x, ' ', w); @@ -540,10 +540,10 @@ render_percent (WINDOW * win, GDashModule * module_data, int y, int *x, int idx, max_hit = 1; if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); mvwhline (win, y, *x, ' ', w); @@ -580,10 +580,10 @@ render_hits (WINDOW * win, GDashModule * module_data, int y, int *x, int idx, goto inc; if (selected) { - if (conf.color_scheme == MONOCHROME) - init_pair (1, COLOR_BLACK, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (1, COLOR_BLACK, COLOR_GREEN); + else + init_pair (1, COLOR_BLACK, COLOR_WHITE); wattron (win, COLOR_PAIR (HIGHLIGHT)); mvwhline (win, y, 0, ' ', w); diff --git a/gmenu.c b/gmenu.c index 166cbebbb5..c65aa8b024 100644 --- a/gmenu.c +++ b/gmenu.c @@ -119,12 +119,12 @@ void draw_menu_item (GMenu * menu, char *s, int x, int y, int w, int color, int checked) { - if (conf.color_scheme == MONOCHROME) { - init_pair (1, COLOR_BLACK, COLOR_WHITE); - init_pair (2, COLOR_WHITE, -1); - } else { + if (conf.color_scheme == STD_GREEN) { init_pair (1, COLOR_BLACK, COLOR_GREEN); init_pair (2, COLOR_BLACK, COLOR_CYAN); + } else { + init_pair (1, COLOR_BLACK, COLOR_WHITE); + init_pair (2, COLOR_WHITE, -1); } wattron (menu->win, COLOR_PAIR (color)); mvwhline (menu->win, y, x, ' ', w); diff --git a/ui.c b/ui.c index c5245bbddf..7602f98640 100644 --- a/ui.c +++ b/ui.c @@ -88,20 +88,20 @@ init_colors () use_default_colors (); init_pair (COL_BLUE, COLOR_BLUE, -1); - if (conf.color_scheme == MONOCHROME) - init_pair (COL_GREEN, COLOR_WHITE, -1); - else + if (conf.color_scheme == STD_GREEN) init_pair (COL_GREEN, COLOR_GREEN, -1); + else + init_pair (COL_GREEN, COLOR_WHITE, -1); init_pair (COL_RED, COLOR_RED, -1); init_pair (COL_BLACK, COLOR_BLACK, -1); init_pair (COL_CYAN, COLOR_CYAN, -1); init_pair (COL_YELLOW, COLOR_YELLOW, -1); - if (conf.color_scheme == MONOCHROME) - init_pair (BLUE_GREEN, COLOR_BLUE, COLOR_WHITE); - else + if (conf.color_scheme == STD_GREEN) init_pair (BLUE_GREEN, COLOR_BLUE, COLOR_GREEN); + else + init_pair (BLUE_GREEN, COLOR_BLUE, COLOR_WHITE); init_pair (BLACK_GREEN, COLOR_BLACK, COLOR_GREEN); init_pair (BLACK_CYAN, COLOR_BLACK, COLOR_CYAN); @@ -145,12 +145,12 @@ draw_header (WINDOW * win, char *header, int x, int y, int w, int color) char buf[256]; snprintf (buf, sizeof buf, "%s%s", " ", header); - if (conf.color_scheme == MONOCHROME) { - init_pair (1, COLOR_BLACK, COLOR_WHITE); - init_pair (2, COLOR_WHITE, -1); - } else { + if (conf.color_scheme == STD_GREEN) { init_pair (1, COLOR_BLACK, COLOR_GREEN); init_pair (2, COLOR_BLACK, COLOR_CYAN); + } else { + init_pair (1, COLOR_BLACK, COLOR_WHITE); + init_pair (2, COLOR_WHITE, -1); } wattron (win, COLOR_PAIR (color)); mvwhline (win, y, x, ' ', w); @@ -849,10 +849,10 @@ verify_format (GLog * logger, GSpinner * spinner) static void scheme_chosen (char *name) { - if (strcmp ("Monochrome/Default", name) == 0) - conf.color_scheme = MONOCHROME; - else + if (strcmp ("Green/Original", name) == 0) conf.color_scheme = STD_GREEN; + else + conf.color_scheme = MONOCHROME; init_colors (); }