mirror of https://github.com/MidnightCommander/mc
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:
commit
7bb0b519f4
|
@ -111,8 +111,6 @@
|
||||||
editframe = gray;
|
editframe = gray;
|
||||||
editframeactive = lightgray;
|
editframeactive = lightgray;
|
||||||
editframedrag = red;
|
editframedrag = red;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;black
|
_default_ = lightgray;black
|
||||||
|
@ -149,3 +147,6 @@
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -111,8 +111,6 @@
|
||||||
editframe = gray;
|
editframe = gray;
|
||||||
editframeactive = lightgray;
|
editframeactive = lightgray;
|
||||||
editframedrag = white;
|
editframedrag = white;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ×
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;black
|
_default_ = lightgray;black
|
||||||
|
@ -148,3 +146,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ×
|
||||||
|
|
|
@ -111,8 +111,6 @@
|
||||||
# editframe = lightgray;
|
# editframe = lightgray;
|
||||||
editframeactive = white;
|
editframeactive = white;
|
||||||
editframedrag = green;
|
editframedrag = green;
|
||||||
window-state-char = *
|
|
||||||
window-close-char = X
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;blue
|
_default_ = lightgray;blue
|
||||||
|
@ -135,3 +133,7 @@
|
||||||
[widget-panel]
|
[widget-panel]
|
||||||
filename-scroll-left-char = {
|
filename-scroll-left-char = {
|
||||||
filename-scroll-right-char = }
|
filename-scroll-right-char = }
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -111,8 +111,6 @@
|
||||||
# editframe =
|
# editframe =
|
||||||
editframeactive = white;
|
editframeactive = white;
|
||||||
editframedrag = green;
|
editframedrag = green;
|
||||||
window-state-char = *
|
|
||||||
window-close-char = X
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;blue
|
_default_ = lightgray;blue
|
||||||
|
@ -135,3 +133,7 @@
|
||||||
[widget-panel]
|
[widget-panel]
|
||||||
filename-scroll-left-char = {
|
filename-scroll-left-char = {
|
||||||
filename-scroll-right-char = }
|
filename-scroll-right-char = }
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -113,8 +113,6 @@
|
||||||
# editframe =
|
# editframe =
|
||||||
editframeactive = lightgray;
|
editframeactive = lightgray;
|
||||||
editframedrag = cyan;
|
editframedrag = cyan;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;blue
|
_default_ = lightgray;blue
|
||||||
|
@ -154,3 +152,6 @@
|
||||||
rightmiddle = ┤
|
rightmiddle = ┤
|
||||||
cross = ┼
|
cross = ┼
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -108,8 +108,6 @@
|
||||||
# editframe =
|
# editframe =
|
||||||
editframeactive = white;
|
editframeactive = white;
|
||||||
editframedrag = green;
|
editframedrag = green;
|
||||||
window-state-char = *
|
|
||||||
window-close-char = X
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;black
|
_default_ = lightgray;black
|
||||||
|
@ -129,3 +127,7 @@
|
||||||
[widget-panel]
|
[widget-panel]
|
||||||
filename-scroll-left-char = {
|
filename-scroll-left-char = {
|
||||||
filename-scroll-right-char = }
|
filename-scroll-right-char = }
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -118,8 +118,6 @@
|
||||||
editframe = main2;
|
editframe = main2;
|
||||||
editframeactive = black;
|
editframeactive = black;
|
||||||
editframedrag = rgb400;
|
editframedrag = rgb400;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = black;bgmain
|
_default_ = black;bgmain
|
||||||
|
@ -157,3 +155,7 @@
|
||||||
last-horiz-char = ▸
|
last-horiz-char = ▸
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -118,8 +118,6 @@
|
||||||
editframe = main2;
|
editframe = main2;
|
||||||
editframeactive = black;
|
editframeactive = black;
|
||||||
editframedrag = rgb400;
|
editframedrag = rgb400;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = black;bgmain
|
_default_ = black;bgmain
|
||||||
|
@ -157,3 +155,7 @@
|
||||||
last-horiz-char = ▸
|
last-horiz-char = ▸
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -102,8 +102,6 @@
|
||||||
# editframe =
|
# editframe =
|
||||||
editframeactive = lightgray;
|
editframeactive = lightgray;
|
||||||
editframedrag = cyan;
|
editframedrag = cyan;
|
||||||
window-state-char = *
|
|
||||||
window-close-char = X
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;blue
|
_default_ = lightgray;blue
|
||||||
|
@ -126,3 +124,7 @@
|
||||||
[widget-panel]
|
[widget-panel]
|
||||||
filename-scroll-left-char = {
|
filename-scroll-left-char = {
|
||||||
filename-scroll-right-char = }
|
filename-scroll-right-char = }
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -182,3 +182,7 @@
|
||||||
last-horiz-char = »
|
last-horiz-char = »
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = *
|
||||||
|
window-close-char = X
|
||||||
|
|
|
@ -111,8 +111,6 @@
|
||||||
editframe = gray;
|
editframe = gray;
|
||||||
editframeactive = lightgray;
|
editframeactive = lightgray;
|
||||||
editframedrag = brightblue;
|
editframedrag = brightblue;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = lightgray;black
|
_default_ = lightgray;black
|
||||||
|
@ -141,3 +139,6 @@
|
||||||
filename-scroll-left-char = «
|
filename-scroll-left-char = «
|
||||||
filename-scroll-right-char = »
|
filename-scroll-right-char = »
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -168,8 +168,6 @@
|
||||||
editframe = rgb530;
|
editframe = rgb530;
|
||||||
editframeactive = black;
|
editframeactive = black;
|
||||||
editframedrag = rgb400;
|
editframedrag = rgb400;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = black;rgb554
|
_default_ = black;rgb554
|
||||||
|
@ -207,3 +205,6 @@
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -153,8 +153,6 @@
|
||||||
editframe = color244;
|
editframe = color244;
|
||||||
editframeactive = color250;
|
editframeactive = color250;
|
||||||
editframedrag = color73;
|
editframedrag = color73;
|
||||||
window-state-char = ↕
|
|
||||||
window-close-char = ✕
|
|
||||||
|
|
||||||
[viewer]
|
[viewer]
|
||||||
_default_ = color250;color234
|
_default_ = color250;color234
|
||||||
|
@ -191,3 +189,6 @@
|
||||||
current-char = ■
|
current-char = ■
|
||||||
background-char = ▒
|
background-char = ▒
|
||||||
|
|
||||||
|
[widget-editor]
|
||||||
|
window-state-char = ↕
|
||||||
|
window-close-char = ✕
|
||||||
|
|
|
@ -97,8 +97,8 @@ edit_dlg_init (void)
|
||||||
{
|
{
|
||||||
if (edit_dlg_init_refcounter == 0)
|
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
|
#ifdef HAVE_ASPELL
|
||||||
aspell_init ();
|
aspell_init ();
|
||||||
|
|
Loading…
Reference in New Issue