copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ability to ignore a transport contact. see #3984

Browse source
This commit is contained in:
Yann Leboulanger 2008-06-23 16:21:21 +00:00
parent 9336828b42
commit bed750410e
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
data/glade/roster_contact_context_menu.glade
View file

@ -242,7 +242,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Unblock</property> <property name="label" translatable="yes">_Unblock</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_unblock_menuitem_activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1715"> <widget class="GtkImage" id="image1715">
<property name="visible">True</property> <property name="visible">True</property>
@ -257,7 +256,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Block</property> <property name="label" translatable="yes">_Block</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_block_menuitem_activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1714"> <widget class="GtkImage" id="image1714">
<property name="visible">True</property> <property name="visible">True</property>
@ -267,6 +265,34 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkImageMenuItem" id="unignore_menuitem">
<property name="no_show_all">True</property>
<property name="label" translatable="yes">_Unignore</property>
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="menu-item-image22">
<property name="visible">True</property>
<property name="stock">gtk-stop</property>
<property name="icon_size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="ignore_menuitem">
<property name="no_show_all">True</property>
<property name="label" translatable="yes">_Ignore</property>
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="menu-item-image23">
<property name="visible">True</property>
<property name="stock">gtk-stop</property>
<property name="icon_size">1</property>
</widget>
</child>
</widget>
</child>
<child> <child>
<widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
<property name="label" translatable="yes">_Add to Roster...</property> <property name="label" translatable="yes">_Add to Roster...</property>

17
src/roster_window.py
View file

@ -4965,6 +4965,8 @@ class RosterWindow:
invite_menuitem = xml.get_widget('invite_menuitem') invite_menuitem = xml.get_widget('invite_menuitem')
block_menuitem = xml.get_widget('block_menuitem') block_menuitem = xml.get_widget('block_menuitem')
unblock_menuitem = xml.get_widget('unblock_menuitem') unblock_menuitem = xml.get_widget('unblock_menuitem')
ignore_menuitem = xml.get_widget('ignore_menuitem')
unignore_menuitem = xml.get_widget('unignore_menuitem')
rename_menuitem = xml.get_widget('rename_menuitem') rename_menuitem = xml.get_widget('rename_menuitem')
edit_groups_menuitem = xml.get_widget('edit_groups_menuitem') edit_groups_menuitem = xml.get_widget('edit_groups_menuitem')
send_file_menuitem = xml.get_widget('send_file_menuitem') send_file_menuitem = xml.get_widget('send_file_menuitem')
@ -5141,12 +5143,23 @@ class RosterWindow:
if jid in gajim.connections[account].blocked_contacts: if jid in gajim.connections[account].blocked_contacts:
block_menuitem.set_no_show_all(True) block_menuitem.set_no_show_all(True)
block_menuitem.hide() block_menuitem.hide()
unblock_menuitem.connect('activate', self.on_unblock, titer, None) if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
unblock_menuitem.set_no_show_all(True)
unblock_menuitem.hide()
unignore_menuitem.set_no_show_all(False)
unignore_menuitem.connect('activate', self.on_unblock, titer,
None)
else:
unblock_menuitem.connect('activate', self.on_unblock, titer,
None)
else: else:
unblock_menuitem.set_no_show_all(True) unblock_menuitem.set_no_show_all(True)
unblock_menuitem.hide() unblock_menuitem.hide()
if gajim.get_transport_name_from_jid(jid, use_config_setting=False): if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
block_menuitem.set_sensitive(False) block_menuitem.set_no_show_all(True)
block_menuitem.hide()
ignore_menuitem.set_no_show_all(False)
ignore_menuitem.connect('activate', self.on_block, titer, None)
else: else:
block_menuitem.connect('activate', self.on_block, titer, None) block_menuitem.connect('activate', self.on_block, titer, None)
else: else: