diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in index 7870206d8..b92b734a6 100644 --- a/doc/man/es/mc.1.in +++ b/doc/man/es/mc.1.in @@ -103,7 +103,7 @@ como un alias para el correspondiente guión de shell. .I \-s, \-\-slow Activa el modo para terminales lentos. En este modo el programa no dibuja bordes con líneas de caracteres y desactiva el modo detallado. -Si no se rellena la sección [Lines] el marco pseudo\-gráfico estará +Si no se rellena la sección [lines] el marco pseudo\-gráfico estará formado por espacios; en caso contrario el marco se contruye con caracteres de texto según los parámetros siguientes: .TP @@ -3723,14 +3723,14 @@ Colores\&. .\"NODE " Skins lines" .SH " Trazado de líneas" Trazos de líneas de la sección -.B [Lines] +.B [lines] del archivo de skins. Por defecto se utilizan líneas sencillas, pero se pueden redefinir empleando cualquier símbolo utf\-8 (por ejemplo, líneas dobles). .PP Descripción de parámetros de la sección -.BR [Lines] : +.BR [lines] : .TP .I lefttop esquina superior izquierda. diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 49eca6279..6f0467646 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -4396,13 +4396,13 @@ menuhotsel=yellow;black;bold+underline .\"NODE " Skins lines" .SH " Линии для отрисовки рамок" Линии задаются в секции -.B [Lines] +.B [lines] в скин\-файле. По умолчанию используются одинарные линии, но возможно переназначить на использование любых utf\-8 символов, похожих на линии .PP Описание параметров секции -.BR [Lines] : +.BR [lines] : .TP .I lefttop изображение левого верхнего угла рамки diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in index c64104362..27026b7ce 100644 --- a/doc/man/sr/mc.1.in +++ b/doc/man/sr/mc.1.in @@ -3810,13 +3810,13 @@ menuhotsel=yellow;black;bold+underline .\"NODE " Skins lines" .SH " Линије за исцртавање" Линије се подешавају у одељку -.B [Lines] +.B [lines] датотеке скина. Подразумевано, користе се једноструке линије, али можете поставити да се користе било који utf\-8 симболи (на пример, линије). .PP Описи параметара -.BR [Lines] : +.BR [lines] : .TP .I lefttop горњи леви фрагмент линије. diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c index ef720dea3..66223a6f3 100644 --- a/lib/skin/hc-skins.c +++ b/lib/skin/hc-skins.c @@ -33,7 +33,7 @@ /*** file scope macro definitions ****************************************************************/ -#define set_lines(x, y) mc_config_set_string (mc_skin->config, "Lines", x, y) +#define set_lines(x, y) mc_config_set_string (mc_skin->config, "lines", x, y) /*** file scope type declarations ****************************************************************/ diff --git a/lib/skin/lines.c b/lib/skin/lines.c index e064022e0..35947b529 100644 --- a/lib/skin/lines.c +++ b/lib/skin/lines.c @@ -91,7 +91,12 @@ skin_get_char (mc_skin_t *mc_skin, const char *name, gunichar def, mc_tty_char_t estr_t conv_res; char *value_utf8; - value_utf8 = mc_config_get_string_raw (mc_skin->config, "Lines", name, NULL); + value_utf8 = mc_config_get_string_raw (mc_skin->config, "lines", name, NULL); + if (value_utf8 == NULL) + { + // it was called "Lines" (uppercase L) in mc <= 4.8.33, accept that for compatibility + value_utf8 = mc_config_get_string_raw (mc_skin->config, "Lines", name, NULL); + } if (value_utf8 != NULL) { c = g_utf8_get_char_validated (value_utf8, -1); diff --git a/misc/skins/README.txt b/misc/skins/README.txt index 9c7e57eb4..d1f0462e5 100644 --- a/misc/skins/README.txt +++ b/misc/skins/README.txt @@ -320,7 +320,7 @@ Character sections The following keys define characters to be shown at various positions on the display. The characters in the skin files need to be encoded in UTF-8. - [Lines] + [lines] Frame characters used all throughout mc. horiz diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index 4fb4c473d..b70ed5d40 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -1,7 +1,7 @@ [skin] description = Dark skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index ae50dd648..9e87f8bbf 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -1,7 +1,7 @@ [skin] description = Dark Far skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 0f0cb7d18..635c46916 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -1,7 +1,7 @@ [skin] description = Standard skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 0b81b838a..4705584ed 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -1,7 +1,7 @@ [skin] description = Far-like skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini index d66992115..520c751f8 100644 --- a/misc/skins/featured-plus.ini +++ b/misc/skins/featured-plus.ini @@ -1,7 +1,7 @@ [skin] description = Enhanced standard skin with alternative directory and file select/mark colors -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index c663cc255..25a3f13ed 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -1,7 +1,7 @@ [skin] description = Enhanced standard skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index ee1449384..5f979b322 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -1,7 +1,7 @@ [skin] description = GoTaR @PLD Linux -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index f2b034773..4fda66a55 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -2,7 +2,7 @@ description = Gray-Green-Purple Skin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index 600c32c38..d30bdfa92 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -2,7 +2,7 @@ description = Gray-Orange-Blue Skin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini index c85473d98..c41b65cc2 100644 --- a/misc/skins/julia256.ini +++ b/misc/skins/julia256.ini @@ -4,7 +4,7 @@ description = Dark skin with calm colors and good contrast 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/julia256root.ini b/misc/skins/julia256root.ini index f87854c39..15141d5b6 100644 --- a/misc/skins/julia256root.ini +++ b/misc/skins/julia256root.ini @@ -4,7 +4,7 @@ description = Dark skin with calm colors and good contrast (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index b0ecc7f2e..d76089d17 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -1,7 +1,7 @@ [skin] description = mc-4.6 skin -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-defbg-thin.ini b/misc/skins/modarcon16-defbg-thin.ini index 183732736..1a54c9a00 100644 --- a/misc/skins/modarcon16-defbg-thin.ini +++ b/misc/skins/modarcon16-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16-DefaultBG (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index 31f23fec6..d21ee6142 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -43,7 +43,7 @@ description = MoDarCon16-DefaultBG (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16-thin.ini b/misc/skins/modarcon16-thin.ini index 241552556..5eb93e084 100644 --- a/misc/skins/modarcon16-thin.ini +++ b/misc/skins/modarcon16-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16 (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index 307c44aec..782d5f929 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -43,7 +43,7 @@ description = MoDarCon16 (user) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-defbg-thin.ini b/misc/skins/modarcon16root-defbg-thin.ini index fbbdfd7f2..3ad88af4f 100644 --- a/misc/skins/modarcon16root-defbg-thin.ini +++ b/misc/skins/modarcon16root-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16root-DefaultBG (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 62a67f1f6..4fc5eb88a 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -43,7 +43,7 @@ description = MoDarCon16root-DefaultBG (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root-thin.ini b/misc/skins/modarcon16root-thin.ini index 25cf51fab..1eabe8af9 100644 --- a/misc/skins/modarcon16root-thin.ini +++ b/misc/skins/modarcon16root-thin.ini @@ -43,7 +43,7 @@ description = MoDarCon16root (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index 1208a12b5..a588a6748 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -43,7 +43,7 @@ description = MoDarCon16root (root) 256colors = false -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-defbg-thin.ini b/misc/skins/modarin256-defbg-thin.ini index ab117661e..4e9d78776 100644 --- a/misc/skins/modarin256-defbg-thin.ini +++ b/misc/skins/modarin256-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256-DefaultBG (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index 51645d1a7..2cfd41431 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -43,7 +43,7 @@ description = MoDarIn256-DefaultBG (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256-thin.ini b/misc/skins/modarin256-thin.ini index 3aad78afc..3729276d6 100644 --- a/misc/skins/modarin256-thin.ini +++ b/misc/skins/modarin256-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256 (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index 28b17eb28..69394706c 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -43,7 +43,7 @@ description = MoDarIn256 (user) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-defbg-thin.ini b/misc/skins/modarin256root-defbg-thin.ini index 15631a919..9f745df53 100644 --- a/misc/skins/modarin256root-defbg-thin.ini +++ b/misc/skins/modarin256root-defbg-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256root-DefaultBG (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index 4ed0abaa5..f06b4c557 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -43,7 +43,7 @@ description = MoDarIn256root-DefaultBG (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root-thin.ini b/misc/skins/modarin256root-thin.ini index f686b47c9..66c71b169 100644 --- a/misc/skins/modarin256root-thin.ini +++ b/misc/skins/modarin256root-thin.ini @@ -43,7 +43,7 @@ description = MoDarIn256root (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index 87aeef175..3ffdd5c8b 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -43,7 +43,7 @@ description = MoDarIn256root (root) 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 032833ce4..0f18c5aab 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -1,7 +1,7 @@ [skin] description = Nice and Dark -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index f38a496e2..0930ace00 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -2,7 +2,7 @@ description = Sand skin using 256 colors 256colors = true -[Lines] +[lines] horiz = ╌ vert = ┆ lefttop = ╭ diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index aa4f3b602..2eccaa3ae 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Autumn truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index 33be9c450..44b79582e 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Spring truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index 593afebec..0192d18ba 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Summer truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index d12d8e9b8..b5a7f203d 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -6,7 +6,7 @@ description = Four Seasons – Winter truecolors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256-thin.ini b/misc/skins/xoria256-thin.ini index 8e30f2a24..6808c3971 100644 --- a/misc/skins/xoria256-thin.ini +++ b/misc/skins/xoria256-thin.ini @@ -11,7 +11,7 @@ description = Xoria256-Thin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index a52915042..fab80ed6a 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -11,7 +11,7 @@ description = Xoria256 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/xoria256root-thin.ini b/misc/skins/xoria256root-thin.ini index b1fb66cba..fedd67b9d 100644 --- a/misc/skins/xoria256root-thin.ini +++ b/misc/skins/xoria256root-thin.ini @@ -11,7 +11,7 @@ description = Xoria256root-Thin 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini index ad4bb455d..01b4cd7fd 100644 --- a/misc/skins/yadt256-defbg.ini +++ b/misc/skins/yadt256-defbg.ini @@ -10,7 +10,7 @@ description = Yet Another Dark Theme, 256 colors, default background 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌ diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini index a3d2c22fe..0d99e4a2c 100644 --- a/misc/skins/yadt256.ini +++ b/misc/skins/yadt256.ini @@ -9,7 +9,7 @@ description = Yet Another Dark Theme, 256 colors, black background 256colors = true -[Lines] +[lines] horiz = ─ vert = │ lefttop = ┌