summary refs log tree commit diff stats
path: root/src/fe-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-gtk')
-rw-r--r--src/fe-gtk/maingui.c4
-rw-r--r--src/fe-gtk/pixmaps.c7
-rw-r--r--src/fe-gtk/setup.c3
3 files changed, 13 insertions, 1 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 41cbb2a6..3dbac7af 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -2915,8 +2915,10 @@ mg_create_tabs (session_gui *gui)
 
 	/* if any one of these PNGs exist, the chanview will create
 	 * the extra column for icons. */
-	if (pix_channel || pix_dialog || pix_server || pix_util)
+	if (prefs.tab_icons && (pix_channel || pix_dialog || pix_server || pix_util))
+	{
 		use_icons = TRUE;
+	}
 
 	gui->chanview = chanview_new (prefs.tab_layout, prefs.truncchans,
 											prefs.tab_sort, use_icons,
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index c802f508..4211c6f5 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -137,9 +137,16 @@ pixmaps_init (void)
 	pix_tray_hilight = load_pixmap ("highlight", trayhilightpng, 1);
 	pix_tray_file = load_pixmap ("fileoffer", trayfilepng, 1);
 
+#if 0
 	/* treeview icons, no defaults, load from disk only */
 	pix_channel = load_pixmap ("channel", NULL, 0);
 	pix_dialog = load_pixmap ("dialog", NULL, 0);
 	pix_server = load_pixmap ("server", NULL, 0);
 	pix_util = load_pixmap ("util", NULL, 0);
+#endif
+	/* provide inline defaults for these coz they are nice! */
+	pix_channel = load_pixmap ("channel", channelpng, 1);
+	pix_dialog = load_pixmap ("dialog", dialogpng, 1);
+	pix_server = load_pixmap ("server", serverpng, 1);
+	pix_util = load_pixmap ("util", utilpng, 1);
 }
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 60a17a0c..742eb0b3 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -266,6 +266,7 @@ static const setting tabs_settings[] =
 	{ST_TOGGLE, N_("Open an extra tab for server notices"), P_OFFINTNL(notices_tabs), 0, 0, 0},
 	{ST_TOGGLE, N_("Open a new tab when you receive a private message"), P_OFFINTNL(autodialog), 0, 0, 0},
 	{ST_TOGGLE, N_("Sort tabs in alphabetical order"), P_OFFINTNL(tab_sort), 0, 0, 0},
+	{ST_TOGGLE, N_("Show icons in tree view"), P_OFFINTNL(tab_icons), 0, 0, 0},
 	{ST_TOGGLE, N_("Smaller text"), P_OFFINTNL(tab_small), 0, 0, 0},
 #if 0
 	{ST_MENU,	N_("Focus new tabs:"), P_OFFINTNL(newtabstofront), 0, focusnewtabsmenu, 0},
@@ -2147,6 +2148,8 @@ setup_apply (struct xchatprefs *pr)
 		noapply = TRUE;
 	if (DIFF (truncchans))
 		noapply = TRUE;
+	if (DIFF (tab_icons))
+		noapply = TRUE;
 	if (DIFF (tab_layout))
 		do_layout = TRUE;