mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-01 00:54:24 +03:00
Build "Layout" dialog in normal order.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin
parent
d514d186dc
commit
ce922ea7df
@ -2,12 +2,13 @@
|
||||
Panel layout module for the Midnight Commander
|
||||
|
||||
Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
||||
2006, 2007, 2009, 2011
|
||||
2006, 2007, 2009, 2011, 2012
|
||||
The Free Software Foundation, Inc.
|
||||
|
||||
Written by:
|
||||
Janne Kukonlehto, 1995
|
||||
Miguel de Icaza, 1995
|
||||
Andrew Borodin <aborodin@vmail.ru>, 2011, 2012
|
||||
|
||||
This file is part of the Midnight Commander.
|
||||
|
||||
@ -119,7 +120,6 @@ int ok_to_refresh = 1;
|
||||
#define B_MINUS (B_USER + 3)
|
||||
|
||||
#define LAYOUT_OPTIONS_COUNT G_N_ELEMENTS (check_options)
|
||||
#define OTHER_OPTIONS_COUNT (LAYOUT_OPTIONS_COUNT - 1)
|
||||
|
||||
/*** file scope type declarations ****************************************************************/
|
||||
|
||||
@ -167,13 +167,13 @@ static struct
|
||||
} check_options[] =
|
||||
{
|
||||
/* *INDENT-OFF* */
|
||||
{ N_("Show free sp&ace"), &free_space, NULL},
|
||||
{ N_("&XTerm window title"), &xterm_title, NULL},
|
||||
{ N_("H&intbar visible"), &mc_global.message_visible, NULL},
|
||||
{ N_("&Keybar visible"), &mc_global.keybar_visible, NULL},
|
||||
{ N_("Command &prompt"), &command_prompt, NULL},
|
||||
{ N_("Menu&bar visible"), &menubar_visible, NULL},
|
||||
{ N_("&Equal split"), &equal_split, NULL}
|
||||
{ N_("&Equal split"), &equal_split, NULL },
|
||||
{ N_("&Menubar visible"), &menubar_visible, NULL },
|
||||
{ N_("Command &prompt"), &command_prompt, NULL },
|
||||
{ N_("&Keybar visible"), &mc_global.keybar_visible, NULL },
|
||||
{ N_("H&intbar visible"), &mc_global.message_visible, NULL },
|
||||
{ N_("&XTerm window title"), &xterm_title, NULL },
|
||||
{ N_("&Show free space"), &free_space, NULL }
|
||||
/* *INDENT-ON* */
|
||||
};
|
||||
|
||||
@ -230,12 +230,12 @@ update_split (const Dlg_head * h)
|
||||
old_layout = _panels_layout;
|
||||
|
||||
if (_panels_layout.horizontal_split)
|
||||
check_options[6].widget->state = _panels_layout.horizontal_equal ? 1 : 0;
|
||||
check_options[0].widget->state = _panels_layout.horizontal_equal ? 1 : 0;
|
||||
else
|
||||
check_options[6].widget->state = _panels_layout.vertical_equal ? 1 : 0;
|
||||
send_message (WIDGET (check_options[6].widget), NULL, WIDGET_DRAW, 0, NULL);
|
||||
check_options[0].widget->state = _panels_layout.vertical_equal ? 1 : 0;
|
||||
send_message (WIDGET (check_options[0].widget), NULL, WIDGET_DRAW, 0, NULL);
|
||||
|
||||
tty_setcolor (check_options[6].widget->state & C_BOOL ? DISABLED_COLOR : COLOR_NORMAL);
|
||||
tty_setcolor (check_options[0].widget->state & C_BOOL ? DISABLED_COLOR : COLOR_NORMAL);
|
||||
|
||||
widget_move (h, 6, 5);
|
||||
if (_panels_layout.horizontal_split)
|
||||
@ -337,12 +337,12 @@ layout_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *d
|
||||
return MSG_HANDLED;
|
||||
|
||||
case DLG_POST_KEY:
|
||||
_menubar_visible = check_options[5].widget->state & C_BOOL;
|
||||
_command_prompt = (check_options[4].widget->state & C_BOOL) != 0;
|
||||
_menubar_visible = check_options[1].widget->state & C_BOOL;
|
||||
_command_prompt = (check_options[2].widget->state & C_BOOL) != 0;
|
||||
_keybar_visible = check_options[3].widget->state & C_BOOL;
|
||||
_message_visible = check_options[2].widget->state & C_BOOL;
|
||||
_xterm_title = (check_options[1].widget->state & C_BOOL) != 0;
|
||||
_free_space = check_options[0].widget->state & C_BOOL;
|
||||
_message_visible = check_options[4].widget->state & C_BOOL;
|
||||
_xterm_title = (check_options[5].widget->state & C_BOOL) != 0;
|
||||
_free_space = check_options[6].widget->state & C_BOOL;
|
||||
|
||||
if (mc_global.tty.console_flag != '\0')
|
||||
{
|
||||
@ -396,18 +396,18 @@ layout_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *d
|
||||
return MSG_HANDLED;
|
||||
}
|
||||
|
||||
if (sender == WIDGET (check_options[6].widget))
|
||||
if (sender == WIDGET (check_options[0].widget))
|
||||
{
|
||||
int eq;
|
||||
|
||||
if (_panels_layout.horizontal_split)
|
||||
{
|
||||
_panels_layout.horizontal_equal = check_options[6].widget->state & C_BOOL;
|
||||
_panels_layout.horizontal_equal = check_options[0].widget->state & C_BOOL;
|
||||
eq = _panels_layout.horizontal_equal;
|
||||
}
|
||||
else
|
||||
{
|
||||
_panels_layout.vertical_equal = check_options[6].widget->state & C_BOOL;
|
||||
_panels_layout.vertical_equal = check_options[0].widget->state & C_BOOL;
|
||||
eq = _panels_layout.vertical_equal;
|
||||
}
|
||||
|
||||
@ -512,35 +512,38 @@ init_layout (void)
|
||||
width = max (l1 * 2 + 7, b);
|
||||
|
||||
layout_dlg =
|
||||
create_dlg (TRUE, 0, 0, 14, width,
|
||||
dialog_colors, layout_callback, NULL, "[Layout]",
|
||||
_("Layout"), DLG_CENTER | DLG_REVERSE);
|
||||
|
||||
/* buttons */
|
||||
add_widget (layout_dlg,
|
||||
button_new (11, (width - b) / 3 * 2 + b1 + 1, B_CANCEL, NORMAL_BUTTON,
|
||||
cancel_button, 0));
|
||||
add_widget (layout_dlg,
|
||||
button_new (11, (width - b) / 3, B_ENTER, DEFPUSH_BUTTON, ok_button, 0));
|
||||
create_dlg (TRUE, 0, 0, 15, width, dialog_colors, layout_callback, NULL, "[Layout]",
|
||||
_("Layout"), DLG_CENTER);
|
||||
|
||||
#define XTRACT(i) *check_options[i].variable, check_options[i].text
|
||||
|
||||
/* "Other options" groupbox */
|
||||
for (i = 0; i < (size_t) OTHER_OPTIONS_COUNT; i++)
|
||||
{
|
||||
check_options[i].widget = check_new (OTHER_OPTIONS_COUNT - i + 2, 6 + l1, XTRACT (i));
|
||||
add_widget (layout_dlg, check_options[i].widget);
|
||||
}
|
||||
/* "Panel split" groupbox */
|
||||
add_widget (layout_dlg, groupbox_new (2, 3, 6, l1, title1));
|
||||
|
||||
add_widget (layout_dlg, groupbox_new (2, 4 + l1, 9, l1, title3));
|
||||
radio_widget = radio_new (3, 5, 2, s_split_direction);
|
||||
radio_widget->sel = panels_layout.horizontal_split;
|
||||
add_widget (layout_dlg, radio_widget);
|
||||
|
||||
check_options[0].widget = check_new (5, 5, XTRACT (0));
|
||||
add_widget (layout_dlg, check_options[0].widget);
|
||||
|
||||
equal_split = panels_layout.horizontal_split ?
|
||||
panels_layout.horizontal_equal : panels_layout.vertical_equal;
|
||||
|
||||
bleft_widget = button_new (6, 8, B_2LEFT, NARROW_BUTTON, "&<", b_left_right_cback);
|
||||
widget_disable (WIDGET (bleft_widget), equal_split);
|
||||
add_widget (layout_dlg, bleft_widget);
|
||||
|
||||
bright_widget = button_new (6, 14, B_2RIGHT, NARROW_BUTTON, "&>", b_left_right_cback);
|
||||
widget_disable (WIDGET (bright_widget), equal_split);
|
||||
add_widget (layout_dlg, bright_widget);
|
||||
|
||||
/* "Console output" groupbox */
|
||||
{
|
||||
const int disabled = mc_global.tty.console_flag != '\0' ? 0 : W_DISABLED;
|
||||
Widget *w;
|
||||
|
||||
w = WIDGET (button_new (9, output_lines_label_len + 5 + 5, B_MINUS,
|
||||
NARROW_BUTTON, "&-", bminus_cback));
|
||||
w = WIDGET (groupbox_new (8, 3, 3, l1, title2));
|
||||
w->options |= disabled;
|
||||
add_widget (layout_dlg, w);
|
||||
|
||||
@ -549,34 +552,33 @@ init_layout (void)
|
||||
w->options |= disabled;
|
||||
add_widget (layout_dlg, w);
|
||||
|
||||
w = WIDGET (groupbox_new (8, 3, 3, l1, title2));
|
||||
w = WIDGET (button_new (9, output_lines_label_len + 5 + 5, B_MINUS,
|
||||
NARROW_BUTTON, "&-", bminus_cback));
|
||||
w->options |= disabled;
|
||||
add_widget (layout_dlg, w);
|
||||
}
|
||||
|
||||
equal_split = panels_layout.horizontal_split ?
|
||||
panels_layout.horizontal_equal : panels_layout.vertical_equal;
|
||||
/* "Other options" groupbox */
|
||||
add_widget (layout_dlg, groupbox_new (2, 4 + l1, 9, l1, title3));
|
||||
|
||||
/* "Panel split" groupbox */
|
||||
bright_widget = button_new (6, 14, B_2RIGHT, NARROW_BUTTON, "&>", b_left_right_cback);
|
||||
widget_disable (WIDGET (bright_widget), equal_split);
|
||||
add_widget (layout_dlg, bright_widget);
|
||||
|
||||
bleft_widget = button_new (6, 8, B_2LEFT, NARROW_BUTTON, "&<", b_left_right_cback);
|
||||
widget_disable (WIDGET (bleft_widget), equal_split);
|
||||
add_widget (layout_dlg, bleft_widget);
|
||||
|
||||
check_options[6].widget = check_new (5, 5, XTRACT (6));
|
||||
add_widget (layout_dlg, check_options[6].widget);
|
||||
|
||||
radio_widget = radio_new (3, 5, 2, s_split_direction);
|
||||
radio_widget->sel = panels_layout.horizontal_split;
|
||||
add_widget (layout_dlg, radio_widget);
|
||||
|
||||
add_widget (layout_dlg, groupbox_new (2, 3, 6, l1, title1));
|
||||
for (i = 1; i < (size_t) LAYOUT_OPTIONS_COUNT; i++)
|
||||
{
|
||||
check_options[i].widget = check_new (i + 2, 6 + l1, XTRACT (i));
|
||||
add_widget (layout_dlg, check_options[i].widget);
|
||||
}
|
||||
|
||||
#undef XTRACT
|
||||
|
||||
add_widget (layout_dlg, hline_new (11, -1, -1));
|
||||
/* buttons */
|
||||
add_widget (layout_dlg,
|
||||
button_new (12, (width - b) / 2, B_ENTER, DEFPUSH_BUTTON, ok_button, 0));
|
||||
add_widget (layout_dlg,
|
||||
button_new (12, (width - b) / 2 + b1 + 1, B_CANCEL, NORMAL_BUTTON,
|
||||
cancel_button, 0));
|
||||
|
||||
dlg_select_widget (radio_widget);
|
||||
|
||||
return layout_dlg;
|
||||
}
|
||||
|
||||
@ -646,12 +648,12 @@ layout_box (void)
|
||||
panels_layout.horizontal_split = radio_widget->sel;
|
||||
if (panels_layout.horizontal_split)
|
||||
{
|
||||
panels_layout.horizontal_equal = *check_options[6].variable;
|
||||
panels_layout.horizontal_equal = *check_options[0].variable;
|
||||
panels_layout.top_panel_size = _panels_layout.top_panel_size;
|
||||
}
|
||||
else
|
||||
{
|
||||
panels_layout.vertical_equal = *check_options[6].variable;
|
||||
panels_layout.vertical_equal = *check_options[0].variable;
|
||||
panels_layout.left_panel_size = _panels_layout.left_panel_size;
|
||||
}
|
||||
output_lines = _output_lines;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user