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

improve AvatarChooserDialog

This commit is contained in:
Yann Leboulanger 2007-11-09 18:22:23 +00:00
parent b40d8a5fe5
commit 3bcbde6752
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogs.py
View File

@ -2775,6 +2775,8 @@ class ImageChooserDialog(FileChooserDialog):
on_response_ok = (on_ok, on_response_ok), on_response_ok = (on_ok, on_response_ok),
on_response_cancel = on_response_cancel) on_response_cancel = on_response_cancel)
self.connect('destroy', on_response_cancel)
filter = gtk.FileFilter() filter = gtk.FileFilter()
filter.set_name(_('All files')) filter.set_name(_('All files'))
filter.add_pattern('*') filter.add_pattern('*')

14
src/profile_window.py
View File

@ -47,6 +47,7 @@ class ProfileWindow:
self.account = account self.account = account
self.jid = gajim.get_jid_from_account(account) self.jid = gajim.get_jid_from_account(account)
self.dialog = None
self.avatar_mime_type = None self.avatar_mime_type = None
self.avatar_encoded = None self.avatar_encoded = None
self.message_id = self.statusbar.push(self.context_id, self.message_id = self.statusbar.push(self.context_id,
@ -75,6 +76,8 @@ class ProfileWindow:
if self.remove_statusbar_timeout_id is not None: if self.remove_statusbar_timeout_id is not None:
gobject.source_remove(self.remove_statusbar_timeout_id) gobject.source_remove(self.remove_statusbar_timeout_id)
del gajim.interface.instances[self.account]['profile'] del gajim.interface.instances[self.account]['profile']
if self.dialog: # Image chooser dialog
self.dialog.destroy()
def on_profile_window_key_press_event(self, widget, event): def on_profile_window_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape: if event.keyval == gtk.keysyms.Escape:
@ -137,6 +140,7 @@ class ProfileWindow:
dialogs.ErrorDialog(_('Could not load image')) dialogs.ErrorDialog(_('Could not load image'))
return return
self.dialog.destroy() self.dialog.destroy()
self.dialog = None
button = self.xml.get_widget('PHOTO_button') button = self.xml.get_widget('PHOTO_button')
image = button.get_image() image = button.get_image()
image.set_from_pixbuf(pixbuf) image.set_from_pixbuf(pixbuf)
@ -154,10 +158,18 @@ class ProfileWindow:
def on_clear(widget): def on_clear(widget):
self.dialog.destroy() self.dialog.destroy()
self.dialog = None
self.on_clear_button_clicked(widget) self.on_clear_button_clicked(widget)
def on_cancel(widget):
self.dialog.destroy()
self.dialog = None
if self.dialog:
self.dialog.present()
else:
self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok, self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok,
on_response_clear = on_clear) on_response_cancel = on_cancel, on_response_clear = on_clear)
def on_PHOTO_button_press_event(self, widget, event): def on_PHOTO_button_press_event(self, widget, event):
'''If right-clicked, show popup''' '''If right-clicked, show popup'''