| ... |
... |
@@ -26,10 +26,12 @@ |
|
26
|
26
|
|
|
27
|
27
|
from gajim.common import app
|
|
28
|
28
|
from gajim.common.const import AvatarSize
|
|
|
29
|
+from gajim.common.i18n import _
|
|
29
|
30
|
from gajim.common.modules.contacts import GroupchatContact
|
|
30
|
31
|
|
|
31
|
32
|
from .avatar_selector import AvatarSelector
|
|
32
|
33
|
from .builder import get_builder
|
|
|
34
|
+from .dialogs import ErrorDialog
|
|
33
|
35
|
from .filechoosers import AvatarChooserDialog
|
|
34
|
36
|
|
|
35
|
37
|
log = logging.getLogger('gajim.gui.groupchat_manage')
|
| ... |
... |
@@ -201,26 +203,21 @@ def _on_upload_avatar_result(self, task: Task) -> None: |
|
201
|
203
|
try:
|
|
202
|
204
|
task.finish()
|
|
203
|
205
|
except Exception as error:
|
|
204
|
|
- print(error)
|
|
205
|
|
- pass
|
|
206
|
|
- # self.add_info_message(_('Avatar upload failed: %s') % error)
|
|
207
|
|
-
|
|
208
|
|
- else:
|
|
209
|
|
- pass
|
|
210
|
|
- # self.add_info_message(_('Avatar upload successful'))
|
|
|
206
|
+ ErrorDialog(_('Uploading Avatar Failed'),
|
|
|
207
|
+ _('Uploading avatar image failed: %s' % error))
|
|
211
|
208
|
|
|
212
|
209
|
def _on_avatar_update_clicked(self, _button: Gtk.Button) -> None:
|
|
213
|
|
- success, data, _, _ = self._avatar_selector.get_avatar_bytes()
|
|
|
210
|
+ success, data, _w, _h = self._avatar_selector.get_avatar_bytes()
|
|
214
|
211
|
if not success:
|
|
215
|
|
- pass
|
|
216
|
|
- # self.add_info_message(_('Loading avatar failed'))
|
|
|
212
|
+ ErrorDialog(_('Loading Avatar Failed'),
|
|
|
213
|
+ _('Loading avatar image failed'))
|
|
217
|
214
|
return
|
|
218
|
215
|
|
|
219
|
216
|
assert data
|
|
220
|
217
|
sha = app.app.avatar_storage.save_avatar(data)
|
|
221
|
218
|
if sha is None:
|
|
222
|
|
- pass
|
|
223
|
|
- # self.add_info_message(_('Loading avatar failed'))
|
|
|
219
|
+ ErrorDialog(_('Saving Avatar Failed'),
|
|
|
220
|
+ _('Saving avatar image failed'))
|
|
224
|
221
|
return
|
|
225
|
222
|
|
|
226
|
223
|
vcard = VCard()
|