diff options
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/chanlist.c | 4 | ||||
| -rw-r--r-- | src/fe-gtk/search.c | 5 | ||||
| -rw-r--r-- | src/fe-gtk/servlistgui.c | 84 |
3 files changed, 88 insertions, 5 deletions
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 47b9f1db..00c55b5f 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -532,6 +532,7 @@ chanlist_minusers (GtkSpinButton *wid, server *serv) { serv->gui->chanlist_minusers = gtk_spin_button_get_value_as_int (wid); prefs.hex_gui_chanlist_minusers = serv->gui->chanlist_minusers; + save_config(); if (serv->gui->chanlist_minusers < serv->gui->chanlist_minusers_downloaded) { @@ -553,6 +554,7 @@ chanlist_maxusers (GtkSpinButton *wid, server *serv) { serv->gui->chanlist_maxusers = gtk_spin_button_get_value_as_int (wid); prefs.hex_gui_chanlist_maxusers = serv->gui->chanlist_maxusers; + save_config(); } static void @@ -725,6 +727,7 @@ chanlist_opengui (server *serv, int do_refresh) if (prefs.hex_gui_chanlist_minusers < 1 || prefs.hex_gui_chanlist_minusers > 999999) { prefs.hex_gui_chanlist_minusers = 5; + save_config(); } serv->gui->chanlist_minusers = prefs.hex_gui_chanlist_minusers; @@ -735,6 +738,7 @@ chanlist_opengui (server *serv, int do_refresh) if (prefs.hex_gui_chanlist_maxusers < 1 || prefs.hex_gui_chanlist_maxusers > 999999) { prefs.hex_gui_chanlist_maxusers = 9999; + save_config(); } serv->gui->chanlist_maxusers = prefs.hex_gui_chanlist_maxusers; diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index 49c30a14..44cbf3a0 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.c @@ -26,6 +26,7 @@ #include "../common/fe.h" #include "../common/util.h" #include "../common/hexchatc.h" +#include "../common/cfgfiles.h" #include "gtkutil.h" #include "xtext.h" #include "maingui.h" @@ -111,24 +112,28 @@ static void search_caseign_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_case_match = (but->active)? 1: 0; + save_config(); } static void search_dirbwd_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_backward = (but->active)? 1: 0; + save_config(); } static void search_regexp_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_regexp = (but->active)? 1: 0; + save_config(); } static void search_highlight_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_highlight_all = (but->active)? 1: 0; + save_config(); search_search (sess, NULL); } diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 13df2b15..8d480dc4 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -103,6 +103,24 @@ static const char *pages[]= NULL }; +static const char *nstypes[]= +{ + /* This list is the same as in irc_nickserv(), except starting at 1, because + * the 1st row is not used. We can't use index 0 coz then "if (nstype)" would + * not be evaluated, it would give the same result as NULL (i.e. unset) nstype. + * For unset nstype we have a "Default" entry in place of this placeholder, so + * indices will be correct anyway. + */ + "PLACEHOLDER", /* nstype = 0 */ + "/msg NickServ", /* nstype = 1, nickservtype = 0 */ + "/NickServ", /* nstype = 2, nickservtype = 1 */ + "/NS", /* ... */ + "/msg NS", + "/auth", + NULL + /* This also means that we need to shift these values for irc_nickserv()! */ +}; + static void servlist_select_and_show (GtkTreeView *treeview, GtkTreeIter *iter, GtkListStore *store) @@ -656,6 +674,7 @@ servlist_savegui (void) sp[0] = 0; /* spaces will break the login */ /* strcpy (prefs.hex_irc_real_name, GTK_ENTRY (entry_greal)->text); */ servlist_save (); + save_config (); /* For nicks stored in hexchat.conf */ return 0; } @@ -1309,6 +1328,21 @@ servlist_combo_cb (GtkEntry *entry, gpointer userdata) } } +static void +servlist_nscombo_cb (GtkEntry *entry, gpointer userdata) +{ + if (!selected_net) + { + return; + } + + if (!ignore_changed) + { + selected_net->nstype = gtk_combo_box_get_active (GTK_COMBO_BOX (entry)); + } +} + + static GtkWidget * servlist_create_charsetcombo (void) { @@ -1329,6 +1363,28 @@ servlist_create_charsetcombo (void) return cb; } +static GtkWidget * +servlist_create_nstypecombo (void) +{ + GtkWidget *cb; + int i; + + cb = gtk_combo_box_entry_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (cb), "Default"); + + i = 1; /* start with the 2nd row, leave the placeholder 0th element alone */ + + while (nstypes[i]) + { + gtk_combo_box_append_text (GTK_COMBO_BOX (cb), (char *)nstypes[i]); + i++; + } + + g_signal_connect (G_OBJECT (GTK_BIN (cb)), "changed", G_CALLBACK (servlist_nscombo_cb), NULL); + + return cb; +} + static void no_servlist (GtkWidget * igad, gpointer serv) { @@ -1374,7 +1430,9 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) GtkWidget *label16; GtkWidget *label21; GtkWidget *label34; + GtkWidget *label_nstype; GtkWidget *comboboxentry_charset; + GtkWidget *comboboxentry_nstypes; GtkWidget *hbox1; GtkWidget *scrolledwindow2; GtkWidget *treeview_servers; @@ -1482,26 +1540,42 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) _("Extra command to execute after connecting. If you need more than one, set this to LOAD -e <filename>, where <filename> is a text-file full of commands to execute.")); edit_entry_nickserv = - servlist_create_entry (table3, _("Nickserv password:"), 17, + servlist_create_entry (table3, _("NickServ password:"), 17, net->nickserv, 0, _("If your nickname requires a password, enter it here. Not all IRC networks support this.")); gtk_entry_set_visibility (GTK_ENTRY (edit_entry_nickserv), FALSE); + label_nstype = gtk_label_new (_("NickServ type:")); + gtk_widget_show (label_nstype); + gtk_table_attach (GTK_TABLE (table3), label_nstype, 1, 2, 18, 19, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label_nstype), 0, 0.5); + + comboboxentry_nstypes = servlist_create_nstypecombo (); + ignore_changed = TRUE; + gtk_entry_set_text (GTK_ENTRY (GTK_BIN (comboboxentry_nstypes)->child), net->nstype ? nstypes[net->nstype] : "Default"); + ignore_changed = FALSE; + gtk_widget_show (comboboxentry_nstypes); + gtk_table_attach (GTK_TABLE (table3), comboboxentry_nstypes, 2, 3, 18, 19, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + edit_entry_pass = - servlist_create_entry (table3, _("Server password:"), 18, + servlist_create_entry (table3, _("Server password:"), 20, net->pass, 0, _("Password for the server, if in doubt, leave blank.")); gtk_entry_set_visibility (GTK_ENTRY (edit_entry_pass), FALSE); edit_entry_saslpass = - servlist_create_entry (table3, _("SASL password:"), 19, + servlist_create_entry (table3, _("SASL password:"), 21, net->saslpass, 0, _("Password for SASL authentication, if in doubt, leave blank.")); gtk_entry_set_visibility (GTK_ENTRY (edit_entry_saslpass), FALSE); label34 = gtk_label_new (_("Character set:")); gtk_widget_show (label34); - gtk_table_attach (GTK_TABLE (table3), label34, 1, 2, 20, 21, + gtk_table_attach (GTK_TABLE (table3), label34, 1, 2, 22, 23, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label34), 0, 0.5); @@ -1511,7 +1585,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) gtk_entry_set_text (GTK_ENTRY (GTK_BIN (comboboxentry_charset)->child), net->encoding ? net->encoding : "System default"); ignore_changed = FALSE; gtk_widget_show (comboboxentry_charset); - gtk_table_attach (GTK_TABLE (table3), comboboxentry_charset, 2, 3, 20, 21, + gtk_table_attach (GTK_TABLE (table3), comboboxentry_charset, 2, 3, 22, 23, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); |