SoniEx2/c.sexchat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get rid of ALL gui_tweaks

Browse source
This commit is contained in:
Berke Viktor 2012-10-22 08:37:28 +02:00
parent 445e8c006e
commit 4f68ac6cc0
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/cfgfiles.c
View file

@ -448,6 +448,7 @@ const struct prefs vars[] = {
{"gui_dialog_top", P_OFFINT (dialog_top), TYPE_INT}, {"gui_dialog_top", P_OFFINT (dialog_top), TYPE_INT},
{"gui_dialog_width", P_OFFINT (dialog_width), TYPE_INT}, {"gui_dialog_width", P_OFFINT (dialog_width), TYPE_INT},
{"gui_hide_menu", P_OFFINT (hidemenu), TYPE_BOOL}, {"gui_hide_menu", P_OFFINT (hidemenu), TYPE_BOOL},
{"gui_input_nick", P_OFFINT (gui_input_nick), TYPE_BOOL},
{"gui_input_spell", P_OFFINT (gui_input_spell), TYPE_BOOL}, {"gui_input_spell", P_OFFINT (gui_input_spell), TYPE_BOOL},
{"gui_input_style", P_OFFINT (style_inputbox), TYPE_BOOL}, {"gui_input_style", P_OFFINT (style_inputbox), TYPE_BOOL},
{"gui_join_dialog", P_OFFINT (gui_join_dialog), TYPE_BOOL}, {"gui_join_dialog", P_OFFINT (gui_join_dialog), TYPE_BOOL},
@ -483,7 +484,6 @@ const struct prefs vars[] = {
{"gui_topicbar", P_OFFINT (topicbar), TYPE_BOOL}, {"gui_topicbar", P_OFFINT (topicbar), TYPE_BOOL},
{"gui_tray", P_OFFINT (gui_tray), TYPE_BOOL}, {"gui_tray", P_OFFINT (gui_tray), TYPE_BOOL},
{"gui_tray_flags", P_OFFINT (gui_tray_flags), TYPE_INT}, {"gui_tray_flags", P_OFFINT (gui_tray_flags), TYPE_INT},
{"gui_tweaks", P_OFFINT (gui_tweaks), TYPE_INT},
{"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},

2
src/common/xchat.h
View file

@ -293,11 +293,11 @@ struct xchatprefs
unsigned int auto_indent; unsigned int auto_indent;
unsigned int wordwrap; unsigned int wordwrap;
unsigned int gui_compact; unsigned int gui_compact;
unsigned int gui_input_nick;
unsigned int gui_input_spell; unsigned int gui_input_spell;
unsigned int gui_tab_dots; unsigned int gui_tab_dots;
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_ulist_icons; unsigned int gui_ulist_icons;
unsigned int gui_win_modes; unsigned int gui_win_modes;
unsigned int gui_win_swap; unsigned int gui_win_swap;

4
src/fe-gtk/maingui.c
View file

@ -3046,7 +3046,7 @@ mg_create_topwindow (session *sess)
if (!prefs.userlistbuttons) if (!prefs.userlistbuttons)
gtk_widget_hide (sess->gui->button_box); gtk_widget_hide (sess->gui->button_box);
if (prefs.gui_tweaks & 2) if (prefs.gui_input_nick)
gtk_widget_hide (sess->gui->nick_box); gtk_widget_hide (sess->gui->nick_box);
mg_decide_userlist (sess, FALSE); mg_decide_userlist (sess, FALSE);
@ -3149,7 +3149,7 @@ mg_create_tabwindow (session *sess)
if (!prefs.userlistbuttons) if (!prefs.userlistbuttons)
gtk_widget_hide (sess->gui->button_box); gtk_widget_hide (sess->gui->button_box);
if (prefs.gui_tweaks & 2) if (prefs.gui_input_nick)
gtk_widget_hide (sess->gui->nick_box); gtk_widget_hide (sess->gui->nick_box);
mg_place_userlist_and_chanview (sess->gui); mg_place_userlist_and_chanview (sess->gui);

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

@ -212,6 +212,7 @@ static const setting inputbox_settings[] =
{ {
{ST_HEADER, N_("Input Box"),0,0,0}, {ST_HEADER, N_("Input Box"),0,0,0},
{ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(style_inputbox),0,0,0}, {ST_TOGGLE, N_("Use the Text box font and colors"), P_OFFINTNL(style_inputbox),0,0,0},
{ST_TOGGLE, N_("Show nick box"), P_OFFINTNL(gui_input_nick),0,0,0},
#if defined(USE_GTKSPELL) || defined(USE_LIBSEXY) #if defined(USE_GTKSPELL) || defined(USE_LIBSEXY)
{ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(gui_input_spell),0,0,0}, {ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(gui_input_spell),0,0,0},
{ST_ENTRY, N_("Dictionaries to use:"), P_OFFSETNL(spell_langs),0,0,sizeof prefs.spell_langs}, {ST_ENTRY, N_("Dictionaries to use:"), P_OFFSETNL(spell_langs),0,0,sizeof prefs.spell_langs},
@ -2205,6 +2206,8 @@ setup_apply (struct xchatprefs *pr)
#endif #endif
if (DIFF (paned_userlist)) if (DIFF (paned_userlist))
noapply = TRUE; noapply = TRUE;
if (DIFF (gui_input_nick))
noapply = TRUE;
if (DIFF (lagometer)) if (DIFF (lagometer))
noapply = TRUE; noapply = TRUE;
if (DIFF (throttlemeter)) if (DIFF (throttlemeter))