From a99dd7794b13c0514ace8159168e03794516ce97 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 21 Jun 2005 15:54:18 +0000
Subject: [PATCH] we now have iconset preview in preference window (Thx Dennis)

---
 src/config.py    | 20 +++++++++++++++++---
 src/gtkgui.glade |  3 +--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/config.py b/src/config.py
index 50c84f961..e457cad01 100644
--- a/src/config.py
+++ b/src/config.py
@@ -131,7 +131,14 @@ class PreferencesWindow:
 
 		#iconset
 		iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets'))
-		model = gtk.ListStore(str)
+		# new model, image in 0, string in 1
+		model = gtk.ListStore(gtk.Image, str)
+		renderer_image = cell_renderer_image.CellRendererImage()
+		renderer_text = gtk.CellRendererText()
+		self.iconset_combobox.pack_start(renderer_image, expand=False)
+		self.iconset_combobox.pack_start(renderer_text, expand=True)
+		self.iconset_combobox.set_attributes(renderer_text, text=1)
+		self.iconset_combobox.add_attribute(renderer_image, 'image', 0)
 		self.iconset_combobox.set_model(model)
 		l = []
 		for dir in iconsets_list:
@@ -140,7 +147,14 @@ class PreferencesWindow:
 		if l.count == 0:
 			l.append(' ')
 		for i in range(len(l)):
-			model.append([l[i]])
+			preview = gtk.Image()
+			files = []
+			files.append(os.path.join(gajim.DATA_DIR, 'iconsets', l[i], '16x16', 'online.png'))
+			files.append(os.path.join(gajim.DATA_DIR, 'iconsets', l[i], '16x16', 'online.gif'))
+			for file in files:
+				if os.path.exists(file):
+					preview.set_from_file(file)
+			model.append([preview, l[i]])
 			if gajim.config.get('iconset') == l[i]:
 				self.iconset_combobox.set_active(i)
 
@@ -428,7 +442,7 @@ class PreferencesWindow:
 	def on_iconset_combobox_changed(self, widget):
 		model = widget.get_model()
 		active = widget.get_active()
-		icon_string = model[active][0]
+		icon_string = model[active][1]
 		gajim.config.set('iconset', icon_string)
 		self.plugin.roster.reload_jabber_state_images()
 		self.plugin.save_config()
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 157c10db1..39c3ee56a 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -3085,8 +3085,7 @@
 			      <child>
 				<widget class="GtkComboBox" id="iconset_combobox">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes"></property>
-				  <signal name="changed" handler="on_iconset_combobox_changed" last_modification_time="Wed, 30 Mar 2005 12:19:34 GMT"/>
+				  <signal name="changed" handler="on_iconset_combobox_changed" last_modification_time="Tue, 21 Jun 2005 15:36:21 GMT"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>