mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-07 10:54:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '380_bw_colors_and_frames'

Browse Source 
* 380_bw_colors_and_frames:
  misc/skins/Makefile.am: Add skin files into EXTRA_DIST list.
  Trinvial refactoring: changed order of color definitions.
  Modified color of dialog hotkeys.
  Fixed menu colors for BW mode.
  Ticket #380: fix of menu colors in BW mode and pseudo-graphics symbols.
This commit is contained in:
Slava Zanko 2009-09-22 16:28:10 +03:00
commit dec8a5d26e
6 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/skins/Makefile.am
View File

@ -4,3 +4,5 @@ skin_DATA = \
default.ini \
double-lines.ini
EXTRA_DIST = \
$(skin_DATA)

1
misc/skins/default.ini
View File

@ -55,7 +55,6 @@
[menu]
_default_=white;cyan
entry=white;cyan
menuhot=yellow;cyan
menusel=white;black
menuhotsel=yellow;black

1
misc/skins/double-lines.ini
View File

@ -55,7 +55,6 @@
[menu]
_default_=white;cyan
entry=white;cyan
menuhot=yellow;cyan
menusel=white;black
menuhotsel=yellow;black

16
src/skin/colors-old.c
View File

@ -52,34 +52,34 @@ typedef struct mc_skin_colors_old_struct {
mc_skin_colors_old_t old_colors[] = {
{"normal", "core", "_default_"},
{"selected", "ore", "selected"},
{"marked", "core", "marked"},
{"selected", "core", "selected"},
{"markselect", "core", "markselect"},
{"errors", "error", "_default_"},
{"menu", "menu", "_default_"},
{"reverse", "core", "reverse"},
{"dnormal", "dialog", "_default_"},
{"dfocus", "dialog", "dfocus"},
{"dhotnormal", "dialog", "dhotnormal"},
{"dhotfocus", "dialog", "dhotfocus"},
{"viewunderline", "viewer", "viewunderline"},
{"errors", "error", "_default_"},
{"errdhotnormal", "error", "errdhotnormal"},
{"errdhotfocus", "error", "errdhotfocus"},
{"menu", "menu", "_default_"},
{"menuhot", "menu", "menuhot"},
{"menusel", "menu", "menusel"},
{"menuhotsel", "menu", "menuhotsel"},
{"gauge", "core", "gauge"},
{"input", "core", "input"},
{"helpnormal", "help", "_default_"},
{"helpitalic", "help", "helpitalic"},
{"helpbold", "help", "helpbold"},
{"helplink", "help", "helplink"},
{"helpslink", "help", "helpslink"},
{"gauge", "core", "gauge"},
{"input", "core", "input"},
{"viewunderline", "viewer", "viewunderline"},
{"editnormal", "editor", "_default_"},
{"editbold", "editor", "editbold"},
{"editmarked", "editor", "editmarked"},
{"editwhitespace", "editor", "editwhitespace"},
{"editlinestate", "editor", "linestate"},
{"errdhotnormal", "error", "errdhotnormal"},
{"errdhotfocus", "error", "errdhotfocus"},
{NULL, NULL, NULL}
};

28
src/skin/colors.c
View File

@ -195,40 +195,39 @@ mc_skin_color_cache_init (void)
NORMAL_COLOR = mc_skin_color_get ("core", "_default_");
MARKED_COLOR = mc_skin_color_get ("core", "marked");
SELECTED_COLOR = mc_skin_color_get ("core", "selected");
REVERSE_COLOR = mc_skin_color_get ("core", "reverse");
MARKED_SELECTED_COLOR = mc_skin_color_get ("core", "markselect");
ERROR_COLOR = mc_skin_color_get ("error", "_default_");
MENU_ENTRY_COLOR = mc_skin_color_get ("menu", "_default_");
REVERSE_COLOR = mc_skin_color_get ("core", "reverse");
COLOR_NORMAL = mc_skin_color_get ("dialog", "_default_");
COLOR_FOCUS = mc_skin_color_get ("dialog", "dfocus");
COLOR_HOT_NORMAL = mc_skin_color_get ("dialog", "dhotnormal");
COLOR_HOT_FOCUS = mc_skin_color_get ("dialog", "dhotfocus");
VIEW_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline");
ERROR_COLOR = mc_skin_color_get ("error", "_default_");
ERROR_HOT_NORMAL = mc_skin_color_get ("error", "errdhotnormal");
ERROR_HOT_FOCUS = mc_skin_color_get ("error", "errdhotfocus");
MENU_ENTRY_COLOR = mc_skin_color_get ("menu", "_default_");
MENU_SELECTED_COLOR = mc_skin_color_get ("menu", "menusel");
MENU_HOT_COLOR = mc_skin_color_get ("menu", "menuhot");
MENU_HOTSEL_COLOR = mc_skin_color_get ("menu", "menuhotsel");
GAUGE_COLOR = mc_skin_color_get ("core", "gauge");
INPUT_COLOR = mc_skin_color_get ("core", "input");
HELP_NORMAL_COLOR = mc_skin_color_get ("help", "_default_");
HELP_ITALIC_COLOR = mc_skin_color_get ("help", "helpitalic");
HELP_BOLD_COLOR = mc_skin_color_get ("help", "helpbold");
HELP_LINK_COLOR = mc_skin_color_get ("help", "helplink");
HELP_SLINK_COLOR = mc_skin_color_get ("help", "helpslink");
GAUGE_COLOR = mc_skin_color_get ("core", "gauge");
INPUT_COLOR = mc_skin_color_get ("core", "input");
VIEW_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline");
EDITOR_NORMAL_COLOR = mc_skin_color_get ("editor", "_default_");
EDITOR_BOLD_COLOR = mc_skin_color_get ("editor", "editbold");
EDITOR_MARKED_COLOR = mc_skin_color_get ("editor", "editmarked");
EDITOR_WHITESPACE_COLOR = mc_skin_color_get ("editor", "editwhitespace");
ERROR_HOT_NORMAL = mc_skin_color_get ("error", "errdhotnormal");
ERROR_HOT_FOCUS = mc_skin_color_get ("error", "errdhotfocus");
LINE_STATE_COLOR = mc_skin_color_get ("editor", "linestate");
}
/* --------------------------------------------------------------------------------------------- */
@ -236,11 +235,8 @@ mc_skin_color_cache_init (void)
static gboolean
mc_skin_color_check_inisection (const gchar * group)
{
if ((strcasecmp ("skin", group) == 0)
|| (strcasecmp ("lines", group) == 0))
return FALSE;
return TRUE;
return !((strcasecmp ("skin", group) == 0)
|| (strcasecmp ("lines", group) == 0));
}
/* --------------------------------------------------------------------------------------------- */

