mirror of
https://github.com/weechat/weechat.git
synced 2026-07-03 16:23:14 +02:00
Fixed bugs with nicks color and sorting in nicklist
This commit is contained in:
+13
-11
@@ -244,7 +244,8 @@ config_change_buffers ()
|
||||
void
|
||||
config_change_buffer_content ()
|
||||
{
|
||||
gui_window_redraw_buffer (gui_current_window->buffer);
|
||||
if (gui_ok)
|
||||
gui_window_redraw_buffer (gui_current_window->buffer);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -256,7 +257,8 @@ config_change_buffer_time_format ()
|
||||
{
|
||||
gui_chat_time_length = util_get_time_length (CONFIG_STRING(config_look_buffer_time_format));
|
||||
gui_chat_change_time_format ();
|
||||
gui_window_redraw_buffer (gui_current_window->buffer);
|
||||
if (gui_ok)
|
||||
gui_window_redraw_buffer (gui_current_window->buffer);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1077,55 +1079,55 @@ config_weechat_init ()
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[0] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color1", "color",
|
||||
"chat_nick_color01", "color",
|
||||
N_("text color #1 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK1, 0, "cyan",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[1] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color2", "color",
|
||||
"chat_nick_color02", "color",
|
||||
N_("text color #2 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK2, 0, "magenta",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[2] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color3", "color",
|
||||
"chat_nick_color03", "color",
|
||||
N_("text color #3 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK3, 0, "green",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[3] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color4", "color",
|
||||
"chat_nick_color04", "color",
|
||||
N_("text color #4 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK4, 0, "brown",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[4] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color5", "color",
|
||||
"chat_nick_color05", "color",
|
||||
N_("text color #5 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK5, 0, "lightblue",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[5] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color6", "color",
|
||||
"chat_nick_color06", "color",
|
||||
N_("text color #6 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK6, 0, "default",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[6] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color7", "color",
|
||||
"chat_nick_color07", "color",
|
||||
N_("text color #7 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK7, 0, "lightcyan",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[7] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color8", "color",
|
||||
"chat_nick_color08", "color",
|
||||
N_("text color #8 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK8, 0, "lightmagenta",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
config_color_chat_nick_colors[8] = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"chat_nick_color9", "color",
|
||||
"chat_nick_color09", "color",
|
||||
N_("text color #9 for nick"),
|
||||
NULL, GUI_COLOR_CHAT_NICK9, 0, "lightgreen",
|
||||
NULL, NULL, &config_change_color, NULL, NULL, NULL);
|
||||
|
||||
@@ -54,7 +54,7 @@ gui_nicklist_find_pos_group (struct t_gui_nick_group *groups,
|
||||
|
||||
for (ptr_group = groups; ptr_group; ptr_group = ptr_group->next_group)
|
||||
{
|
||||
if (strcmp (group->name, ptr_group->name) < 0)
|
||||
if (string_strcasecmp (group->name, ptr_group->name) < 0)
|
||||
return ptr_group;
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@ gui_nicklist_find_pos_nick (struct t_gui_nick_group *group,
|
||||
|
||||
for (ptr_nick = group->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
|
||||
{
|
||||
if (strcmp (nick->name, ptr_nick->name) < 0)
|
||||
if (string_strcasecmp (nick->name, ptr_nick->name) < 0)
|
||||
return ptr_nick;
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ irc_nick_find_color (struct t_irc_nick *nick)
|
||||
weechat_config_integer (weechat_config_get ("weechat.look.color_nicks_number")));
|
||||
|
||||
snprintf (color_name, sizeof (color_name),
|
||||
"chat_nick_color%d", color);
|
||||
"chat_nick_color%02d", color + 1);
|
||||
|
||||
return weechat_color (color_name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user