Browse Source

Ticket #4433: skins: add color for non-printable characters in editor.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 1 year ago
parent
commit
1b3684e0e1
10 changed files with 33 additions and 29 deletions
  1. 2 2
      doc/man/es/mc.1.in
  2. 1 1
      doc/man/hu/mc.1.in
  3. 1 1
      doc/man/it/mc.1.in
  4. 2 2
      doc/man/mc.1.in
  5. 2 2
      doc/man/pl/mc.1.in
  6. 2 1
      doc/man/ru/mc.1.in
  7. 1 1
      doc/man/sr/mc.1.in
  8. 20 19
      lib/skin.h
  9. 1 0
      lib/skin/colors-old.c
  10. 1 0
      lib/skin/colors.c

+ 2 - 2
doc/man/es/mc.1.in

@@ -3405,8 +3405,8 @@ de error: errdfocus, errdhotnormal, errdhotfocus, errdtitle; los colores
 de la ayuda: helpnormal, helpitalic, helpbold, helplink, helpslink,
 helptitle; los colores del visor: viewnormal, viewbold, viewunderline,
 viewselected; loc colores del editor: editnormal, editbold, editmarked,
-editwhitespace, editlinestate; los colores de los menús desplegables:
-pmenunormal, pmenusel, pmenutitle.
+editwhitespace, editnonprintable, editlinestate; los colores de los menús
+desplegables: pmenunormal, pmenusel, pmenutitle.
 .PP
 .I header
 determina el color del encabezado de los paneles, la línea con los

+ 1 - 1
doc/man/hu/mc.1.in

@@ -2869,7 +2869,7 @@ dhotnormal, dhotfocus; Súgó színek: helpnormal, helpitalic, helpbold,
 helplink, helpslink; Fájlnéző színek: viewunderline; Speciális kijelölés
 színei: executable, directory, link, stalelink, device, special, core;
 Viewer colors are: viewnormal, viewbold, viewunderline, viewselected.
-Szerkesztő színei: editnormal, editbold, editmarked.
+Szerkesztő színei: editnormal, editbold, editmarked, editnonprintable.
 .PP
 .I input
 maghatározza a beviteli sorok színét a dialogus ablakora vonatkozóan.

+ 1 - 1
doc/man/it/mc.1.in

@@ -2881,7 +2881,7 @@ Il colore del visualizzatore è: viewunderline.
 Colori speciali di evidenziazione: executable, directory, link, device, 
 special, core.
 I colori dell'viewer sono: viewnormal, viewbold, viewunderline, viewselected.
-I colori dell'editor sono: editnormal, editbold, editmarked.
+I colori dell'editor sono: editnormal, editbold, editmarked, editnonprintable.
 .PP
 .I input 
 determina il colore delle righe di input usate delle finestre di dialogo.

+ 2 - 2
doc/man/mc.1.in

@@ -3513,8 +3513,8 @@ dhotnormal, dhotfocus, dtitle. Error dialog colors are: errdfocus, errdhotnormal
 errdhotfocus, errdtitle.  Help colors are: helpnormal, helpitalic, helpbold,
 helplink, helpslink, helptitle.  Viewer colors are: viewnormal, viewbold,
 viewunderline, viewselected. Editor colors are: editnormal, editbold, editmarked,
-editwhitespace, editlinestate. Popup menu colors are: pmenunormal, pmenusel,
-pmenutitle.
+editwhitespace, editnonprintable, editlinestate. Popup menu colors are: pmenunormal,
+pmenusel, pmenutitle.
 .PP
 .I header
 determines the color of panel header, the line that contains column titles

+ 2 - 2
doc/man/pl/mc.1.in

@@ -2542,8 +2542,8 @@ dhotfocus; Kolory pomocy: helpnormal, helpitalic, helpbold, helplink,
 helpslink; Kolory podglądu: viewunderline; Specjalne tryby podświetlenia:
 executable, directory, link, device, special. Viewer colors are: viewnormal,
 viewbold, viewunderline, viewselected. Editor colors are: editnormal, editbold,
-editmarked, editwhitespace, editlinestate. Popup menu colors are: pmenunormal,
-pmenusel, pmenutitle.
+editmarked, editwhitespace, editnonprintable, editlinestate. Popup menu colors
+are: pmenunormal, pmenusel, pmenutitle.
 [nie tłumaczyłem nazw z racji tego, że trzeba je stosować w ich angielskim
 brzmieniu \- jeśli jesteś aż tak zaawansowany, użyj słownika].
 .PP

+ 2 - 1
doc/man/ru/mc.1.in

@@ -4019,7 +4019,8 @@ bbarhotkey, bbarbutton.
 Цвета в диалоге\-сообщении об ошибке: errdfocus, errdhotnormal, errdhotfocus, errdtitle.
 Цвета в окне встроенной помощи: helpnormal, helpitalic, helpbold, helplink, helpslink.
 Цвета в окне программы просмотра: viewnormal, viewbold, viewunderline, viewselected.
-Цвета в редакторе: editnormal, editbold, editmarked, editwhitespace, editlinestate.
+Цвета в редакторе: editnormal, editbold, editmarked, editwhitespace, editnonprintable,
+editlinestate.
 Цвета окна всплывающего меню: pmenunormal, pmenusel, pmenutitle.
 .PP
 Цвета задавать не обязательно. Цвет какого именно поля определяется

+ 1 - 1
doc/man/sr/mc.1.in

@@ -2865,7 +2865,7 @@ dnormal, dfocus, dhotnormal, dhotfocus. Боје помоћи су: helpnormal,
 helpbold, helplink, helpslink. Боја прегледача је: viewunderline.
 Посебне боје за истицање су: executable, directory, link, stalelink,
 device, special, core. Viewer colors are: viewnormal, viewbold, viewunderline,
-viewselected. Боје уређивача су: editnormal, editbold, editmarked.
+viewselected. Боје уређивача су: editnormal, editbold, editmarked, editnonprintable.
 .PP
 .I input
 одређује боју редова за унос који се користе у дијалозима упита.

+ 20 - 19
lib/skin.h

@@ -87,28 +87,29 @@
  * Last is defined to view color.
  */
 #define EDITOR_NORMAL_COLOR       mc_skin_color__cache[49]
-#define EDITOR_BOLD_COLOR         mc_skin_color__cache[50]
-#define EDITOR_MARKED_COLOR       mc_skin_color__cache[51]
-#define EDITOR_WHITESPACE_COLOR   mc_skin_color__cache[52]
-#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[53]
-#define EDITOR_BACKGROUND         mc_skin_color__cache[54]
-#define EDITOR_FRAME              mc_skin_color__cache[55]
-#define EDITOR_FRAME_ACTIVE       mc_skin_color__cache[56]
-#define EDITOR_FRAME_DRAG         mc_skin_color__cache[57]
+#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[50]
+#define EDITOR_BOLD_COLOR         mc_skin_color__cache[51]
+#define EDITOR_MARKED_COLOR       mc_skin_color__cache[52]
+#define EDITOR_WHITESPACE_COLOR   mc_skin_color__cache[53]
+#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[54]
+#define EDITOR_BACKGROUND         mc_skin_color__cache[55]
+#define EDITOR_FRAME              mc_skin_color__cache[56]
+#define EDITOR_FRAME_ACTIVE       mc_skin_color__cache[57]
+#define EDITOR_FRAME_DRAG         mc_skin_color__cache[58]
 /* color of left 8 char status per line */
-#define LINE_STATE_COLOR          mc_skin_color__cache[58]
-#define BOOK_MARK_COLOR           mc_skin_color__cache[59]
-#define BOOK_MARK_FOUND_COLOR     mc_skin_color__cache[60]
+#define LINE_STATE_COLOR          mc_skin_color__cache[59]
+#define BOOK_MARK_COLOR           mc_skin_color__cache[60]
+#define BOOK_MARK_FOUND_COLOR     mc_skin_color__cache[61]
 
 /* Diff colors */
-#define DFF_ADD_COLOR             mc_skin_color__cache[61]
-#define DFF_CHG_COLOR             mc_skin_color__cache[62]
-#define DFF_CHH_COLOR             mc_skin_color__cache[63]
-#define DFF_CHD_COLOR             mc_skin_color__cache[64]
-#define DFF_DEL_COLOR             mc_skin_color__cache[65]
-#define DFF_ERROR_COLOR           mc_skin_color__cache[66]
-
-#define MC_SKIN_COLOR_CACHE_COUNT 67
+#define DFF_ADD_COLOR             mc_skin_color__cache[62]
+#define DFF_CHG_COLOR             mc_skin_color__cache[63]
+#define DFF_CHH_COLOR             mc_skin_color__cache[64]
+#define DFF_CHD_COLOR             mc_skin_color__cache[65]
+#define DFF_DEL_COLOR             mc_skin_color__cache[66]
+#define DFF_ERROR_COLOR           mc_skin_color__cache[67]
+
+#define MC_SKIN_COLOR_CACHE_COUNT 68
 
 /*** enums ***************************************************************************************/
 

+ 1 - 0
lib/skin/colors-old.c

@@ -69,6 +69,7 @@ static const mc_skin_colors_old_t old_colors[] = {
     {"editframedrag", "editor", "editframedrag"},
     {"editlinestate", "editor", "editlinestate"},
     {"editmarked", "editor", "editmarked"},
+    {"editnonprintable", "editor", "editnonprintable"},
     {"editnormal", "editor", "_default_"},
     {"editwhitespace", "editor", "editwhitespace"},
     {"errdhotfocus", "error", "errdhotfocus"},

+ 1 - 0
lib/skin/colors.c

@@ -302,6 +302,7 @@ mc_skin_color_cache_init (void)
     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");
+    EDITOR_NONPRINTABLE_COLOR = mc_skin_color_get ("editor", "editnonprintable");
     EDITOR_RIGHT_MARGIN_COLOR = mc_skin_color_get ("editor", "editrightmargin");
     LINE_STATE_COLOR = mc_skin_color_get ("editor", "editlinestate");
     EDITOR_BACKGROUND = mc_skin_color_get ("editor", "editbg");

Some files were not shown because too many files changed in this diff