25
src/skin/hc-skins.c
View File

@ -58,18 +58,21 @@ mc_skin_hardcoded_blackwhite_colors (mc_skin_t * mc_skin)
mc_config_set_string (mc_skin->config, "core", "markselect", "A_BOLD_REVERSE");
mc_config_set_string (mc_skin->config, "core", "reverse", "A_REVERSE");
mc_config_set_string (mc_skin->config, "dialog", "_default_", "A_REVERSE");
mc_config_set_string (mc_skin->config, "dialog", "focus", "A_BOLD");
mc_config_set_string (mc_skin->config, "menu", "entry", "A_REVERSE");
mc_config_set_string (mc_skin->config, "menu", "selected", "A_BOLD");
mc_config_set_string (mc_skin->config, "help", "_default_", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "italic", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "bold", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "slink", "A_BOLD");
mc_config_set_string (mc_skin->config, "editor", "bold", "A_BOLD");
mc_config_set_string (mc_skin->config, "editor", "marked", "A_REVERSE");
mc_config_set_string (mc_skin->config, "viewer", "underline", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "dialog", "dfocus", "A_BOLD");
mc_config_set_string (mc_skin->config, "dialog", "dhotnormal", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "dialog", "dhotfocus", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "error", "_default_", "A_BOLD");
mc_config_set_string (mc_skin->config, "menu", "_default_", "default");
mc_config_set_string (mc_skin->config, "menu", "menuhot", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "menu", "menusel", "A_REVERSE");
mc_config_set_string (mc_skin->config, "menu", "menuhotsel", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "help", "_default_", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "helpitalic", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "helpbold", "A_REVERSE");
mc_config_set_string (mc_skin->config, "help", "helpslink", "A_BOLD");
mc_config_set_string (mc_skin->config, "viewer", "viewunderline", "A_UNDERLINE");
mc_config_set_string (mc_skin->config, "editor", "editbold", "A_BOLD");
mc_config_set_string (mc_skin->config, "editor", "editmarked", "A_REVERSE");
}
/* --------------------------------------------------------------------------------------------- */