on_preferences_window_show makes sure always first tab is active, adding more status iconsets and fixed code, draw_roster doesnt update them very well and organized

plugins/gtkgui/config.py

@@ -37,15 +37,17 @@ GTKGUI_GLADE='plugins/gtkgui/gtkgui.glade'
 class Preferences_window:
 	"""Class for Preferences window"""
 	
-	def on_delete_event(self, widget, event):
+	def on_preferences_window_delete_event(self, widget, event):
 		self.window.hide()
-		return True # do NOT destory the window
+		return True # do NOT destroy the window
 	
 	def on_close_button_clicked(self, widget):
-		self.window.hide()		
+		self.window.hide()	
+
+	def on_preferences_window_show(self, widget):
+		self.notebook.set_current_page(0)
 
 	def on_tray_icon_checkbutton_toggled(self, widget):
-		"""On Tray Icon Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['trayicon'] = 1
 			self.plugin.show_systray()
@@ -56,14 +58,12 @@ class Preferences_window:
 		self.plugin.roster.draw_roster()
 	
 	def on_save_position_checkbutton_toggled(self, widget):
-		"""On Save Position Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['saveposition'] = 1
 		else:
 			self.plugin.config['saveposition'] = 0
 	
 	def on_merge_checkbutton_toggled(self, widget):
-		"""On Merge Accounts Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['mergeaccounts'] = 1
 		else:
@@ -71,9 +71,10 @@ class Preferences_window:
 		self.plugin.roster.regroup = self.plugin.config['mergeaccounts']
 		self.plugin.roster.draw_roster()
 	
-	def on_iconstyle_combobox_changed(self, widget, path):
+	def on_iconstyle_combobox_changed(self, widget):
 		model = widget.get_model()
-		icon_string = model[path][0]
+		active = widget.get_active()
+		icon_string = model[active][0]
 		self.plugin.config['iconstyle'] = icon_string
 		self.plugin.roster.mkpixbufs()
 		
@@ -175,7 +176,6 @@ class Preferences_window:
 		self.plugin.roster.draw_roster()
 	
 	def on_use_tabbed_chat_window_checkbutton_toggled(self, widget):
-		"""On Use Tabbed Chat Window Checkbutton Toggled"""
 		buf1 = {}
 		buf2 = {}
 		jids = {}
@@ -969,7 +969,7 @@ class Preferences_window:
 		self.msg_tree.get_model().connect('row-deleted', \
 			self.on_msg_treemodel_row_deleted)
 		
-		self.notebook.set_current_page(0)
+		#self.notebook.set_current_page(0)
 		self.xml.signal_autoconnect(self)
 
 class Account_modification_window:

plugins/gtkgui/gtkgui.glade

@@ -2893,7 +2893,8 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
-  <signal name="delete_event" handler="on_delete_event" last_modification_time="Fri, 25 Mar 2005 21:02:26 GMT"/>
+  <signal name="show" handler="on_preferences_window_show" last_modification_time="Tue, 29 Mar 2005 23:33:03 GMT"/>
+  <signal name="delete_event" handler="on_preferences_window_delete_event" last_modification_time="Tue, 29 Mar 2005 23:38:24 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox13">

plugins/gtkgui/icons/icq/icondef.xml

@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>ICQ</name>
+		<version>1.1</version>
+		<description>Default ICQ iconset</description>
+		<creation>2003-07-17</creation>
+		<home>http://www.aol.com</home>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (not the icons, just this icondef.xml)</author>
+		<author jid='skazi@sredni.one.pl' email='skazi@skazi.prv.pl' www='http://www.skazi.prv.pl'>Jacek Tomasiak (small modifications)</author>
+		<author>ICQ artists</author>
+	</meta>
+
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>chat.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>invisible.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+</icondef>

plugins/gtkgui/icons/msn/icondef.xml

@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>MSN6</name>
+		<version>1.0</version>
+		<description>MSN6 Original Iconset</description>
+		<creation>2003-10-16</creation>
+		<author jid='remko@amessage.be' email='spike@kotnet.org' www='http://spike.ulyssis.org'>Remko Tronçon</author>
+	</meta>
+
+	<!-- Normal status icons -->
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+</icondef>

plugins/gtkgui/icons/stellar/icondef.xml

@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>Stellar (default)</name>
+		<version>1.0</version>
+		<description>Default Psi 0.9.1 iconset</description>
+		<creation>2003-07-08</creation>
+		<home>http://psi.affinix.com</home>
+		<author email='jmkim@uci.edu'>Jason Kim</author>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (icondef.xml)</author>
+	</meta>
+
+	<!-- Normal status icons -->
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>invisible.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>ffc.png</object>
+	</icon>
+
+	<!-- Special statuses -->
+	<icon>
+		<x xmlns='name'>status/ask</x>
+		<object mime='image/png'>ask.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/noauth</x>
+		<object mime='image/png'>noauth.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/error</x>
+		<object mime='image/png'>perr.png</object>
+	</icon>
+
+	<!-- Special icons -->
+	<icon>
+		<x xmlns='name'>psi/chat</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>chat.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/message</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>message.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/headline</x>
+		<object mime='image/png'>headline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/file</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>file.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/system</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>system.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/connect</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>connect.png</object>
+	</icon>
+	
+	<icon>
+		<x xmlns='name'>psi/groupClosed</x>
+		<object mime='image/png'>groupclose.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/groupEmpty</x>
+		<object mime='image/png'>groupempty.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/groupOpen</x>
+		<object mime='image/png'>groupopen.png</object>
+	</icon>
+</icondef>

plugins/gtkgui/pixmaps/transport/icondef.xml

@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>Stellar-Transport (default)</name>
+		<version>1.0</version>
+		<description>Default Psi 0.9.3 iconset</description>
+		<creation>2003-07-17</creation>
+		<home>http://psi.affinix.com</home>
+		<author email='jmkim@uci.edu'>Jason Kim</author>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (icondef.xml)</author>
+	</meta>
+
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>online.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>online.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+</icondef>