Mirrors/hexchat
1
0
Fork 0
mirror of https://github.com/hexchat/hexchat.git synced 2024-09-20 09:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of gui_tweaks 64

Browse Source
This commit is contained in:
Berke Viktor 2012-10-22 06:02:15 +02:00
parent e361efcf94
commit 0e88d01caf
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/cfgfiles.c
View File

@ -485,6 +485,7 @@ const struct prefs vars[] = {
{"gui_ulist_buttons", P_OFFINT (userlistbuttons), TYPE_BOOL}, {"gui_ulist_buttons", P_OFFINT (userlistbuttons), TYPE_BOOL},
{"gui_ulist_doubleclick", P_OFFSET (doubleclickuser), TYPE_STR}, {"gui_ulist_doubleclick", P_OFFSET (doubleclickuser), TYPE_STR},
{"gui_ulist_hide", P_OFFINT (hideuserlist), TYPE_BOOL}, {"gui_ulist_hide", P_OFFINT (hideuserlist), TYPE_BOOL},
{"gui_ulist_icons", P_OFFINT (gui_ulist_icons), TYPE_BOOL},
{"gui_ulist_pos", P_OFFINT (gui_ulist_pos), TYPE_INT}, {"gui_ulist_pos", P_OFFINT (gui_ulist_pos), TYPE_INT},
{"gui_ulist_resizable", P_OFFINT (paned_userlist), TYPE_BOOL}, {"gui_ulist_resizable", P_OFFINT (paned_userlist), TYPE_BOOL},
{"gui_ulist_show_hosts", P_OFFINT(showhostname_in_userlist), TYPE_BOOL}, {"gui_ulist_show_hosts", P_OFFINT(showhostname_in_userlist), TYPE_BOOL},
@ -736,6 +737,8 @@ load_config (void)
prefs.gui_pane_left_size = 128; /* with treeview icons we need a bit bigger space */ prefs.gui_pane_left_size = 128; /* with treeview icons we need a bit bigger space */
prefs.gui_pane_right_size = 100; prefs.gui_pane_right_size = 100;
prefs.gui_pane_right_size_min = 80; prefs.gui_pane_right_size_min = 80;
prefs.tab_pos = 1;
prefs.gui_ulist_icons = 1;
prefs.gui_ulist_pos = 3; prefs.gui_ulist_pos = 3;
prefs.mainwindow_save = 1; prefs.mainwindow_save = 1;
prefs.bantype = 2; prefs.bantype = 2;

1
src/common/xchat.h
View File

@ -296,6 +296,7 @@ struct xchatprefs
unsigned int gui_tray; unsigned int gui_tray;
unsigned int gui_tray_flags; unsigned int gui_tray_flags;
unsigned int gui_tweaks; unsigned int gui_tweaks;
unsigned int gui_ulist_icons;
unsigned int throttle; unsigned int throttle;
unsigned int topicbar; unsigned int topicbar;
unsigned int hideuserlist; unsigned int hideuserlist;

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

@ -277,6 +277,7 @@ 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(showhostname_in_userlist), 0, 0, 0}, {ST_TOGGLE, N_("Show hostnames in user list"), P_OFFINTNL(showhostname_in_userlist), 0, 0, 0},
{ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(style_namelistgad),0,0,0}, {ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(style_namelistgad),0,0,0},
{ST_TOGGLE, N_("Show icons instead of text symbols"), P_OFFINTNL(gui_ulist_icons), 0, 0, 0},
/* {ST_TOGGLE, N_("Resizable user list"), P_OFFINTNL(paned_userlist),0,0,0},*/ /* {ST_TOGGLE, N_("Resizable user list"), P_OFFINTNL(paned_userlist),0,0,0},*/
{ST_MENU, N_("User list sorted by:"), P_OFFINTNL(userlist_sort), 0, ulmenutext, 0}, {ST_MENU, N_("User list sorted by:"), P_OFFINTNL(userlist_sort), 0, ulmenutext, 0},
{ST_MENU, N_("Show user list at:"), P_OFFINTNL(gui_ulist_pos), 0, ulpos, 1}, {ST_MENU, N_("Show user list at:"), P_OFFINTNL(gui_ulist_pos), 0, ulpos, 1},
@ -2208,6 +2209,8 @@ setup_apply (struct xchatprefs *pr)
noapply = TRUE; noapply = TRUE;
if (DIFF (tab_sort)) if (DIFF (tab_sort))
noapply = TRUE; noapply = TRUE;
if (DIFF (gui_ulist_icons))
noapply = TRUE;
if (DIFF (use_server_tab)) if (DIFF (use_server_tab))
noapply = TRUE; noapply = TRUE;
if (DIFF (style_namelistgad)) if (DIFF (style_namelistgad))

6
src/fe-gtk/userlistgui.c
View File

@ -357,7 +357,7 @@ fe_userlist_insert (session *sess, struct User *newuser, int row, int sel)
do_away = FALSE; do_away = FALSE;
nick = newuser->nick; nick = newuser->nick;
if (prefs.gui_tweaks & 64) if (!prefs.gui_ulist_icons)
{ {
nick = malloc (strlen (newuser->nick) + 2); nick = malloc (strlen (newuser->nick) + 2);
nick[0] = newuser->prefix[0]; nick[0] = newuser->prefix[0];
@ -378,8 +378,10 @@ fe_userlist_insert (session *sess, struct User *newuser, int row, int sel)
: (NULL), : (NULL),
-1); -1);
if (prefs.gui_tweaks & 64) if (!prefs.gui_ulist_icons)
{
free (nick); free (nick);
}
/* is it me? */ /* is it me? */
if (newuser->me && sess->gui->nick_box) if (newuser->me && sess->gui->nick_box)