[commit-gajim] r8527 - in trunk: data/glade src - Commits

21 Aug 2007

Author: steve-e
Date: 2007-08-21 02:43:58 +0200 (Tue, 21 Aug 2007)
New Revision: 8527
Modified:
   trunk/data/glade/account_context_menu.glade
   trunk/src/roster_window.py
Log:
Rework account_menu.
Modified: trunk/data/glade/account_context_menu.glade
===================================================================

--- trunk/data/glade/account_context_menu.glade	2007-08-20 23:26:10 UTC (rev 8526)
+++ trunk/data/glade/account_context_menu.glade	2007-08-21 00:43:58 UTC (rev 8527)
@@ -18,15 +18,25 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="seperator">
+      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
         <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
       </widget>
     </child>
     <child>
-      <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem">
+      <widget class="GtkImageMenuItem" id="start_chat_menuitem">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">_Open Gmail Inbox</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">_Start Chat</property>
         <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image7">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="stock">gtk-jump-to</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
       </widget>
     </child>
     <child>
@@ -44,9 +54,28 @@
       </widget>
     </child>
     <child>
+      <widget class="GtkSeparatorMenuItem" id="seperator">
+        <property name="visible">True</property>
+      </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="image1238">
+            <property name="visible">True</property>
+            <property name="stock">gtk-add</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
       <widget class="GtkImageMenuItem" id="service_discovery_menuitem">
         <property name="visible">True</property>
-	<property name="label" translatable="yes">_Discover Services</property>
+        <property name="label" translatable="yes">_Discover Services</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
           <widget class="GtkImage" id="image1239">
@@ -72,22 +101,15 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="seperator">
+      <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem">
         <property name="visible">True</property>
+        <property name="label" translatable="yes">_Open Gmail Inbox</property>
+        <property name="use_underline">True</property>
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="add_contact_menuitem">
+      <widget class="GtkSeparatorMenuItem" id="seperator">
         <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="image1238">
-            <property name="visible">True</property>
-            <property name="stock">gtk-add</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
       </widget>
     </child>
     <child>
Modified: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py	2007-08-20 23:26:10 UTC (rev 8526)
+++ trunk/src/roster_window.py	2007-08-21 00:43:58 UTC (rev 8527)
@@ -2733,7 +2733,7 @@
    				block_menuitem.set_sensitive(False)
# Remove group
-			remove_item = gtk.ImageMenuItem(_('_Remove from Roster'))
+			remove_item = gtk.ImageMenuItem(_('_Remove'))
    		icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU)
    		remove_item.set_image(icon)
    		menu.append(remove_item)
@@ -2889,6 +2889,7 @@
    		account_context_menu = xml.get_widget('account_context_menu')
status_menuitem = xml.get_widget('status_menuitem')
+			start_chat_menuitem = xml.get_widget('start_chat_menuitem')
    		join_group_chat_menuitem = xml.get_widget('join_group_chat_menuitem')
    		muc_icon = self.load_icon('muc_active')
    		if muc_icon:
@@ -2951,6 +2952,9 @@
    		contact = gajim.contacts.create_contact(jid = hostname) # Fake contact
    		execute_command_menuitem.connect('activate',
    			self.on_execute_command, contact, account)
+			
+			start_chat_menuitem.connect('activate', 
+				self.on_new_chat_menuitem_activate, account)
gc_sub_menu = gtk.Menu() # gc is always a submenu
    		join_group_chat_menuitem.set_submenu(gc_sub_menu)
@@ -2960,7 +2964,8 @@
    		if gajim.connections[account].connected < 2:
    			for widget in [add_contact_menuitem, service_discovery_menuitem,
    			join_group_chat_menuitem,
-				execute_command_menuitem]:
+				execute_command_menuitem,
+				start_chat_menuitem]:
    				widget.set_sensitive(False)
    	else:
    		xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade')

    