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.
This commit is contained in:
Andrew Borodin 2016-12-04 10:02:12 +03:00
commit 7bb0b519f4
21 changed files with 77 additions and 26 deletions

View File

@ -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 =

View File

@ -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 = ×

View File

@ -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

View File

@ -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

View File

@ -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 =

View File

@ -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

View File

@ -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 =

View File

@ -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 =

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 =

View File

@ -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 =

View File

@ -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 =

View File

@ -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_close_char = mc_skin_get ("editor", "window-close-char", "X");
edit_window_state_char = mc_skin_get ("widget-editor", "window-state-char", "*");
edit_window_close_char = mc_skin_get ("widget-editor", "window-close-char", "X");
#ifdef HAVE_ASPELL
aspell_init ();