iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix user count options

Browse Source
This commit is contained in:
Berke Viktor 2012-10-22 18:59:45 +02:00
parent f5338e014a
commit bc4fb2fd0e
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -480,6 +480,7 @@ const struct prefs vars[] =
{"gui_tray", P_OFFINT (hex_gui_tray), TYPE_BOOL}, {"gui_tray", P_OFFINT (hex_gui_tray), TYPE_BOOL},
{"gui_tray_flags", P_OFFINT (hex_gui_tray_flags), TYPE_INT}, {"gui_tray_flags", P_OFFINT (hex_gui_tray_flags), TYPE_INT},
{"gui_ulist_buttons", P_OFFINT (hex_gui_ulist_buttons), TYPE_BOOL}, {"gui_ulist_buttons", P_OFFINT (hex_gui_ulist_buttons), TYPE_BOOL},
{"gui_ulist_count", P_OFFINT (hex_gui_ulist_count), TYPE_BOOL},
{"gui_ulist_doubleclick", P_OFFSET (hex_gui_ulist_doubleclick), TYPE_STR}, {"gui_ulist_doubleclick", P_OFFSET (hex_gui_ulist_doubleclick), TYPE_STR},
{"gui_ulist_hide", P_OFFINT (hex_gui_ulist_hide), TYPE_BOOL}, {"gui_ulist_hide", P_OFFINT (hex_gui_ulist_hide), TYPE_BOOL},
{"gui_ulist_icons", P_OFFINT (hex_gui_ulist_icons), TYPE_BOOL}, {"gui_ulist_icons", P_OFFINT (hex_gui_ulist_icons), TYPE_BOOL},
@ -686,6 +687,7 @@ load_config (void)
prefs.hex_gui_tab_layout = 2; /* 0=Tabs 1=Reserved 2=Tree */ prefs.hex_gui_tab_layout = 2; /* 0=Tabs 1=Reserved 2=Tree */
prefs.hex_gui_tab_icons = 1; prefs.hex_gui_tab_icons = 1;
prefs.hex_gui_tab_sort = 1; prefs.hex_gui_tab_sort = 1;
prefs.hex_gui_ulist_count = 1;
prefs.hex_gui_ulist_resizable = 1; prefs.hex_gui_ulist_resizable = 1;
prefs.hex_gui_tab_newtofront = 2; prefs.hex_gui_tab_newtofront = 2;
prefs.hex_gui_tab_server = 1; prefs.hex_gui_tab_server = 1;

1
src/common/xchat.h
View File

@ -241,6 +241,7 @@ struct hexchatprefs
unsigned int hex_gui_topicbar; unsigned int hex_gui_topicbar;
unsigned int hex_gui_tray; unsigned int hex_gui_tray;
unsigned int hex_gui_ulist_buttons; unsigned int hex_gui_ulist_buttons;
unsigned int hex_gui_ulist_count;
unsigned int hex_gui_ulist_hide; unsigned int hex_gui_ulist_hide;
unsigned int hex_gui_ulist_icons; unsigned int hex_gui_ulist_icons;
unsigned int hex_gui_ulist_resizable; unsigned int hex_gui_ulist_resizable;

2
src/fe-gtk/maingui.c
View File

@ -2522,7 +2522,7 @@ mg_create_userlist (session_gui *gui, GtkWidget *box)
gtk_container_add (GTK_CONTAINER (box), vbox); gtk_container_add (GTK_CONTAINER (box), vbox);
frame = gtk_frame_new (NULL); frame = gtk_frame_new (NULL);
if (!(prefs.hex_gui_win_ucount)) if (prefs.hex_gui_ulist_count)
gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, GUI_SPACING); gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, GUI_SPACING);
gui->namelistinfo = gtk_label_new (NULL); gui->namelistinfo = gtk_label_new (NULL);

27
src/fe-gtk/setup.c
View File

@ -284,7 +284,8 @@ static const setting userlist_settings[] =
{ST_HEADER, N_("User List"),0,0,0}, {ST_HEADER, N_("User List"),0,0,0},
{ST_TOGGLE, N_("Show hostnames in user list"), P_OFFINTNL(hex_gui_ulist_show_hosts), 0, 0, 0}, {ST_TOGGLE, N_("Show hostnames in user list"), P_OFFINTNL(hex_gui_ulist_show_hosts), 0, 0, 0},
{ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(hex_gui_ulist_style),0,0,0}, {ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(hex_gui_ulist_style),0,0,0},
{ST_TOGGLE, N_("Show icons instead of text symbols"), P_OFFINTNL(hex_gui_ulist_icons), 0, 0, 0}, {ST_TOGGLE, N_("Show icons instead for user modes"), P_OFFINTNL(hex_gui_ulist_icons), 0, 0, 0},
{ST_TOGGLE, N_("Show user count in channels"), P_OFFINTNL(hex_gui_ulist_count), 0, 0, 0},
/* {ST_TOGGLE, N_("Resizable user list"), P_OFFINTNL(hex_gui_ulist_resizable),0,0,0},*/ /* {ST_TOGGLE, N_("Resizable user list"), P_OFFINTNL(hex_gui_ulist_resizable),0,0,0},*/
{ST_MENU, N_("User list sorted by:"), P_OFFINTNL(hex_gui_ulist_sort), 0, ulmenutext, 0}, {ST_MENU, N_("User list sorted by:"), P_OFFINTNL(hex_gui_ulist_sort), 0, ulmenutext, 0},
{ST_MENU, N_("Show user list at:"), P_OFFINTNL(hex_gui_ulist_pos), 0, ulpos, 1}, {ST_MENU, N_("Show user list at:"), P_OFFINTNL(hex_gui_ulist_pos), 0, ulpos, 1},
@ -2202,29 +2203,31 @@ setup_apply (struct hexchatprefs *pr)
if (DIFF (hex_gui_lang)) if (DIFF (hex_gui_lang))
noapply = TRUE; noapply = TRUE;
#endif #endif
if (DIFF (hex_gui_ulist_resizable))
noapply = TRUE;
if (DIFF (hex_gui_input_nick)) if (DIFF (hex_gui_input_nick))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_lagometer)) if (DIFF (hex_gui_lagometer))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_throttlemeter)) if (DIFF (hex_gui_tab_icons))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_ulist_show_hosts)) if (DIFF (hex_gui_tab_server))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_tab_small)) if (DIFF (hex_gui_tab_small))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_tab_sort)) if (DIFF (hex_gui_tab_sort))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_ulist_icons))
noapply = TRUE;
if (DIFF (hex_gui_tab_server))
noapply = TRUE;
if (DIFF (hex_gui_ulist_style))
noapply = TRUE;
if (DIFF (hex_gui_tab_trunc)) if (DIFF (hex_gui_tab_trunc))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_tab_icons)) if (DIFF (hex_gui_throttlemeter))
noapply = TRUE;
if (DIFF (hex_gui_ulist_count))
noapply = TRUE;
if (DIFF (hex_gui_ulist_icons))
noapply = TRUE;
if (DIFF (hex_gui_ulist_resizable))
noapply = TRUE;
if (DIFF (hex_gui_ulist_show_hosts))
noapply = TRUE;
if (DIFF (hex_gui_ulist_style))
noapply = TRUE; noapply = TRUE;
if (DIFF (hex_gui_tab_dots)) if (DIFF (hex_gui_tab_dots))