move change tooltip text for audio and video buttons from init to _update_toolbar.

This commit is contained in:
Denis Fomin 2012-07-19 20:31:06 +04:00
parent 3152dc6cd6
commit d71ce1f27c
1 changed files with 16 additions and 20 deletions

View File

@ -1650,26 +1650,6 @@ class ChatControl(ChatControlBase):
self.restore_conversation() self.restore_conversation()
self.msg_textview.grab_focus() self.msg_textview.grab_focus()
# change tooltip text for audio and video buttons if python-farstream is
# not installed
if not gajim.HAVE_FARSTREAM:
tooltip_text = self._audio_button.get_tooltip_text()
self._audio_button.set_tooltip_text(
'%s\n%s' % (tooltip_text,
_('Feature not available, see Help->Features')))
tooltip_text = self._video_button.get_tooltip_text()
self._video_button.set_tooltip_text(
'%s\n%s' % (tooltip_text,
_('Feature not available, see Help->Features')))
elif not self.audio_available :
self._audio_button.set_tooltip_text(
'%s\n%s' % (tooltip_text,
_('Feature not supported by remote client')))
tooltip_text = self._video_button.get_tooltip_text()
self._video_button.set_tooltip_text(
'%s\n%s' % (tooltip_text,
_('Feature not supported by remote client')))
gajim.ged.register_event_handler('pep-received', ged.GUI1, gajim.ged.register_event_handler('pep-received', ged.GUI1,
self._nec_pep_received) self._nec_pep_received)
gajim.ged.register_event_handler('vcard-received', ged.GUI1, gajim.ged.register_event_handler('vcard-received', ged.GUI1,
@ -1731,6 +1711,22 @@ class ChatControl(ChatControlBase):
# Video buttons # Video buttons
self._video_button.set_sensitive(self.video_available) self._video_button.set_sensitive(self.video_available)
# change tooltip text for audio and video buttons if python-farstream is
# not installed
audio_tooltip_text = _('Toggle audio session') + '\n'
video_tooltip_text = _('Toggle video session') + '\n'
if not gajim.HAVE_FARSTREAM:
ext_text = _('Feature not available, see Help->Features')
self._audio_button.set_tooltip_text(audio_tooltip_text + ext_text)
self._video_button.set_tooltip_text(video_tooltip_text + ext_text)
elif not self.audio_available :
ext_text =_('Feature not supported by remote client')
self._audio_button.set_tooltip_text(audio_tooltip_text + ext_text)
self._video_button.set_tooltip_text(video_tooltip_text + ext_text)
else:
self._audio_button.set_tooltip_text(audio_tooltip_text[:-1])
self._video_button.set_tooltip_text(video_tooltip_text[:-1])
# Send file # Send file
if (self.contact.supports(NS_FILE) or \ if (self.contact.supports(NS_FILE) or \
self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \