[dcraven] ctrl+w, escape etc call remove_tab so no delete event so positions where not saved. this is now fixed

This commit is contained in:
Nikos Kouremenos 2005-07-21 23:41:13 +00:00
parent 44f5dccb1e
commit 123cfb70d4
1 changed files with 23 additions and 2 deletions

View File

@ -139,7 +139,7 @@ class Chat:
nickname.set_text(start + self.names[jid]) nickname.set_text(start + self.names[jid])
def on_window_destroy(self, widget, kind): #kind is 'chats' or 'gc' def on_window_destroy(self, widget, kind): #kind is 'chats' or 'gc'
#clean self.plugin.windows[self.account][kind] '''clean self.plugin.windows[self.account][kind]'''
for jid in self.xmls: for jid in self.xmls:
windows = self.plugin.windows[self.account][kind] windows = self.plugin.windows[self.account][kind]
if kind == 'chats': if kind == 'chats':
@ -279,7 +279,28 @@ 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: if len(self.xmls) == 1: # only one tab so destroy window
# we check and possibly save positions here, because Ctrl+W, Escape
# etc.. call remove_tab so similar code in delete_event callbacks
# is not enough
if gajim.config.get('saveposition'):
if kind == 'chats':
x, y = self.window.get_position()
gajim.config.set('chat-x-position', x)
gajim.config.set('chat-y-position', y)
width, height = self.window.get_size()
gajim.config.set('chat-width', width)
gajim.config.set('chat-height', height)
elif kind == 'gc':
gajim.config.set('gc-hpaned-position', self.hpaned_position)
x, y = self.window.get_position()
gajim.config.set('gc-x-position', x)
gajim.config.set('gc-y-position', y)
width, height = self.window.get_size()
gajim.config.set('gc-width', width)
gajim.config.set('gc-height', height)
self.window.destroy() self.window.destroy()
return return
if self.nb_unread[jid] > 0: if self.nb_unread[jid] > 0: