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

Remove old title/nicklist/status/input, use of new bars

Browse Source
This commit is contained in:
Sebastien Helleu
2008-10-12 19:20:26 +02:00
parent f6073c8076
commit c83eef6e82
48 changed files with 274 additions and 2447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+5 -48
View File
@@ -53,7 +53,6 @@
#include "../gui/gui-keyboard.h"
#include "../gui/gui-layout.h"
#include "../gui/gui-main.h"
#include "../gui/gui-status.h"
#include "../gui/gui-window.h"
#include "../plugins/plugin.h"
#include "../plugins/plugin-config.h"
@@ -303,7 +302,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
{
gui_bar_free_all ();
gui_chat_printf (NULL, _("All bars have been deleted"));
//gui_bar_create_default ();
gui_bar_create_default_input ();
}
else
{
@@ -318,6 +317,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
}
gui_bar_free (ptr_bar);
gui_chat_printf (NULL, _("Bar deleted"));
gui_bar_create_default_input ();
}
return WEECHAT_RC_OK;
@@ -589,7 +589,6 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
return WEECHAT_RC_ERROR;
}
gui_buffer_close (buffer, 1);
gui_status_refresh_needed = 1;
gui_buffer_ask_input_refresh (gui_current_window->buffer, 1);
return WEECHAT_RC_OK;
@@ -685,7 +684,6 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
{
gui_window_switch_to_buffer (gui_current_window,
ptr_buffer);
gui_status_refresh_needed = 1;
}
}
@@ -2709,48 +2707,6 @@ command_window (void *data, struct t_gui_buffer *buffer,
return WEECHAT_RC_OK;
}
/* scroll topic left for current window */
if (string_strcasecmp (argv[1], "scroll_topic_left") == 0)
{
gui_window_scroll_topic_left (gui_current_window);
return WEECHAT_RC_OK;
}
/* scroll topic right for current window */
if (string_strcasecmp (argv[1], "scroll_topic_right") == 0)
{
gui_window_scroll_topic_right (gui_current_window);
return WEECHAT_RC_OK;
}
/* page up for nicklist in current window */
if (string_strcasecmp (argv[1], "nicklist_page_up") == 0)
{
gui_window_nicklist_page_up (gui_current_window);
return WEECHAT_RC_OK;
}
/* page down for nicklist in current window */
if (string_strcasecmp (argv[1], "nicklist_page_down") == 0)
{
gui_window_nicklist_page_down (gui_current_window);
return WEECHAT_RC_OK;
}
/* beginning of nicklist for current window */
if (string_strcasecmp (argv[1], "nicklist_beginning") == 0)
{
gui_window_nicklist_beginning (gui_current_window);
return WEECHAT_RC_OK;
}
/* end of nicklist for current window */
if (string_strcasecmp (argv[1], "nicklist_end") == 0)
{
gui_window_nicklist_end (gui_current_window);
return WEECHAT_RC_OK;
}
/* refresh screen */
if (string_strcasecmp (argv[1], "refresh") == 0)
{
@@ -2967,8 +2923,9 @@ command_init ()
" scroll to end of nicklist on current buffer:\n"
" /bar scroll nicklist * ye"),
"add|default|del|set|hide|show|scroll|list|listfull|"
"listitems %r name|priority|conditions|position|filling|"
"size|separator|items",
"listitems %r name|hidden|priority|conditions|position|"
"filling_top_bottom|filling_left_right|size|size_max|"
"color_fg|color_delim|color_bg|separator|items",
&command_bar, NULL);
hook_command (NULL, "buffer",
N_("manage buffers"),
src/core/wee-config.c
+29 -31
View File
@@ -50,7 +50,6 @@
#include "../gui/gui-keyboard.h"
#include "../gui/gui-layout.h"
#include "../gui/gui-nicklist.h"
#include "../gui/gui-status.h"
#include "../gui/gui-window.h"
#include "../plugins/plugin.h"
@@ -294,7 +293,6 @@ config_change_hotlist (void *data, struct t_config_option *option)
(void) option;
gui_hotlist_resort ();
gui_status_refresh_needed = 1;
}
/*
@@ -481,7 +479,7 @@ config_weechat_reload (void *data, struct t_config_file *config_file)
if (rc == WEECHAT_CONFIG_READ_OK)
{
gui_bar_use_temp_bars ();
//gui_bar_create_default ();
gui_bar_create_default ();
}
return rc;
@@ -1107,7 +1105,7 @@ config_weechat_init ()
weechat_config_file, ptr_section,
"title", "color",
N_("text color for title bar"),
NULL, GUI_COLOR_TITLE, 0, "default",
NULL, -1, 0, "default",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_title_bg = config_file_new_option (
weechat_config_file, ptr_section,
@@ -1331,7 +1329,7 @@ config_weechat_init ()
weechat_config_file, ptr_section,
"status", "color",
N_("text color for status bar"),
NULL, GUI_COLOR_STATUS, 0, "default",
NULL, -1, 0, "default",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_bg = config_file_new_option (
weechat_config_file, ptr_section,
@@ -1343,57 +1341,57 @@ config_weechat_init ()
weechat_config_file, ptr_section,
"status_delimiters", "color",
N_("text color for status bar delimiters"),
NULL, GUI_COLOR_STATUS_DELIMITERS, 0, "cyan",
NULL, -1, 0, "cyan",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_number = config_file_new_option (
weechat_config_file, ptr_section,
"status_number", "color",
N_("text color for current buffer number in status bar"),
NULL, GUI_COLOR_STATUS_NUMBER, 0, "yellow",
NULL, -1, 0, "yellow",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_name = config_file_new_option (
weechat_config_file, ptr_section,
"status_name", "color",
N_("text color for current buffer name in status bar"),
NULL, GUI_COLOR_STATUS_NAME, 0, "white",
NULL, -1, 0, "white",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_data_msg = config_file_new_option (
weechat_config_file, ptr_section,
"status_data_msg", "color",
N_("text color for buffer with new messages (status bar)"),
NULL, GUI_COLOR_STATUS_DATA_MSG, 0, "yellow",
NULL, -1, 0, "yellow",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_data_private = config_file_new_option (
weechat_config_file, ptr_section,
"status_data_private", "color",
N_("text color for buffer with private message (status bar)"),
NULL, GUI_COLOR_STATUS_DATA_PRIVATE, 0, "lightgreen",
NULL, -1, 0, "lightgreen",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_data_highlight = config_file_new_option (
weechat_config_file, ptr_section,
"status_data_highlight", "color",
N_("text color for buffer with highlight (status bar)"),
NULL, GUI_COLOR_STATUS_DATA_HIGHLIGHT, 0, "lightmagenta",
NULL, -1, 0, "lightmagenta",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_data_other = config_file_new_option (
weechat_config_file, ptr_section,
"status_data_other", "color",
N_("text color for buffer with new data (not messages) "
"(status bar)"),
NULL, GUI_COLOR_STATUS_DATA_OTHER, 0, "default",
NULL, -1, 0, "default",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_status_more = config_file_new_option (
weechat_config_file, ptr_section,
"status_more", "color",
N_("text color for buffer with new data (status bar)"),
NULL, GUI_COLOR_STATUS_MORE, 0, "yellow",
NULL, -1, 0, "yellow",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
/* input window */
config_color_input = config_file_new_option (
weechat_config_file, ptr_section,
"input", "color",
N_("text color for input line"),
NULL, GUI_COLOR_INPUT, 0, "default",
NULL, -1, 0, "default",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_bg = config_file_new_option (
weechat_config_file, ptr_section,
@@ -1405,44 +1403,44 @@ config_weechat_init ()
weechat_config_file, ptr_section,
"input_server", "color",
N_("text color for server name in input line"),
NULL, GUI_COLOR_INPUT_SERVER, 0, "brown",
NULL, -1, 0, "brown",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_channel = config_file_new_option (
weechat_config_file, ptr_section,
"input_channel", "color",
N_("text color for channel name in input line"),
NULL, GUI_COLOR_INPUT_CHANNEL, 0, "white",
NULL, -1, 0, "white",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_nick = config_file_new_option (
weechat_config_file, ptr_section,
"input_nick", "color",
N_("text color for nick name in input line"),
NULL, GUI_COLOR_INPUT_NICK, 0, "lightcyan",
NULL, -1, 0, "lightcyan",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_delimiters = config_file_new_option (
weechat_config_file, ptr_section,
"input_delimiters", "color",
N_("text color for delimiters in input line"),
NULL, GUI_COLOR_INPUT_DELIMITERS, 0, "cyan",
NULL, -1, 0, "cyan",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_text_not_found = config_file_new_option (
weechat_config_file, ptr_section,
"input_text_not_found", "color",
N_("text color for unsucessful text search in input line"),
NULL, GUI_COLOR_INPUT_TEXT_NOT_FOUND, 0, "red",
NULL, -1, 0, "red",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_input_actions = config_file_new_option (
weechat_config_file, ptr_section,
"input_actions", "color",
N_("text color for actions in input line"),
NULL, GUI_COLOR_INPUT_ACTIONS, 0, "lightgreen",
NULL, -1, 0, "lightgreen",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
/* nicklist window */
config_color_nicklist = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist", "color",
N_("text color for nicklist"),
NULL, GUI_COLOR_NICKLIST, 0, "default",
NULL, -1, 0, "default",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_bg = config_file_new_option (
weechat_config_file, ptr_section,
@@ -1454,55 +1452,55 @@ config_weechat_init ()
weechat_config_file, ptr_section,
"nicklist_group", "color",
N_("text color for groups in nicklist"),
NULL, GUI_COLOR_NICKLIST_GROUP, 0, "green",
NULL, -1, 0, "green",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_away = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_away", "color",
N_("text color for away nicknames"),
NULL, GUI_COLOR_NICKLIST_AWAY, 0, "cyan",
NULL, -1, 0, "cyan",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_prefix1 = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_prefix1", "color",
N_("text color for prefix #1 in nicklist"),
NULL, GUI_COLOR_NICKLIST_PREFIX1, 0, "lightgreen",
NULL, -1, 0, "lightgreen",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_prefix2 = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_prefix2", "color",
N_("text color for prefix #2 in nicklist"),
NULL, GUI_COLOR_NICKLIST_PREFIX2, 0, "lightmagenta",
NULL, -1, 0, "lightmagenta",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_prefix3 = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_prefix3", "color",
N_("text color for prefix #3 in nicklist"),
NULL, GUI_COLOR_NICKLIST_PREFIX3, 0, "yellow",
NULL, -1, 0, "yellow",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_prefix4 = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_prefix4", "color",
N_("text color for prefix #4 in nicklist"),
NULL, GUI_COLOR_NICKLIST_PREFIX4, 0, "blue",
NULL, -1, 0, "blue",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_prefix5 = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_prefix5", "color",
N_("text color for prefix #5 in nicklist"),
NULL, GUI_COLOR_NICKLIST_PREFIX5, 0, "brown",
NULL, -1, 0, "brown",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_more = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_more", "color",
N_("text color for '+' when scrolling nicks in nicklist"),
NULL, GUI_COLOR_NICKLIST_MORE, 0, "lightmagenta",
NULL, -1, 0, "lightmagenta",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
config_color_nicklist_separator = config_file_new_option (
weechat_config_file, ptr_section,
"nicklist_separator", "color",
N_("text color for nicklist separator"),
NULL, GUI_COLOR_NICKLIST_SEPARATOR, 0, "blue",
NULL, -1, 0, "blue",
NULL, NULL, &config_change_color, NULL, NULL, NULL);
/* completion */
@@ -1761,7 +1759,7 @@ config_weechat_read ()
{
config_change_day_change (NULL, NULL);
gui_bar_use_temp_bars ();
//gui_bar_create_default ();
gui_bar_create_default ();
}
return rc;
src/core/wee-upgrade.c
+1 -1
View File
@@ -419,7 +419,7 @@ upgrade_weechat_read_cb (int object_id,
case UPGRADE_WEECHAT_TYPE_HOTLIST:
if (!hotlist_reset)
{
gui_hotlist_free_all (&gui_hotlist, &last_gui_hotlist);
gui_hotlist_clear ();
hotlist_reset = 1;
}
ptr_buffer = gui_buffer_search_by_number (infolist_integer (infolist, "buffer_number"));