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

core: rename option weechat.look.save_layout_on_exit to weechat.look.store_layout_on_exit, replace "save" by "store" for layouts

Browse Source
This commit is contained in:
Sebastien Helleu
2014-01-21 22:03:12 +01:00
parent 26dfd69f87
commit 79f2f46dec
35 changed files with 373 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-buffer.h
+1 -1
View File
@@ -82,7 +82,7 @@ struct t_gui_buffer
char *plugin_name_for_upgrade; /* plugin name when upgrading */
int number; /* buffer number (first is 1) */
int layout_number; /* number of buffer saved in layout */
int layout_number; /* number of buffer stored in layout */
int layout_number_merge_order; /* order in merge for layout */
char *name; /* buffer name */
char *full_name; /* plugin name + '.' + buffer name */
src/gui/gui-layout.c
+21 -21
View File
@@ -309,11 +309,11 @@ gui_layout_buffer_get_number_all (struct t_gui_layout *layout)
}
/*
* Saves current layout for buffers in a layout.
* Stores current layout for buffers in a layout.
*/
void
gui_layout_buffer_save (struct t_gui_layout *layout)
gui_layout_buffer_store (struct t_gui_layout *layout)
{
struct t_gui_buffer *ptr_buffer;
@@ -521,11 +521,11 @@ gui_layout_window_add (struct t_gui_layout_window **layout_window,
}
/*
* Saves tree of windows.
* Stores tree of windows.
*/
void
gui_layout_window_save_tree (struct t_gui_layout *layout,
gui_layout_window_store_tree (struct t_gui_layout *layout,
struct t_gui_layout_window **layout_windows,
struct t_gui_layout_window *parent_layout,
struct t_gui_window_tree *tree)
@@ -559,25 +559,25 @@ gui_layout_window_save_tree (struct t_gui_layout *layout,
if (tree->child1)
{
gui_layout_window_save_tree (layout, layout_windows,
gui_layout_window_store_tree (layout, layout_windows,
layout_window, tree->child1);
}
if (tree->child2)
{
gui_layout_window_save_tree (layout, layout_windows,
gui_layout_window_store_tree (layout, layout_windows,
layout_window, tree->child2);
}
}
/*
* Saves current layout for windows in a layout.
* Stores current layout for windows in a layout.
*
* Returns internal id of current window.
*/
void
gui_layout_window_save (struct t_gui_layout *layout)
gui_layout_window_store (struct t_gui_layout *layout)
{
if (!layout)
return;
@@ -587,7 +587,7 @@ gui_layout_window_save (struct t_gui_layout *layout)
layout->internal_id = 1;
layout->internal_id_current_window = -1;
gui_layout_window_save_tree (layout, &layout->layout_windows, NULL,
gui_layout_window_store_tree (layout, &layout->layout_windows, NULL,
gui_windows_tree);
}
@@ -759,15 +759,15 @@ gui_layout_window_apply (struct t_gui_layout *layout,
}
/*
* Saves layout according to option "save_layout_on_exit".
* Stores layout according to option "store_layout_on_exit".
*/
void
gui_layout_save_on_exit ()
gui_layout_store_on_exit ()
{
struct t_gui_layout *ptr_layout;
if (CONFIG_BOOLEAN(config_look_save_layout_on_exit) == CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_NONE)
if (CONFIG_BOOLEAN(config_look_store_layout_on_exit) == CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_NONE)
return;
ptr_layout = gui_layout_current;
@@ -784,18 +784,18 @@ gui_layout_save_on_exit ()
}
}
/* save current layout */
switch (CONFIG_BOOLEAN(config_look_save_layout_on_exit))
/* store current layout */
switch (CONFIG_BOOLEAN(config_look_store_layout_on_exit))
{
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_BUFFERS:
gui_layout_buffer_save (ptr_layout);
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_BUFFERS:
gui_layout_buffer_store (ptr_layout);
break;
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_WINDOWS:
gui_layout_window_save (ptr_layout);
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_WINDOWS:
gui_layout_window_store (ptr_layout);
break;
case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_ALL:
gui_layout_buffer_save (ptr_layout);
gui_layout_window_save (ptr_layout);
case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_ALL:
gui_layout_buffer_store (ptr_layout);
gui_layout_window_store (ptr_layout);
break;
default:
break;
src/gui/gui-layout.h
+3 -3
View File
@@ -90,7 +90,7 @@ extern void gui_layout_buffer_get_number (struct t_gui_layout *layout,
int *layout_number,
int *layout_number_merge_order);
extern void gui_layout_buffer_get_number_all (struct t_gui_layout *layout);
extern void gui_layout_buffer_save (struct t_gui_layout *layout);
extern void gui_layout_buffer_store (struct t_gui_layout *layout);
extern void gui_layout_buffer_apply (struct t_gui_layout *layout);
extern void gui_layout_window_remove_all (struct t_gui_layout *layout);
@@ -104,12 +104,12 @@ extern struct t_gui_layout_window *gui_layout_window_add (struct t_gui_layout_wi
int split_horiz,
const char *plugin_name,
const char *buffer_name);
extern void gui_layout_window_save (struct t_gui_layout *layout);
extern void gui_layout_window_store (struct t_gui_layout *layout);
extern int gui_layout_window_check_buffer (struct t_gui_window *window);
extern void gui_layout_window_assign_buffer (struct t_gui_buffer *buffer);
extern void gui_layout_window_apply (struct t_gui_layout *layout,
int internal_id_current_window);
extern void gui_layout_save_on_exit ();
extern void gui_layout_store_on_exit ();
extern void gui_layout_free (struct t_gui_layout *layout);
extern void gui_layout_remove (struct t_gui_layout *layout);
extern void gui_layout_remove_all ();
src/gui/gui-window.c
+2 -2
View File
@@ -1667,14 +1667,14 @@ gui_window_zoom (struct t_gui_window *window)
}
else
{
/* save layout and zoom on current window */
/* store layout and zoom on current window */
ptr_layout = gui_layout_alloc (GUI_LAYOUT_ZOOM);
if (ptr_layout)
{
gui_layout_add (ptr_layout);
hook_signal_send ("window_zoom",
WEECHAT_HOOK_SIGNAL_POINTER, gui_current_window);
gui_layout_window_save (ptr_layout);
gui_layout_window_store (ptr_layout);
gui_window_merge_all (window);
hook_signal_send ("window_zoomed",
WEECHAT_HOOK_SIGNAL_POINTER, gui_current_window);