diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/cfgfiles.c | 1 | ||||
| -rw-r--r-- | src/common/hexchat.h | 1 | ||||
| -rw-r--r-- | src/common/inbound.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 18 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 68bad7a9..b51fb1d2 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -435,6 +435,7 @@ const struct prefs vars[] = {"gui_lagometer", P_OFFINT (hex_gui_lagometer), TYPE_INT}, {"gui_lang", P_OFFINT (hex_gui_lang), TYPE_INT}, {"gui_mode_buttons", P_OFFINT (hex_gui_mode_buttons), TYPE_BOOL}, + {"gui_pane_divider_position", P_OFFINT (hex_gui_pane_divider_position), TYPE_INT}, {"gui_pane_left_size", P_OFFINT (hex_gui_pane_left_size), TYPE_INT}, {"gui_pane_right_size", P_OFFINT (hex_gui_pane_right_size), TYPE_INT}, {"gui_pane_right_size_min", P_OFFINT (hex_gui_pane_right_size_min), TYPE_INT}, diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 43597617..d84e2761 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -252,6 +252,7 @@ struct hexchatprefs int hex_gui_dialog_width; int hex_gui_lagometer; int hex_gui_lang; + int hex_gui_pane_divider_position; int hex_gui_pane_left_size; int hex_gui_pane_right_size; int hex_gui_pane_right_size_min; diff --git a/src/common/inbound.c b/src/common/inbound.c index 0c5bccd3..7b4c67e8 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -758,7 +758,7 @@ inbound_quit (server *serv, char *nick, char *ip, char *reason) { if (sess == current_sess) was_on_front_session = TRUE; - if (user = userlist_find (sess, nick)) + if ((user = userlist_find (sess, nick))) { EMIT_SIGNAL (XP_TE_QUIT, sess, nick, reason, ip, NULL, 0); userlist_remove_user (sess, user); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 5b37dbb8..e5f79abd 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -2543,6 +2543,12 @@ mg_create_userlist (session_gui *gui, GtkWidget *box) } static void +mg_vpane_cb (GtkPaned *pane, GParamSpec *param, session_gui *gui) +{ + prefs.hex_gui_pane_divider_position = gtk_paned_get_position (pane); +} + +static void mg_leftpane_cb (GtkPaned *pane, GParamSpec *param, session_gui *gui) { prefs.hex_gui_pane_left_size = gtk_paned_get_position (pane); @@ -2570,6 +2576,10 @@ mg_add_pane_signals (session_gui *gui) G_CALLBACK (mg_rightpane_cb), gui); g_signal_connect (G_OBJECT (gui->hpane_left), "notify::position", G_CALLBACK (mg_leftpane_cb), gui); + g_signal_connect (G_OBJECT (gui->vpane_left), "notify::position", + G_CALLBACK (mg_vpane_cb), gui); + g_signal_connect (G_OBJECT (gui->vpane_right), "notify::position", + G_CALLBACK (mg_vpane_cb), gui); return FALSE; } @@ -2756,6 +2766,12 @@ mg_place_userlist_and_chanview_real (session_gui *gui, GtkWidget *userlist, GtkW } } + if (mg_is_userlist_and_tree_combined () && prefs.hex_gui_pane_divider_position != 0) + { + gtk_paned_set_position (GTK_PANED (gui->vpane_left), prefs.hex_gui_pane_divider_position); + gtk_paned_set_position (GTK_PANED (gui->vpane_right), prefs.hex_gui_pane_divider_position); + } + if (unref_chanview) g_object_unref (chanview); if (unref_userlist) @@ -3074,7 +3090,7 @@ mg_tabwindow_de_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) GSList *list; session *sess; - if (tray_toggle_visibility (FALSE) && prefs.hex_gui_tray_close && !hextray_mode ()) + if (prefs.hex_gui_tray_close && !hextray_mode () && tray_toggle_visibility (FALSE)) return TRUE; /* check for remaining toplevel windows */ diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index c572de8c..df31376d 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -116,7 +116,7 @@ static const char *const langsmenu[] = N_("Czech"), N_("Danish"), N_("Dutch"), - N_("English (Brisith)"), + N_("English (British)"), N_("English"), N_("Estonian"), N_("Finnish"), |