summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2012-10-22 08:37:28 +0200
committerBerke Viktor <bviktor@hexchat.org>2012-10-22 08:37:28 +0200
commit4f68ac6cc084676351b0e15dbede4bd10ce86042 (patch)
tree2d8fa7762e9d34df9693b40a1f22ffb9ac7c7311 /src
parent445e8c006e1e09512afbf877eb0104c8e53eb152 (diff)
Get rid of ALL gui_tweaks
Diffstat (limited to 'src')
-rw-r--r--src/common/cfgfiles.c2
-rw-r--r--src/common/xchat.h2
-rw-r--r--src/fe-gtk/maingui.c4
-rw-r--r--src/fe-gtk/setup.c3
4 files changed, 7 insertions, 4 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 85efdc58..f9d9f0f6 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -448,6 +448,7 @@ const struct prefs vars[] = {
 	{"gui_dialog_top", P_OFFINT (dialog_top), TYPE_INT},
 	{"gui_dialog_width", P_OFFINT (dialog_width), TYPE_INT},
 	{"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_style", P_OFFINT (style_inputbox), 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_tray", P_OFFINT (gui_tray), TYPE_BOOL},
 	{"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_doubleclick", P_OFFSET (doubleclickuser), TYPE_STR},
 	{"gui_ulist_hide", P_OFFINT (hideuserlist), TYPE_BOOL},
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 27ffe265..473be3c1 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -293,11 +293,11 @@ struct xchatprefs
 	unsigned int auto_indent;
 	unsigned int wordwrap;
 	unsigned int gui_compact;
+	unsigned int gui_input_nick;
 	unsigned int gui_input_spell;
 	unsigned int gui_tab_dots;
 	unsigned int gui_tray;
 	unsigned int gui_tray_flags;
-	unsigned int gui_tweaks;
 	unsigned int gui_ulist_icons;
 	unsigned int gui_win_modes;
 	unsigned int gui_win_swap;
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index d69f9ee0..c52ddb2f 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -3046,7 +3046,7 @@ mg_create_topwindow (session *sess)
 	if (!prefs.userlistbuttons)
 		gtk_widget_hide (sess->gui->button_box);
 
-	if (prefs.gui_tweaks & 2)
+	if (prefs.gui_input_nick)
 		gtk_widget_hide (sess->gui->nick_box);
 
 	mg_decide_userlist (sess, FALSE);
@@ -3149,7 +3149,7 @@ mg_create_tabwindow (session *sess)
 	if (!prefs.userlistbuttons)
 		gtk_widget_hide (sess->gui->button_box);
 
-	if (prefs.gui_tweaks & 2)
+	if (prefs.gui_input_nick)
 		gtk_widget_hide (sess->gui->nick_box);
 
 	mg_place_userlist_and_chanview (sess->gui);
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index ed7d43df..a727de7f 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -212,6 +212,7 @@ static const setting inputbox_settings[] =
 {
 	{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_("Show nick box"), P_OFFINTNL(gui_input_nick),0,0,0},
 #if defined(USE_GTKSPELL) || defined(USE_LIBSEXY)
 	{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},
@@ -2205,6 +2206,8 @@ setup_apply (struct xchatprefs *pr)
 #endif
 	if (DIFF (paned_userlist))
 		noapply = TRUE;
+	if (DIFF (gui_input_nick))
+		noapply = TRUE;
 	if (DIFF (lagometer))
 		noapply = TRUE;
 	if (DIFF (throttlemeter))