Merge branch '3710_parse_window_state_char'

* 3710_parse_window_state_char:
  Ticket #3710: don't parse "window-state-char" and "window-close-char" as colors.

misc/skins/dark.ini

@@ -111,8 +111,6 @@
     editframe = gray;
     editframeactive = lightgray;
     editframedrag = red;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = lightgray;black
@@ -149,3 +147,6 @@
     current-char = ■
     background-char = ▒
 
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/darkfar.ini

@@ -111,8 +111,6 @@
     editframe = gray;
     editframeactive = lightgray;
     editframedrag = white;
-    window-state-char = ↕
-    window-close-char = ×
 
 [viewer]
     _default_ = lightgray;black
@@ -148,3 +146,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ×

misc/skins/default.ini

@@ -111,8 +111,6 @@
 #    editframe = lightgray;
     editframeactive = white;
     editframedrag = green;
-    window-state-char = *
-    window-close-char = X
 
 [viewer]
     _default_ = lightgray;blue
@@ -135,3 +133,7 @@
 [widget-panel]
     filename-scroll-left-char = {
     filename-scroll-right-char = }
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/double-lines.ini

@@ -111,8 +111,6 @@
 #    editframe =
     editframeactive = white;
     editframedrag = green;
-    window-state-char = *
-    window-close-char = X
 
 [viewer]
     _default_ = lightgray;blue
@@ -135,3 +133,7 @@
 [widget-panel]
     filename-scroll-left-char = {
     filename-scroll-right-char = }
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/featured.ini

@@ -113,8 +113,6 @@
 #    editframe =
     editframeactive = lightgray;
     editframedrag = cyan;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = lightgray;blue
@@ -154,3 +152,6 @@
     rightmiddle = ┤
     cross = ┼
 
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/gotar.ini

@@ -108,8 +108,6 @@
 #    editframe =
     editframeactive = white;
     editframedrag = green;
-    window-state-char = *
-    window-close-char = X
 
 [viewer]
     _default_ = lightgray;black
@@ -129,3 +127,7 @@
 [widget-panel]
     filename-scroll-left-char = {
     filename-scroll-right-char = }
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/gray-green-purple256.ini

@@ -118,8 +118,6 @@
     editframe = main2;
     editframeactive = black;
     editframedrag = rgb400;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = black;bgmain
@@ -157,3 +155,7 @@
     last-horiz-char = ▸
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/gray-orange-blue256.ini

@@ -118,8 +118,6 @@
     editframe = main2;
     editframeactive = black;
     editframedrag = rgb400;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = black;bgmain
@@ -157,3 +155,7 @@
     last-horiz-char = ▸
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/mc46.ini

@@ -102,8 +102,6 @@
 #    editframe =
     editframeactive = lightgray;
     editframedrag = cyan;
-    window-state-char = *
-    window-close-char = X
 
 [viewer]
     _default_ = lightgray;blue
@@ -126,3 +124,7 @@
 [widget-panel]
     filename-scroll-left-char = {
     filename-scroll-right-char = }
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarcon16-defbg.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarcon16.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarcon16root-defbg.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarcon16root.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarin256-defbg.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarin256.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarin256root-defbg.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/modarin256root.ini

@@ -182,3 +182,7 @@
     last-horiz-char = »
     current-char = ■
     background-char = ▒
+
+[widget-editor]
+    window-state-char = *
+    window-close-char = X

misc/skins/nicedark.ini

@@ -111,8 +111,6 @@
     editframe = gray;
     editframeactive = lightgray;
     editframedrag = brightblue;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = lightgray;black
@@ -141,3 +139,6 @@
     filename-scroll-left-char = «
     filename-scroll-right-char = »
 
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/sand256.ini

@@ -168,8 +168,6 @@
     editframe = rgb530;
     editframeactive = black;
     editframedrag = rgb400;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = black;rgb554
@@ -207,3 +205,6 @@
     current-char = ■
     background-char = ▒
 
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

misc/skins/xoria256.ini

@@ -153,8 +153,6 @@
     editframe = color244;
     editframeactive = color250;
     editframedrag = color73;
-    window-state-char = ↕
-    window-close-char = ✕
 
 [viewer]
     _default_ = color250;color234
@@ -191,3 +189,6 @@
     current-char = ■
     background-char = ▒
 
+[widget-editor]
+    window-state-char = ↕
+    window-close-char = ✕

src/editor/editwidget.c

@@ -97,8 +97,8 @@ edit_dlg_init (void)
 {
     if (edit_dlg_init_refcounter == 0)
     {
-        edit_window_state_char = mc_skin_get ("editor", "window-state-char", "*");
+        edit_window_state_char = mc_skin_get ("widget-editor", "window-state-char", "*");
-        edit_window_close_char = mc_skin_get ("editor", "window-close-char", "X");
+        edit_window_close_char = mc_skin_get ("widget-editor", "window-close-char", "X");
 
 #ifdef HAVE_ASPELL
         aspell_init ();