pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-04 08:43:13 +02:00
Code Activity

core: revert the rename of option weechat.look.save_layout_on_exit

Browse Source
This commit is contained in:
Sebastien Helleu
2014-01-22 18:50:24 +01:00
parent b49f825d0a
commit 48797574ff
23 changed files with 106 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-config.c
+6 -6
View File
@@ -159,13 +159,13 @@ struct t_config_option *config_look_read_marker;
struct t_config_option *config_look_read_marker_always_show;
struct t_config_option *config_look_read_marker_string;
struct t_config_option *config_look_save_config_on_exit;
struct t_config_option *config_look_save_layout_on_exit;
struct t_config_option *config_look_scroll_amount;
struct t_config_option *config_look_scroll_bottom_after_switch;
struct t_config_option *config_look_scroll_page_percent;
struct t_config_option *config_look_search_text_not_found_alert;
struct t_config_option *config_look_separator_horizontal;
struct t_config_option *config_look_separator_vertical;
struct t_config_option *config_look_store_layout_on_exit;
struct t_config_option *config_look_tab_width;
struct t_config_option *config_look_time_format;
struct t_config_option *config_look_window_auto_zoom;
@@ -2581,6 +2581,11 @@ config_weechat_init_options ()
"save_config_on_exit", "boolean",
N_("save configuration file on exit"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_save_config_on_exit, NULL, NULL, NULL);
config_look_save_layout_on_exit = config_file_new_option (
weechat_config_file, ptr_section,
"save_layout_on_exit", "integer",
N_("save layout on exit (buffers, windows, or both)"),
"none|buffers|windows|all", 0, 0, "none", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
config_look_scroll_amount = config_file_new_option (
weechat_config_file, ptr_section,
"scroll_amount", "integer",
@@ -2622,11 +2627,6 @@ config_weechat_init_options ()
"width on screen must be exactly one char"),
NULL, 0, 0, "", NULL, 0,
&config_check_separator, NULL, &config_change_buffers, NULL, NULL, NULL);
config_look_store_layout_on_exit = config_file_new_option (
weechat_config_file, ptr_section,
"store_layout_on_exit", "integer",
N_("store layout on exit (buffers, windows, or both)"),
"none|buffers|windows|all", 0, 0, "none", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
config_look_tab_width = config_file_new_option (
weechat_config_file, ptr_section,
"tab_width", "integer",
src/core/wee-config.h
+6 -6
View File
@@ -91,12 +91,12 @@ enum t_config_look_read_marker
CONFIG_LOOK_READ_MARKER_CHAR,
};
enum t_config_look_store_layout_on_exit
enum t_config_look_save_layout_on_exit
{
CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_NONE = 0,
CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_BUFFERS,
CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_WINDOWS,
CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_ALL,
CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_NONE = 0,
CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_BUFFERS,
CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_WINDOWS,
CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_ALL,
};
extern struct t_config_file *weechat_config_file;
@@ -191,13 +191,13 @@ extern struct t_config_option *config_look_read_marker;
extern struct t_config_option *config_look_read_marker_always_show;
extern struct t_config_option *config_look_read_marker_string;
extern struct t_config_option *config_look_save_config_on_exit;
extern struct t_config_option *config_look_save_layout_on_exit;
extern struct t_config_option *config_look_scroll_amount;
extern struct t_config_option *config_look_scroll_bottom_after_switch;
extern struct t_config_option *config_look_scroll_page_percent;
extern struct t_config_option *config_look_search_text_not_found_alert;
extern struct t_config_option *config_look_separator_horizontal;
extern struct t_config_option *config_look_separator_vertical;
extern struct t_config_option *config_look_store_layout_on_exit;
extern struct t_config_option *config_look_tab_width;
extern struct t_config_option *config_look_time_format;
extern struct t_config_option *config_look_window_auto_zoom;
src/gui/gui-layout.c
+5 -5
View File
@@ -767,7 +767,7 @@ gui_layout_store_on_exit ()
{
struct t_gui_layout *ptr_layout;
if (CONFIG_BOOLEAN(config_look_store_layout_on_exit) == CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_NONE)
if (CONFIG_BOOLEAN(config_look_save_layout_on_exit) == CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_NONE)
return;
ptr_layout = gui_layout_current;
@@ -785,15 +785,15 @@ gui_layout_store_on_exit ()
}
/* store current layout */
switch (CONFIG_BOOLEAN(config_look_store_layout_on_exit))
switch (CONFIG_BOOLEAN(config_look_save_layout_on_exit))
{
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_BUFFERS:
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_BUFFERS:
gui_layout_buffer_store (ptr_layout);
break;
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_WINDOWS:
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_WINDOWS:
gui_layout_window_store (ptr_layout);
break;
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_ALL:
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_ALL:
gui_layout_buffer_store (ptr_layout);
gui_layout_window_store (ptr_layout);
break;