diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-10-22 07:24:52 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-10-22 07:24:52 +0200 |
| commit | 02dd0ba5602b4e8ce05266f5d1be92ad29d7dd3e (patch) | |
| tree | 8e1717855107d12d856b0583f06830c02d76156d /src/fe-gtk | |
| parent | 2cbae7f6a5596e15835e73c76c684ecae0c6336e (diff) | |
Get rid of gui_tweaks 16 & 1
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/maingui.c | 22 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 5 | ||||
| -rw-r--r-- | src/fe-gtk/userlistgui.c | 2 |
3 files changed, 21 insertions, 8 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 68795b9b..f35e86ed 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -416,6 +416,7 @@ mg_inputbox_cb (GtkWidget *igad, session_gui *gui) free (cmd); } +#if 0 static gboolean has_key (char *modes) { @@ -432,6 +433,7 @@ has_key (char *modes) } return FALSE; } +#endif void fe_set_title (session *sess) @@ -459,18 +461,24 @@ fe_set_title (session *sess) break; case SESS_CHANNEL: /* don't display keys in the titlebar */ - if ((!(prefs.gui_tweaks & 16)) && has_key (sess->current_modes)) + if (prefs.gui_win_modes) + { snprintf (tbuf, sizeof (tbuf), - DISPLAY_NAME": %s @ %s / %s", + DISPLAY_NAME": %s @ %s / %s (%s)", sess->server->nick, server_get_network (sess->server, TRUE), - sess->channel); + sess->channel, sess->current_modes ? sess->current_modes : ""); + } else + { snprintf (tbuf, sizeof (tbuf), - DISPLAY_NAME": %s @ %s / %s (%s)", + DISPLAY_NAME": %s @ %s / %s", sess->server->nick, server_get_network (sess->server, TRUE), - sess->channel, sess->current_modes ? sess->current_modes : ""); - if (prefs.gui_tweaks & 1) + sess->channel); + } + if (prefs.gui_win_ucount) + { snprintf (tbuf + strlen (tbuf), 9, " (%d)", sess->total); + } break; case SESS_NOTICES: case SESS_SNOTICES: @@ -2514,7 +2522,7 @@ mg_create_userlist (session_gui *gui, GtkWidget *box) gtk_container_add (GTK_CONTAINER (box), vbox); frame = gtk_frame_new (NULL); - if (!(prefs.gui_tweaks & 1)) + if (!(prefs.gui_win_ucount)) gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, GUI_SPACING); gui->namelistinfo = gtk_label_new (NULL); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 6be57649..7a89f5be 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -166,6 +166,11 @@ static const setting appearance_settings[] = #else {ST_EFONT, N_("Font:"), P_OFFSETNL(font_normal), 0, 0, sizeof prefs.font_normal}, #endif + + {ST_HEADER, N_("Title Bar"),0,0,0}, + {ST_TOGGLE, N_("Show channel modes"), P_OFFINTNL(gui_win_modes),0,0,0}, + {ST_TOGGLR, N_("Show number of users"), P_OFFINTNL(gui_win_ucount),0,0,0}, + {ST_HEADER, N_("Text Box"),0,0,0}, {ST_EFILE, N_("Background image:"), P_OFFSETNL(background), 0, 0, sizeof prefs.background}, {ST_NUMBER, N_("Scrollback lines:"), P_OFFINTNL(max_lines),0,0,100000}, diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index cb21703f..443e0588 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.c @@ -126,7 +126,7 @@ fe_userlist_numbers (session *sess) gtk_label_set_text (GTK_LABEL (sess->gui->namelistinfo), NULL); } - if (sess->type == SESS_CHANNEL && prefs.gui_tweaks & 1) + if (sess->type == SESS_CHANNEL && prefs.gui_win_ucount) fe_set_title (sess); } } |