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

if one tab, make sure you show the name and not Chat or Groupchat

Browse source
This commit is contained in:
Nikos Kouremenos 2005-08-08 16:42:30 +00:00
parent 613d999ca1
commit f9e3223d76
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/chat.py
View file

@ -119,10 +119,18 @@ class Chat:
chat = self.names[jid] chat = self.names[jid]
if len(self.xmls) > 1: # if more than one tab in the same window if len(self.xmls) > 1: # if more than one tab in the same window
if self.widget_name == 'tabbed_chat_window': if self.widget_name == 'tabbed_chat_window':
chat = _('Chat') add = _('Chat')
elif self.widget_name == 'groupchat_window': elif self.widget_name == 'groupchat_window':
chat = _('Group Chat') add = _('Group Chat')
title = start + chat elif len(self.xmls) == 1: # just one tab
if self.widget_name == 'tabbed_chat_window':
c = gajim.get_first_contact_instance_from_jid(self.account, jid)
add = c.name
elif self.widget_name == 'groupchat_window':
name = gajim.get_nick_from_jid(jid)
add = name
title = start + add
if len(gajim.connections) >= 2: # if we have 2 or more accounts if len(gajim.connections) >= 2: # if we have 2 or more accounts
title = title + ' (' + _('account: ') + self.account + ')' title = title + ' (' + _('account: ') + self.account + ')'
@ -342,7 +350,8 @@ class Chat:
self.notebook.set_current_page(self.notebook.page_num(self.childs[jid])) self.notebook.set_current_page(self.notebook.page_num(self.childs[jid]))
def remove_tab(self, jid, kind): #kind is 'chats' or 'gc' def remove_tab(self, jid, kind): #kind is 'chats' or 'gc'
if len(self.xmls) == 1: # only one tab so destroy window if len(self.xmls) == 1: # only one tab when we asked to remove
# so destroy window
# we check and possibly save positions here, because Ctrl+W, Escape # we check and possibly save positions here, because Ctrl+W, Escape
# etc.. call remove_tab so similar code in delete_event callbacks # etc.. call remove_tab so similar code in delete_event callbacks
@ -375,10 +384,8 @@ class Chat:
del self.print_time_timeout_id[jid] del self.print_time_timeout_id[jid]
self.notebook.remove_page(self.notebook.page_num(self.childs[jid])) self.notebook.remove_page(self.notebook.page_num(self.childs[jid]))
if len(self.xmls) == 2:
# one that remains and one that we'll remove, 1 tab remains
self.notebook.set_show_tabs(False)
self.show_title()
if self.plugin.windows[self.account][kind].has_key(jid): if self.plugin.windows[self.account][kind].has_key(jid):
del self.plugin.windows[self.account][kind][jid] del self.plugin.windows[self.account][kind][jid]
@ -390,6 +397,10 @@ class Chat:
del self.tagIn[jid] del self.tagIn[jid]
del self.tagOut[jid] del self.tagOut[jid]
del self.tagStatus[jid] del self.tagStatus[jid]
if len(self.xmls) == 1: # we now have only one tab
self.notebook.set_show_tabs(False)
self.show_title()
def bring_scroll_to_end(self, textview, diff_y = 0): def bring_scroll_to_end(self, textview, diff_y = 0):
''' scrolls to the end of textview if end is not visible ''' ''' scrolls to the end of textview if end is not visible '''
@ -946,7 +957,7 @@ class Chat:
text_before_special_text, *other_tags) text_before_special_text, *other_tags)
index = end # update index index = end # update index
#now print it # now print it
self.print_special_text(special_text, other_tags, textview) self.print_special_text(special_text, other_tags, textview)
return index return index