diff --git a/lib/skin.h b/lib/skin.h index e7f2efd29..904266bfe 100644 --- a/lib/skin.h +++ b/lib/skin.h @@ -104,10 +104,9 @@ #define DFF_CHH_COLOR mc_skin_color__cache[61] #define DFF_CHD_COLOR mc_skin_color__cache[62] #define DFF_DEL_COLOR mc_skin_color__cache[63] -#define DFF_FOLDER_COLOR mc_skin_color__cache[64] -#define DFF_ERROR_COLOR mc_skin_color__cache[65] +#define DFF_ERROR_COLOR mc_skin_color__cache[64] -#define MC_SKIN_COLOR_CACHE_COUNT 66 +#define MC_SKIN_COLOR_CACHE_COUNT 65 /*** enums ***************************************************************************************/ diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 1f6219e67..7ca9d4742 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -256,7 +256,6 @@ mc_skin_color_cache_init (void) DFF_CHH_COLOR = mc_skin_color_get ("diffviewer", "changednew"); DFF_CHD_COLOR = mc_skin_color_get ("diffviewer", "changed"); DFF_DEL_COLOR = mc_skin_color_get ("diffviewer", "removed"); - DFF_FOLDER_COLOR = mc_skin_color_get ("diffviewer", "folder"); DFF_ERROR_COLOR = mc_skin_color_get ("diffviewer", "error"); } diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index 07db09348..f586b84c8 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -125,7 +125,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index 68bb6b5fa..1f05f6b57 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -125,7 +125,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red; [widget-common] diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 8a99567e8..117b4dbb0 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -125,7 +125,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 26b20fce1..7a2f7c91f 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -125,7 +125,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index b6aa4725c..b986f6efe 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -127,7 +127,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index c1ed9b9b3..c0aa35b88 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -123,7 +123,6 @@ changednew = yellow; changed = ;brown removed = ;blue - folder = brightblue; error = white;red [widget-panel] diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index 6c79c0e33..ed8053579 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -116,7 +116,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index edc860bfb..87c30786f 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -160,7 +160,6 @@ changed = color15;color6 added = color0;color7 removed = color8;color0 - folder = color11;color0;bold error = color15;color1 [widget-common] diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index bab113c28..468602cd0 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -160,7 +160,6 @@ changed = color15;color6 added = color0;color7 removed = color8;color0 - folder = color11;color0;bold error = color15;color1 [widget-common] diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 18d40e366..749c875f3 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -160,7 +160,6 @@ changed = color15;color3 added = color0;color7 removed = color8;color0 - folder = color11;color0;bold error = color15;color1 [widget-common] diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index c0ee27a19..b507988e7 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -160,7 +160,6 @@ changed = color15;color3 added = color0;color7 removed = color8;color0 - folder = color11;color0;bold error = color15;color1 [widget-common] diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index 3d452d67b..48791e9cd 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -160,7 +160,6 @@ changed = color231;color39 added = color232;color81 removed = ;color234 - folder = color232;color185 error = color231;color160 [widget-common] diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index bc10144b9..7176f0f65 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -160,7 +160,6 @@ changed = color231;color39 added = color232;color81 removed = ;color235 - folder = color232;color185 error = color231;color160 [widget-common] diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index c0d6d9488..da550243a 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -160,7 +160,6 @@ changed = color231;color96 added = color232;color218 removed = ;color234 - folder = color232;color185 error = color231;color160 [widget-common] diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index 3168c2e7c..ba36eca0b 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -160,7 +160,6 @@ changed = color231;color96 added = color232;color218 removed = ;color235 - folder = color232;color185 error = color231;color160 [widget-common] diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 57ef2abe6..22a60fa8a 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -125,7 +125,6 @@ changednew = red;cyan changed = white;cyan removed = white;red - folder = blue;black error = red;lightgray [widget-common] diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index f0b30827e..456f7c80e 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -176,7 +176,6 @@ changednew = rgb400;rgb553 changed = ;rgb553 removed = ;rgb511 - folder = ;rgb530 error = rgb554;rgb320 [widget-common] diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index 31209bb8c..656f996a2 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -162,12 +162,9 @@ [diffviewer] changedline = ;color60 changednew = black;color174 - added = black;color181 changed = black;color151 removed = ;color235 - - folder = ;color60 error = rgb554;rgb320 [widget-common]