yet another menu now in glade

src/gtkgui.glade

@@ -16077,4 +16077,178 @@ Maybe I'll refactor later</property>
   </child>
 </widget>
 
+<widget class="GtkMenu" id="account_context_menu">
+
+  <child>
+    <widget class="GtkImageMenuItem" id="status_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Status</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image825">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-network</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkSeparatorMenuItem" id="separator7">
+      <property name="visible">True</property>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="advanced_actions_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Ad_vanced Actions</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image826">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-dialog-warning</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GtkMenu" id="advanced_actions_menuitem_menu">
+
+	  <child>
+	    <widget class="GtkImageMenuItem" id="xml_console_menuitem">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_XML Console...</property>
+	      <property name="use_underline">True</property>
+
+	      <child internal-child="image">
+		<widget class="GtkImage" id="image827">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-execute</property>
+		  <property name="icon_size">1</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="edit_account_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Edit Account...</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image828">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-preferences</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="service_discovery_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Service Discovery...</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image829">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-find</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="add_contact_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Add Contact...</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image830">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-add</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="join_group_chat_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Join _Group Chat...</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image831">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-connect</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="new_message_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_New Message...</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image832">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-new</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>

src/roster_window.py

@@ -749,6 +749,8 @@ class RosterWindow:
 		model = self.tree.get_model()
 		account = model.get_value(iter, 3)
 		
+		#FIXME: made this menu insensitive if we're offline
+
 		# we have to create our own set of icons for the menu
 		# using self.jabber_status_images is poopoo
 		iconset = gajim.config.get('iconset')
@@ -757,20 +759,21 @@ class RosterWindow:
 		path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/16x16/')
 		state_images = self.load_iconset(path)
 
-		menu = gtk.Menu()
+		xml = gtk.glade.XML(GTKGUI_GLADE, 'account_context_menu', APP)
+		account_context_menu = xml.get_widget('account_context_menu')
+		childs = account_context_menu.get_children()
 		
-		status_item = gtk.MenuItem()
+		status_menuitem = childs[0]
-		status_icon = gtk.Image()
+		#sep
-		status_icon.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU)
+		advanced_actions_menuitem = childs[2]
-		status_label = gtk.Label(_('Status'))
+		edit_account_menuitem = childs[3]
-		status_hbox = gtk.HBox(False, 3)
+		service_discovery_menuitem = childs[4]
-		status_hbox.pack_start(status_icon, False, False)
+		add_contact_menuitem = childs[5]
-		status_hbox.pack_start(status_label, False, False)
+		join_group_chat_menuitem = childs[6]
-		status_item.add(status_hbox)
+		new_message_menuitem = childs[7]
-		menu.append(status_item)
 		
 		sub_menu = gtk.Menu()
-		status_item.set_submenu(sub_menu)
+		status_menuitem.set_submenu(sub_menu)
 
 		for show in ['online', 'chat', 'away', 'xa', 'dnd', 'invisible',
 			'offline']:
@@ -779,82 +782,24 @@ class RosterWindow:
 				item = gtk.MenuItem()
 				sub_menu.append(item)
 
-			item = gtk.MenuItem()
+			item = gtk.ImageMenuItem(helpers.get_uf_show(show))
 			icon = state_images[show]
-			label = gtk.Label(helpers.get_uf_show(show))
+			item.set_image(icon)
-			hbox = gtk.HBox(False, 3)
-			hbox.pack_start(icon, False, False)
-			hbox.pack_start(label, False, False)
-			item.add(hbox)
 			sub_menu.append(item)
 			item.connect('activate', self.change_status, account, show)
 		
-		item = gtk.MenuItem()
+		edit_account_menuitem.connect('activate', self.on_edit_account, account)
-		menu.append(item)
+		service_discovery_menuitem.connect('activate',
+			self.on_service_disco_menuitem_activate, account)
+		add_contact_menuitem.connect('activate', self.on_add_new_contact, account)
+		join_group_chat_menuitem.connect('activate',
+			self.on_join_gc_activate, account)
+		new_message_menuitem.connect('activate',
+			self.on_new_message_menuitem_activate, account)
 		
-		edit_item = gtk.MenuItem()
+		account_context_menu.popup(None, None, None, event.button, event.time)
-		edit_icon = gtk.Image()
+		account_context_menu.show_all()
-		edit_icon.set_from_stock(gtk.STOCK_EDIT, gtk.ICON_SIZE_MENU)
+		account_context_menu.reposition()
-		edit_label = gtk.Label(_('_Edit Account'))
-		edit_label.set_use_underline(True)
-		edit_hbox = gtk.HBox(False, 3)
-		edit_hbox.pack_start(edit_icon, False, False)
-		edit_hbox.pack_start(edit_label, False, False)
-		edit_item.add(edit_hbox)
-		edit_item.connect('activate', self.on_edit_account, account)
-		menu.append(edit_item)
-		
-		discover_item = gtk.MenuItem()
-		discover_icon = gtk.Image()
-		discover_icon.set_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
-		discover_label = gtk.Label(_('_Service Discovery'))
-		discover_label.set_use_underline(True)
-		discover_hbox = gtk.HBox(False, 3)
-		discover_hbox.pack_start(discover_icon, False, False)
-		discover_hbox.pack_start(discover_label, False, False)
-		discover_item.add(discover_hbox)
-		discover_item.connect('activate', self.on_service_disco_menuitem_activate, account)
-		menu.append(discover_item)
-		
-		add_contact_item = gtk.MenuItem()
-		add_contact_icon = gtk.Image()
-		add_contact_icon.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_MENU)
-		add_contact_label = gtk.Label(_('_Add Contact'))
-		add_contact_label.set_use_underline(True)
-		add_contact_hbox = gtk.HBox(False, 3)
-		add_contact_hbox.pack_start(add_contact_icon, False, False)
-		add_contact_hbox.pack_start(add_contact_label, False, False)
-		add_contact_item.add(add_contact_hbox)
-		add_contact_item.connect('activate', self.on_add_new_contact, account)
-		menu.append(add_contact_item)
-		
-		join_gc_item = gtk.MenuItem()
-		join_gc_icon = gtk.Image()
-		join_gc_icon.set_from_stock(gtk.STOCK_CONNECT, gtk.ICON_SIZE_MENU)
-		join_gc_label = gtk.Label(_('Join _Groupchat'))
-		join_gc_label.set_use_underline(True)
-		join_gc_hbox = gtk.HBox(False, 3)
-		join_gc_hbox.pack_start(join_gc_icon, False, False)
-		join_gc_hbox.pack_start(join_gc_label, False, False)
-		join_gc_item.add(join_gc_hbox)
-		join_gc_item.connect('activate', self.on_join_gc_activate, account)
-		menu.append(join_gc_item)
-		
-		new_message_item = gtk.MenuItem()
-		new_message_icon = gtk.Image()
-		new_message_icon.set_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU)
-		new_message_label = gtk.Label(_('_New Message'))
-		new_message_label.set_use_underline(True)
-		new_message_hbox = gtk.HBox(False, 3)
-		new_message_hbox.pack_start(new_message_icon, False, False)
-		new_message_hbox.pack_start(new_message_label, False, False)
-		new_message_item.add(new_message_hbox)
-		new_message_item.connect('activate', self.on_new_message_menuitem_activate, account)
-		menu.append(new_message_item)
-		
-		menu.popup(None, None, None, event.button, event.time)
-		menu.show_all()
-		menu.reposition()
 
 	def on_add_to_roster(self, widget, user, account):
 		dialogs.AddNewContactWindow(self.plugin, account, user.jid)